ensured user-provided values file takes precedence over solo-generate…

…d values Signed-off-by: instamenta <[email protected]>
hashgraph · Sep 19, 2024 · 2dab8b7 · 2dab8b7
1 parent 11880c5
commit 2dab8b7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/src/commands/mirror_node.mjs b/src/commands/mirror_node.mjs
@@ -106,9 +106,6 @@ export class MirrorNodeCommand extends BaseCommand {
  */
  async prepareValuesArg (config) {
  let valuesArg = ''
- if (config.valuesFile) {
- valuesArg += this.prepareValuesFiles(config.valuesFile)
- }
 
  const profileName = this.configManager.getFlag(flags.profileName)
  const profileValuesFile = await this.profileManager.prepareValuesForMirrorNodeChart(profileName)
@@ -122,6 +119,11 @@ export class MirrorNodeCommand extends BaseCommand {
  }
 
  valuesArg += ` --set hedera-mirror-node.enabled=true --set hedera-explorer.enabled=${config.deployHederaExplorer}`
+
+ if (config.valuesFile) {
+ valuesArg += this.prepareValuesFiles(config.valuesFile)
+ }
+
  return valuesArg
  }
 

diff --git a/src/commands/network.mjs b/src/commands/network.mjs
@@ -92,10 +92,6 @@ export class NetworkCommand extends BaseCommand {
  valuesArg = `-f ${path.join(config.chartDirectory, 'fullstack-deployment', 'values.yaml')}`
  }
 
- if (config.valuesFile) {
- valuesArg += this.prepareValuesFiles(config.valuesFile)
- }
-
  if (config.app !== constants.HEDERA_APP_NAME) {
  const index = config.nodeIds.length
  for (let i = 0; i < index; i++) {
@@ -124,6 +120,10 @@ export class NetworkCommand extends BaseCommand {
 
  valuesArg += ` --set "defaults.volumeClaims.enabled=${config.persistentVolumeClaims}"`
 
+ if (config.valuesFile) {
+ valuesArg += this.prepareValuesFiles(config.valuesFile)
+ }
+
  this.logger.debug('Prepared helm chart values', { valuesArg })
  return valuesArg
  }

diff --git a/src/commands/relay.mjs b/src/commands/relay.mjs
@@ -67,7 +67,7 @@ export class RelayCommand extends BaseCommand {
 
  /**
  * @param {string} valuesFile
- * @param {string} nodeIDs
+ * @param {string[]} nodeIDs
  * @param {string} chainID
  * @param {string} relayRelease
  * @param {number} replicaCount
@@ -78,9 +78,6 @@ export class RelayCommand extends BaseCommand {
  */
  async prepareValuesArg (valuesFile, nodeIDs, chainID, relayRelease, replicaCount, operatorID, operatorKey, namespace) {
  let valuesArg = ''
- if (valuesFile) {
- valuesArg += this.prepareValuesFiles(valuesFile)
- }
 
  const profileName = this.configManager.getFlag(flags.profileName)
  const profileValuesFile = await this.profileManager.prepareValuesForRpcRelayChart(profileName)
@@ -120,6 +117,11 @@ export class RelayCommand extends BaseCommand {
 
  const networkJsonString = await this.prepareNetworkJsonString(nodeIDs, namespace)
  valuesArg += ` --set config.HEDERA_NETWORK='${networkJsonString}'`
+
+ if (valuesFile) {
+ valuesArg += this.prepareValuesFiles(valuesFile)
+ }
+
  return valuesArg
  }