Merge remote-tracking branch 'origin/main' into update/capi-gcp

pluralsh · Nov 10, 2023 · 536ac2c · 536ac2c
2 parents 10c8bee + c6558ef
commit 536ac2c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/bootstrap/helm/bootstrap/Chart.yaml b/bootstrap/helm/bootstrap/Chart.yaml
@@ -10,7 +10,7 @@ maintainers:
   email: [email protected]
 - name: David van der Spek
   email: [email protected]
-version: 0.8.77
+version: 0.8.78
 dependencies:
 - name: external-dns
   version: 6.14.1

diff --git a/bootstrap/helm/bootstrap/values.yaml.tpl b/bootstrap/helm/bootstrap/values.yaml.tpl
@@ -183,16 +183,13 @@ dnsSolver:
 
 {{ if $isGcp }}
 cert-manager:
+  podAnnotations:
+    checksum/sa: {{ importValue "Terraform" "certmanager_sa_workload_identity_email" | sha256sum }}
   serviceAccount:
-{{ if not .ClusterAPI }}
-    create: false
-{{ end }}
-    name: certmanager
-{{ if .ClusterAPI }}
     create: true
+    name: certmanager
     annotations:
       iam.gke.io/gcp-service-account: {{ importValue "Terraform" "certmanager_sa_workload_identity_email" }}
-{{ end }}
 
 {{ if not $pluraldns }}
 dnsSolver:

diff --git a/bootstrap/terraform/gcp-bootstrap/main.tf b/bootstrap/terraform/gcp-bootstrap/main.tf
@@ -104,7 +104,7 @@ resource "kubernetes_namespace" "bootstrap" {
 }
 
 resource "kubernetes_service_account" "certmanager" {
-  count = var.cluster_api ? 0 : 1
+  count = var.cluster_api ? 0 : 0
   metadata {
     name      = "certmanager"
     namespace = var.namespace

diff --git a/bootstrap/terraform/gcp-bootstrap/variables.tf b/bootstrap/terraform/gcp-bootstrap/variables.tf
@@ -253,7 +253,7 @@ variable "num_static_ips" {
 
 variable "kubernetes_version" {
   type = string
-  default = "1.24.17-gke.200"
+  default = "1.24.17-gke.2211000"
 }
 
 variable "vpc_subnetwork_cidr_range" {