Add dummy value to change nodegroup name

convox · Aug 24, 2023 · 2d954e0 · 2d954e0
1 parent ca74f40
commit 2d954e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/provider/k8s/k8s.go b/provider/k8s/k8s.go
@@ -344,7 +344,9 @@ func (p *Provider) initializeTemplates() {
 
 	if d.Spec.Template.Labels["app.kubernetes.io/version"] != CURRENT_CM_VERSION {
 		fmt.Println("Updating cert-manager")
-		p.deleteSystemTemplate("cert-manager", nil)
+		p.deleteSystemTemplate("cert-manager", map[string]interface{}{
+			"Role": p.CertManagerRoleArn,
+		})
 
 		currentRetry := 0
 		for {

diff --git a/provider/k8s/template/system/cert-manager.yml.tmpl b/provider/k8s/template/system/cert-manager.yml.tmpl
@@ -5263,7 +5263,7 @@ spec:
         runAsNonRoot: true
       containers:
         - name: cert-manager
-          image: "quay.io/jetstack/cert-manager-cainjector:v1.10.3"
+          image: "quay.io/jetstack/cert-manager-cainjector:v1.10.2"
           imagePullPolicy: IfNotPresent
           args:
           - --v=2
@@ -5315,7 +5315,7 @@ spec:
         runAsNonRoot: true
       containers:
         - name: cert-manager
-          image: "quay.io/jetstack/cert-manager-controller:v1.10.3"
+          image: "quay.io/jetstack/cert-manager-controller:v1.10.2"
           imagePullPolicy: IfNotPresent
           args:
           - --v=2
@@ -5368,7 +5368,7 @@ spec:
         runAsNonRoot: true
       containers:
         - name: cert-manager
-          image: "quay.io/jetstack/cert-manager-webhook:v1.10.3"
+          image: "quay.io/jetstack/cert-manager-webhook:v1.10.2"
           imagePullPolicy: IfNotPresent
           args:
           - --v=2

diff --git a/terraform/cluster/aws/main.tf b/terraform/cluster/aws/main.tf
@@ -67,6 +67,7 @@ resource "random_id" "node_group" {
   byte_length = 8
 
   keepers = {
+    dummy               = "1"
     node_capacity_type  = var.node_capacity_type
     node_disk           = var.node_disk
     node_type           = var.node_type
@@ -83,6 +84,7 @@ resource "random_id" "build_node_group" {
   byte_length = 8
 
   keepers = {
+    dummy               = "1"
     node_disk           = var.node_disk
     node_type           = var.build_node_type
     private_subnets_ids = join("-", local.private_subnets_ids)