fix(cert-manager): update sa annotation

PHACDataHub · Nov 15, 2023 · 4881482 · 4881482
1 parent f81efbc
commit 4881482
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/k8s/cert-manager/cert-manager.yaml b/k8s/cert-manager/cert-manager.yaml
@@ -34,7 +34,4 @@ spec:
     global:
       leaderElection:
         namespace: cert-manager
-      serviceAccount:
-        # Specifies whether a service account should be created
-        create: true
 
diff --git a/k8s/cert-manager/kustomization.yaml b/k8s/cert-manager/kustomization.yaml
@@ -4,12 +4,14 @@ resources:
 - cert-manager.yaml
 patches:
 - target:
-    version: v1
-    kind: ServiceAccount
+    group: helm.toolkit.fluxcd.io
+    version: v2beta1
+    kind: HelmRelease
     name: cert-manager
     namespace: cert-manager
   patch: |-
     - op: add
-      path: "/metadata/annotations"
+      path: /spec/values/serviceAccount
       value:
-        iam.gke.io/gcp-service-account: dns01-solver@phx-01h8eq9sbx7d19zsvqk7t9zymr.iam.gserviceaccount.com
+        annotations:
+          iam.gke.io/gcp-service-account: dns01-solver@phx-01h8eq9sbx7d19zsvqk7t9zymr.iam.gserviceaccount.com
diff --git a/k8s/flux-system/flux-system/kustomization.yaml b/k8s/flux-system/flux-system/kustomization.yaml
@@ -3,3 +3,4 @@ kind: Kustomization
 resources:
 - gotk-components.yaml
 - gotk-sync.yaml
+- istio-version.yaml
diff --git a/k8s/istio-system/istio.yaml b/k8s/istio-system/istio.yaml
@@ -24,6 +24,7 @@ spec:
     crds: CreateReplace
   chart:
     spec:
+      version: "${version}"
       chart: base
       sourceRef:
         kind: HelmRepository
@@ -43,6 +44,7 @@ spec:
     - name: istio-base
   chart:
     spec:
+      version: "${version}"
       chart: istiod
       sourceRef:
         kind: HelmRepository
@@ -77,6 +79,7 @@ spec:
     - name: istiod
   chart:
     spec:
+      version: "${version}"
       chart: gateway
       sourceRef:
         kind: HelmRepository
@@ -90,4 +93,4 @@ spec:
         cpu: 10m
         memory: 128Mi
     service:
-      type: "${service:=LoadBalancer}"
+      type: "${service:=LoadBalancer}"