#

Signed-off-by: abarreiro <abarreiro@vmware.com>
adambarreiro · May 20, 2024 · 520a3ab · 520a3ab
1 parent ddde23e
commit 520a3ab
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/govcd/cse/4.1/autoscaler.tmpl b/govcd/cse/4.1/autoscaler.tmpl
@@ -19,7 +19,7 @@ spec:
     spec:
       serviceAccountName: cluster-autoscaler
       containers:
-      - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.20.0
+      - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{.AutoscalerVersion}}
         name: cluster-autoscaler
         resources:
           limits:

diff --git a/govcd/cse/4.2/autoscaler.tmpl b/govcd/cse/4.2/autoscaler.tmpl
@@ -19,7 +19,7 @@ spec:
     spec:
       serviceAccountName: cluster-autoscaler
       containers:
-      - image: k8s.gcr.io/autoscaling/cluster-autoscaler:v1.20.0
+      - image: k8s.gcr.io/autoscaling/cluster-autoscaler:{{.AutoscalerVersion}}
         name: cluster-autoscaler
         resources:
           limits:

diff --git a/govcd/cse_internal.go b/govcd/cse_internal.go
@@ -282,6 +282,7 @@ func (clusterSettings *cseClusterSettingsInternal) generateAutoscalerYaml() (str
 	if err := autoscaler.Execute(buf, map[string]string{
 		"TargetNamespace":    clusterSettings.Name + "-ns",
 		"AutoscalerReplicas": "1",
+		"AutoscalerVersion":  cseKubernetesClusterDefaultAutoscalerVersion,
 	}); err != nil {
 		return "", fmt.Errorf("could not generate a correct Autoscaler YAML block: %s", err)
 	}

diff --git a/govcd/cse_test.go b/govcd/cse_test.go
@@ -289,7 +289,7 @@ func (vcd *TestVCD) Test_CseFoo(check *C) {
 	requireCseConfig(check, vcd.config)
 
 	// Prerequisites: We need to read several items before creating the cluster.
-	clusterGet, err := vcd.client.CseGetKubernetesClusterById("urn:vcloud:entity:vmware:capvcdCluster:cf8c9b14-20e3-451d-bc21-959286533480")
+	clusterGet, err := vcd.client.CseGetKubernetesClusterById("urn:vcloud:entity:vmware:capvcdCluster:e9d38be0-9d52-462d-b803-3c793ebb3bde")
 	check.Assert(err, IsNil)
 	check.Assert(clusterGet.Etag, Not(Equals), "")
 

diff --git a/govcd/cse_type.go b/govcd/cse_type.go
@@ -205,8 +205,9 @@ type cseComponentsVersions struct {
 	CseInterfaceVersion       string
 }
 
-// Constants that define the RDE Type of a CSE Kubernetes cluster
+// Constants used internally to manage CSE Kubernetes clusters
 const (
-	cseKubernetesClusterVendor    = "vmware"
-	cseKubernetesClusterNamespace = "capvcdCluster"
+	cseKubernetesClusterVendor                   = "vmware"
+	cseKubernetesClusterNamespace                = "capvcdCluster"
+	cseKubernetesClusterDefaultAutoscalerVersion = "v1.26.2"
 )