fix mismatch between admin console and embedded cluster versions (#1377)

* fix mismatch between admin console and embedded cluster versions

* chart version does not have a 'v'. internal values do

Author: laverya

operator/deploy/melange.tmpl.yaml

@@ -24,11 +24,6 @@ pipeline:
   - runs: |
       set -exuo pipefail
 
-      # remove a 'v' prefix from the version if it exists
-      if [[ ${VERSION:0:1} == "v" ]]; then
-        export VERSION=${VERSION:1}
-      fi
-
       make -C operator build
       cp operator/bin/manager "${{targets.contextdir}}/manager"
   - uses: strip

operator/pkg/charts/charts.go

@@ -101,7 +101,7 @@ func generateHelmConfigs(ctx context.Context, in *clusterv1beta1.Installation, c
 	// those values depend on the sha256 of the compiled binary itself
 	embeddedclusteroperator.Metadata.Images = oi
 	embeddedclusteroperator.Metadata.Location = operatorLocation
-	embeddedclusteroperator.Metadata.Version = versions.Version
+	embeddedclusteroperator.Metadata.Version = strings.TrimPrefix(versions.Version, "v")
 	embeddedclusteroperator.Render()
 
 	migrationStatus := k8sutil.CheckConditionStatus(in.Status, registry.RegistryMigrationStatusConditionType)

operator/pkg/charts/charts_test.go

@@ -62,7 +62,7 @@ zfs-localpv:
 const test_operatorValues = `embeddedBinaryName: test-binary-name
 embeddedClusterID: e79f0701-67f3-4abf-a672-42a1f3ed231b
 embeddedClusterK0sVersion: 0.0.0
-embeddedClusterVersion: 1.2.3-operator
+embeddedClusterVersion: v1.2.3-operator
 global:
   labels:
     replicated.com/disaster-recovery: infra
@@ -77,7 +77,7 @@ utilsImage: abc-repo/ec-utils:latest-amd64@sha256:92dec6e167ff57b35953da389c2f62
 const test_proxyOperatorValues = `embeddedBinaryName: test-binary-name
 embeddedClusterID: e79f0701-67f3-4abf-a672-42a1f3ed231b
 embeddedClusterK0sVersion: 0.0.0
-embeddedClusterVersion: 1.2.3-operator
+embeddedClusterVersion: v1.2.3-operator
 extraEnv:
 - name: HTTP_PROXY
   value: http://proxy
@@ -112,7 +112,7 @@ utilsImage: abc-repo/ec-utils:latest-amd64@sha256:92dec6e167ff57b35953da389c2f62
 `
 
 const test_onlineAdminConsoleValues = `embeddedClusterID: e79f0701-67f3-4abf-a672-42a1f3ed231b
-embeddedClusterVersion: 1.2.3-operator
+embeddedClusterVersion: v1.2.3-operator
 images:
   kotsadm: ':'
   kurlProxy: ':'
@@ -166,7 +166,7 @@ service:
 `
 
 const test_airgapAdminConsoleValues = `embeddedClusterID: e79f0701-67f3-4abf-a672-42a1f3ed231b
-embeddedClusterVersion: 1.2.3-operator
+embeddedClusterVersion: v1.2.3-operator
 images:
   kotsadm: ':'
   kurlProxy: ':'
@@ -193,7 +193,7 @@ service:
 `
 
 const test_airgapHAAdminConsoleValues = `embeddedClusterID: e79f0701-67f3-4abf-a672-42a1f3ed231b
-embeddedClusterVersion: 1.2.3-operator
+embeddedClusterVersion: v1.2.3-operator
 images:
   kotsadm: ':'
   kurlProxy: ':'
@@ -220,7 +220,7 @@ service:
 `
 
 const test_proxyAdminConsoleValues = `embeddedClusterID: e79f0701-67f3-4abf-a672-42a1f3ed231b
-embeddedClusterVersion: 1.2.3-operator
+embeddedClusterVersion: v1.2.3-operator
 extraEnv:
 - name: HTTP_PROXY
   value: http://proxy
@@ -457,7 +457,7 @@ func test_replaceAddonMeta() {
 	embeddedclusteroperator.Metadata = release.AddonMetadata{
 		Location: "oci://proxy.replicated.com/anonymous/registry.replicated.com/library/embedded-cluster-operator",
 	}
-	versions.Version = "1.2.3-operator" // This is not great, we use this to override the version of the operator chart
+	versions.Version = "v1.2.3-operator" // This is not great, we use this to override the version of the operator chart
 	// we can't use the version from the metadata because it won't be set in the operator binary
 	// TODO fix this