fix: update gcp capi provider to work with latest capi charts (#865)

* fix: update gcp capi provider to work with latest capi charts * bump gcp chart dependency * allow helm to properly annotate certmanager SA * update bootstrap * bump helm/tf version
pluralsh · Nov 13, 2023 · ae12190 · ae12190
1 parent ade6b63
commit ae12190
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 23 deletions.
diff --git a/bootstrap/helm/cluster-api-provider-gcp/Chart.lock b/bootstrap/helm/cluster-api-provider-gcp/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster-api-provider-gcp
   repository: https://pluralsh.github.io/capi-helm-charts
-  version: 0.1.4
-digest: sha256:4a5070742fa6e34bf27a5ea29d590a5c86cdac50f56522b1b79671181907da82
-generated: "2023-08-23T17:30:41.21781934+02:00"
+  version: 0.1.9
+digest: sha256:276229b280a0de17bf5518f0a716d1d889100a7c52a9a49a651aa25d1d271363
+generated: "2023-11-03T15:03:07.222737147+01:00"
diff --git a/bootstrap/helm/cluster-api-provider-gcp/Chart.yaml b/bootstrap/helm/cluster-api-provider-gcp/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: cluster-api-provider-gcp
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.13
-appVersion: v1.4.5
+version: 0.2.0
+appVersion: v1.4.7
 dependencies:
-- name: cluster-api-provider-gcp
-  version: 0.1.4
-  repository: https://pluralsh.github.io/capi-helm-charts
+  - name: cluster-api-provider-gcp
+    version: 0.1.9
+    repository: https://pluralsh.github.io/capi-helm-charts
diff --git a/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.4.tgz b/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.4.tgz
diff --git a/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.9.tgz b/bootstrap/helm/cluster-api-provider-gcp/charts/cluster-api-provider-gcp-0.1.9.tgz
diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpcluster-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpcluster-crd.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   name: gcpclusters.infrastructure.cluster.x-k8s.io
   annotations:
-    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert'
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert'
     controller-gen.kubebuilder.io/version: v0.11.3
   labels:
     clusterctl.cluster.x-k8s.io: ""
@@ -18,7 +18,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service'
+          name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service'
           namespace: '{{ .Release.Namespace }}'
           path: /convert
       conversionReviewVersions:

diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpclustertemplate-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpclustertemplate-crd.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   name: gcpclustertemplates.infrastructure.cluster.x-k8s.io
   annotations:
-    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert'
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert'
     controller-gen.kubebuilder.io/version: v0.11.3
   labels:
     clusterctl.cluster.x-k8s.io: ""
@@ -18,7 +18,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service'
+          name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service'
           namespace: '{{ .Release.Namespace }}'
           path: /convert
       conversionReviewVersions:

diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachine-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachine-crd.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   name: gcpmachines.infrastructure.cluster.x-k8s.io
   annotations:
-    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert'
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert'
     controller-gen.kubebuilder.io/version: v0.11.3
   labels:
     clusterctl.cluster.x-k8s.io: ""
@@ -18,7 +18,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service'
+          name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service'
           namespace: '{{ .Release.Namespace }}'
           path: /convert
       conversionReviewVersions:

diff --git a/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachinetemplate-crd.yaml b/bootstrap/helm/cluster-api-provider-gcp/templates/gcpmachinetemplate-crd.yaml
@@ -4,7 +4,7 @@ kind: CustomResourceDefinition
 metadata:
   name: gcpmachinetemplates.infrastructure.cluster.x-k8s.io
   annotations:
-    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" . }}-serving-cert'
+    cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-serving-cert'
     controller-gen.kubebuilder.io/version: v0.11.3
   labels:
     clusterctl.cluster.x-k8s.io: ""
@@ -18,7 +18,7 @@ spec:
       clientConfig:
         caBundle: Cg==
         service:
-          name: '{{ include "cluster-api-provider-gcp.fullname" . }}-webhook-service'
+          name: '{{ include "cluster-api-provider-gcp.fullname" (index .Subcharts "cluster-api-provider-gcp") }}-webhook-service'
           namespace: '{{ .Release.Namespace }}'
           path: /convert
       conversionReviewVersions:

diff --git a/bootstrap/helm/cluster-api-provider-gcp/values.yaml b/bootstrap/helm/cluster-api-provider-gcp/values.yaml
@@ -11,7 +11,7 @@ cluster-api-provider-gcp:
     manager:
       image:
         repository: ghcr.io/pluralsh/cluster-api-gcp-controller
-        tag: v1.4.5
+        tag: v1.4.7
   bootstrapMode: false
 
 job:

diff --git a/bootstrap/helm/cluster-api-provider-gcp/values.yaml.tpl b/bootstrap/helm/cluster-api-provider-gcp/values.yaml.tpl
@@ -1,4 +1,5 @@
 cluster-api-provider-gcp:
-  serviceAccount:
-    annotations:
-      iam.gke.io/gcp-service-account: {{ importValue "Terraform" "capi_sa_workload_identity_email" }}
+  serviceAccounts:
+    manager:
+      annotations:
+        iam.gke.io/gcp-service-account: {{ importValue "Terraform" "capi_sa_workload_identity_email" }}
diff --git a/bootstrap/terraform/gcp-bootstrap/deps.yaml b/bootstrap/terraform/gcp-bootstrap/deps.yaml
@@ -2,7 +2,7 @@ apiVersion: plural.sh/v1alpha1
 kind: Dependencies
 metadata:
   description: Creates a GKE cluster and adds initial configuration
-  version: 0.2.25
+  version: 0.2.26
 spec:
   dependencies: []
   providers:

diff --git a/bootstrap/terraform/gcp-bootstrap/main.tf b/bootstrap/terraform/gcp-bootstrap/main.tf
@@ -164,12 +164,12 @@ module "certmanager-workload-identity" {
 
 module "capi-workload-identity" {
   source              = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
-  name                = "${var.cluster_name}-cluster-api-provider-gcp"
+  name                = "${var.cluster_name}-capg"
   namespace           = var.namespace
   project_id          = var.gcp_project_id
   use_existing_k8s_sa = true
   annotate_k8s_sa     = false
-  k8s_sa_name         = "bootstrap-cluster-api-provider-gcp"
+  k8s_sa_name         = "${var.namespace}-capg-manager"
   roles               = [
     "roles/iam.serviceAccountUser",
     "roles/iam.workloadIdentityUser",