updates

replicatedhq · Jan 30, 2025 · 77fa109 · 77fa109
1 parent ad79cc1
commit 77fa109
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 22 deletions.
diff --git a/operator/charts/embedded-cluster-operator/templates/embedded-cluster-configmap.yaml b/operator/charts/embedded-cluster-operator/templates/embedded-cluster-configmap.yaml
diff --git a/operator/charts/embedded-cluster-operator/values.yaml b/operator/charts/embedded-cluster-operator/values.yaml
@@ -2,7 +2,6 @@
 global:
   labels: {}
 
-kotsVersion: v0.0.0
 embeddedClusterVersion: v0.0.0
 embeddedClusterK0sVersion: v0.0.0
 embeddedBinaryName: v0.0.0

diff --git a/operator/charts/embedded-cluster-operator/values.yaml.tmpl b/operator/charts/embedded-cluster-operator/values.yaml.tmpl
@@ -1,7 +1,6 @@
 global:
   labels: {}
 
-kotsVersion: v0.0.0
 embeddedClusterVersion: v0.0.0
 embeddedClusterK0sVersion: v0.0.0
 embeddedBinaryName: v0.0.0

diff --git a/operator/pkg/charts/charts_test.go b/operator/pkg/charts/charts_test.go
@@ -70,7 +70,6 @@ global:
 image:
   repository: docker.io/replicated/embedded-cluster-operator-image
   tag: latest-amd64@sha256:eeed01216b5d2192afbd90e2e1f70419a8758551d8708f9d4b4f50f41d106ce8
-kotsVersion: 1.2.3-admin-console
 utilsImage: abc-repo/ec-utils:latest-amd64@sha256:92dec6e167ff57b35953da389c2f62c8ed9e529fe8dac3c3621269c3a66291f0
 `
 
@@ -86,7 +85,6 @@ image:
   repository: docker.io/replicated/embedded-cluster-operator-image
   tag: latest-amd64@sha256:eeed01216b5d2192afbd90e2e1f70419a8758551d8708f9d4b4f50f41d106ce8
 isAirgap: "true"
-kotsVersion: 1.2.3-admin-console
 utilsImage: abc-repo/ec-utils:latest-amd64@sha256:92dec6e167ff57b35953da389c2f62c8ed9e529fe8dac3c3621269c3a66291f0
 `
 
@@ -108,7 +106,6 @@ global:
 image:
   repository: docker.io/replicated/embedded-cluster-operator-image
   tag: latest-amd64@sha256:eeed01216b5d2192afbd90e2e1f70419a8758551d8708f9d4b4f50f41d106ce8
-kotsVersion: 1.2.3-admin-console
 utilsImage: abc-repo/ec-utils:latest-amd64@sha256:92dec6e167ff57b35953da389c2f62c8ed9e529fe8dac3c3621269c3a66291f0
 `
 
@@ -123,7 +120,6 @@ global:
 image:
   repository: docker.io/replicated/embedded-cluster-operator-image
   tag: latest-amd64@sha256:eeed01216b5d2192afbd90e2e1f70419a8758551d8708f9d4b4f50f41d106ce8
-kotsVersion: 1.2.3-admin-console
 utilsImage: abc-repo/ec-utils:latest-amd64@sha256:92dec6e167ff57b35953da389c2f62c8ed9e529fe8dac3c3621269c3a66291f0
 `
 

diff --git a/pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go b/pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go
@@ -110,7 +110,6 @@ func (e *EmbeddedClusterOperator) GenerateHelmConfig(k0sCfg *k0sv1beta1.ClusterC
 		Order:        3,
 	}
 
-	// TODO (@salah): move this to addons2
 	if !onlyDefaults {
 		helmValues["embeddedBinaryName"] = e.binaryName
 		helmValues["embeddedClusterID"] = metrics.ClusterID().String()

diff --git a/pkg/addons2/embeddedclusteroperator/embeddedclusteroperator.go b/pkg/addons2/embeddedclusteroperator/embeddedclusteroperator.go
@@ -6,7 +6,6 @@ import (
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	"github.com/pkg/errors"
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
-	"github.com/replicatedhq/embedded-cluster/pkg/addons2/adminconsole"
 	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/versions"
@@ -50,7 +49,6 @@ func Render() {
 	}
 	helmValues = hv
 
-	helmValues["kotsVersion"] = adminconsole.Metadata.Version
 	helmValues["embeddedClusterVersion"] = versions.Version
 	helmValues["embeddedClusterK0sVersion"] = versions.K0sVersion
 }