feat: Increase helm chart version and switch to use oci registry (#788)

Signed-off-by: Jeffrey Tang <[email protected]>
hashgraph · Nov 6, 2024 · 1973275 · 1973275
1 parent dac8fb6
commit 1973275
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 12 deletions.
diff --git a/src/commands/cluster.ts b/src/commands/cluster.ts
@@ -120,11 +120,15 @@ export class ClusterCommand extends BaseCommand {
           const clusterSetupNamespace = ctx.config.clusterSetupNamespace
           const version = ctx.config.soloChartVersion
 
-          const chartPath = ctx.chartPath
+          const chartPath = constants.SOLO_TESTING_CHART_URL + constants.SOLO_CLUSTER_SETUP_CHART
           const valuesArg = ctx.valuesArg
 
           try {
-            await self.chartManager.install(clusterSetupNamespace, constants.SOLO_CLUSTER_SETUP_CHART, chartPath, version, valuesArg)
+            self.logger.debug(`Installing chart chartPath = ${chartPath}, version = ${version}`)
+            await self.chartManager.install(clusterSetupNamespace,
+                constants.SOLO_CLUSTER_SETUP_CHART,
+                chartPath,
+                version, valuesArg)
           } catch (e: Error | any) {
             // if error, uninstall the chart and rethrow the error
             self.logger.debug(`Error on installing ${constants.SOLO_CLUSTER_SETUP_CHART}. attempting to rollback by uninstalling the chart`, e)

diff --git a/src/commands/network.ts b/src/commands/network.ts
@@ -281,7 +281,7 @@ export class NetworkCommand extends BaseCommand {
           await this.chartManager.install(
             config.namespace,
             constants.SOLO_DEPLOYMENT_CHART,
-            config.chartPath,
+            constants.SOLO_TESTING_CHART_URL + constants.SOLO_DEPLOYMENT_CHART,
             config.soloChartVersion,
             config.valuesArg)
         }
@@ -508,7 +508,7 @@ export class NetworkCommand extends BaseCommand {
           await this.chartManager.upgrade(
             config.namespace,
             constants.SOLO_DEPLOYMENT_CHART,
-            config.chartPath,
+            constants.SOLO_TESTING_CHART_URL + constants.SOLO_DEPLOYMENT_CHART,
             config.valuesArg,
             config.soloChartVersion
           )

diff --git a/src/commands/node/tasks.ts b/src/commands/node/tasks.ts
@@ -1128,8 +1128,7 @@ export class NodeCommandTasks {
 
       await this.chartManager.upgrade(
         config.namespace,
-        constants.SOLO_DEPLOYMENT_CHART,
-        config.chartPath,
+        constants.SOLO_DEPLOYMENT_CHART, constants.SOLO_TESTING_CHART_URL + constants.SOLO_DEPLOYMENT_CHART,
         valuesArg,
         config.soloChartVersion
       )

diff --git a/src/core/constants.ts b/src/core/constants.ts
@@ -52,7 +52,7 @@ export const HEDERA_NODE_DEFAULT_STAKE_AMOUNT = +process.env.SOLO_NODE_DEFAULT_S
 
 // --------------- Charts related constants ----------------------------------------------------------------------------
 export const SOLO_SETUP_NAMESPACE = 'solo-setup'
-export const SOLO_TESTING_CHART_URL = 'https://hashgraph.github.io/solo-charts/charts'
+export const SOLO_TESTING_CHART_URL = 'oci://ghcr.io/hashgraph/solo-charts/'
 export const SOLO_TESTING_CHART = 'solo-charts'
 export const SOLO_CLUSTER_SETUP_CHART = 'solo-cluster-setup'
 export const SOLO_DEPLOYMENT_CHART = 'solo-deployment'
@@ -65,7 +65,6 @@ export const HEDERA_EXPLORER_CHART_UTL = 'oci://ghcr.io/hashgraph/hedera-mirror-
 export const HEDERA_EXPLORER_CHART = 'hedera-explorer'
 
 export const DEFAULT_CHART_REPO: Map<string, string> = new Map()
-  .set(SOLO_TESTING_CHART, SOLO_TESTING_CHART_URL)
   .set(JSON_RPC_RELAY_CHART, JSON_RPC_RELAY_CHART_URL)
   .set(MIRROR_NODE_RELEASE_NAME, MIRROR_NODE_CHART_URL)
 

diff --git a/test/e2e/commands/network.test.ts b/test/e2e/commands/network.test.ts
@@ -102,7 +102,8 @@ describe('NetworkCommand', () => {
         flags.profileFile.constName,
         flags.profileName.constName,
         flags.quiet.constName,
-        flags.settingTxt.constName
+        flags.settingTxt.constName,
+        'chartPath'
       ])
     } catch (e) {
       networkCmd.logger.showUserError(e)

diff --git a/test/e2e/commands/separate_node_add.test.ts b/test/e2e/commands/separate_node_add.test.ts
@@ -95,6 +95,7 @@ e2eTestSuite(namespace, argv, undefined, undefined, undefined, undefined, undefi
         flags.devMode.constName,
         flags.force.constName,
         flags.quiet.constName,
+        'chartPath',
         'curDate',
         'freezeAdminPrivateKey'
       ])

diff --git a/test/test_add.ts b/test/test_add.ts
@@ -85,7 +85,8 @@ export function testNodeAdd (localBuildPath: string, testDescription = 'Node add
           flags.devMode.constName,
           flags.force.constName,
           flags.quiet.constName,
-          flags.adminKey.constName
+          flags.adminKey.constName,
+          'chartPath'
         ])
         await bootstrapResp.opts.accountManager.close()
       }).timeout(12 * MINUTES)

diff --git a/test/test_util.ts b/test/test_util.ts
@@ -259,7 +259,8 @@ export function e2eTestSuite (
           flags.profileFile.constName,
           flags.profileName.constName,
           flags.quiet.constName,
-          flags.settingTxt.constName
+          flags.settingTxt.constName,
+          'chartPath'
         ])
       }).timeout(3 * MINUTES)
 

diff --git a/version.ts b/version.ts
@@ -21,7 +21,7 @@
 
 export const JAVA_VERSION = '21.0.1+12'
 export const HELM_VERSION = 'v3.14.2'
-export const SOLO_CHART_VERSION = 'v0.33.0'
+export const SOLO_CHART_VERSION = '0.34.0'
 export const HEDERA_PLATFORM_VERSION = 'v0.54.0-alpha.4'
 export const MIRROR_NODE_VERSION = '0.116.0'
 export const HEDERA_EXPLORER_VERSION = '0.2.1'