fix: drop cert-manager double namepace reference

flanksource · May 18, 2023 · c4b9be4 · c4b9be4
1 parent d9a751f
commit c4b9be4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/manifests/cert-manager.yaml b/manifests/cert-manager.yaml
@@ -1,10 +1,5 @@
 # This file was generated by running 'make cert-manager.yaml' in manifests directory
 apiVersion: v1
-kind: Namespace
-metadata:
-  name: cert-manager
----
-apiVersion: v1
 automountServiceAccountToken: true
 kind: ServiceAccount
 metadata:

diff --git a/manifests/upstream/cert-manager/base/kustomization.yaml b/manifests/upstream/cert-manager/base/kustomization.yaml
@@ -8,27 +8,32 @@ images:
 resources:
   - https://github.com/jetstack/cert-manager/releases/download/v1.11.0/cert-manager.yaml
 
-patchesStrategicMerge:
-  - |-
-    apiVersion: apps/v1
-    kind: Deployment
-    metadata:
-      name: cert-manager
-      namespace: cert-manager
-    spec:
-      template:
-        spec:
-          containers:
-            - name: cert-manager-controller
-              args:
-                - --v=2
-                - --cluster-resource-namespace=$(POD_NAMESPACE)
-                - --default-issuer-name=ingress-ca
-                - --default-issuer-kind=ClusterIssuer
-                - --default-issuer-group=cert-manager.io
-                - --leader-election-namespace=kube-system
-                - --max-concurrent-challenges=60
 patches:
+  - patch: |-
+      $patch: delete
+      apiVersion: v1
+      kind: Namespace
+      metadata:
+        name: cert-manager
+  - patch: |-
+      apiVersion: apps/v1
+      kind: Deployment
+      metadata:
+        name: cert-manager
+        namespace: cert-manager
+      spec:
+        template:
+          spec:
+            containers:
+              - name: cert-manager-controller
+                args:
+                  - --v=2
+                  - --cluster-resource-namespace=$(POD_NAMESPACE)
+                  - --default-issuer-name=ingress-ca
+                  - --default-issuer-kind=ClusterIssuer
+                  - --default-issuer-group=cert-manager.io
+                  - --leader-election-namespace=kube-system
+                  - --max-concurrent-challenges=60
   - patch: |-
       - op: add
         path: /rules/0