try patch

Signed-off-by: Kingdon Barrett <[email protected]>
kingdonb · Jun 12, 2024 · fa370b2 · fa370b2
1 parent 0233087
commit fa370b2
Showing 1 changed file with 55 additions and 49 deletions.
diff --git a/apps/hephy/hephy-patch.yaml b/apps/hephy/hephy-patch.yaml
@@ -1,4 +1,4 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta1
+apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: hephy
@@ -22,7 +22,7 @@ spec:
   #     name: public-ingress
   postRenderers:
     - kustomize:
-        patchesStrategicMerge:
+        patches:
           # - kind: Deployment
           #   apiVersion: apps/v1
           #   metadata:
@@ -33,63 +33,69 @@ spec:
           #         containers:
           #           - name: deis-builder
           #             image: kingdonb/builder:git-a3cb9b2
-          - kind: Deployment
-            apiVersion: apps/v1
-            metadata:
-              name: deis-controller
-            spec:
-              template:
-                spec:
-                  containers:
-                    - name: deis-controller
-                      image: kingdonb/controller:git-7beda111
-          - kind: Service
-            apiVersion: v1
-            metadata:
-              name: deis-builder
-            spec:
-              loadBalancerIP: 10.17.12.205        # deis-builder.nerdland.local
+          - patch: |-
+              kind: Deployment
+              apiVersion: apps/v1
+              metadata:
+                name: deis-controller
+              spec:
+                template:
+                  spec:
+                    containers:
+                      - name: deis-controller
+                        image: kingdonb/controller:git-7beda111
+          - patch: |-
+              kind: Service
+              apiVersion: v1
+              metadata:
+                name: deis-builder
+              spec:
+                loadBalancerIP: 10.17.12.205        # deis-builder.nerdland.local
           # - kind: StatefulSet
           #   apiVersion: apps/v1
           #   metadata:
           #     name: deis-nsqd
           #   "$patch": delete
-          - kind: DaemonSet
-            apiVersion: apps/v1
-            metadata:
-              name: deis-logger-fluentd
-            "$patch": delete
+          - patch: |-
+              kind: DaemonSet
+              apiVersion: apps/v1
+              metadata:
+                name: deis-logger-fluentd
+              "$patch": delete
           # - kind: StatefulSet
           #   apiVersion: apps/v1
           #   metadata:
           #     name: deis-logger-redis
           #   "$patch": delete
-          - kind: Deployment
-            apiVersion: apps/v1
-            metadata:
-              name: deis-logger
-            "$patch": delete
-          - kind: DaemonSet
-            apiVersion: apps/v1
-            metadata:
-              name: deis-monitor-telegraf
-            "$patch": delete
-          - kind: Deployment
-            apiVersion: apps/v1
-            metadata:
-              name: deis-minio
-            spec:
-              template:
-                spec:
-                  containers:
-                  - name: deis-minio
-                    volumeMounts:
-                    - mountPath: /home/minio
-                      name: deis-hephy
-                  volumes:
-                  - name: deis-hephy
-                    persistentVolumeClaim:
-                      claimName: deis-hephy
+          - patch: |-
+              kind: Deployment
+              apiVersion: apps/v1
+              metadata:
+                name: deis-logger
+              "$patch": delete
+          - patch: |-
+              kind: DaemonSet
+              apiVersion: apps/v1
+              metadata:
+                name: deis-monitor-telegraf
+              "$patch": delete
+          - patch: |-
+              kind: Deployment
+              apiVersion: apps/v1
+              metadata:
+                name: deis-minio
+              spec:
+                template:
+                  spec:
+                    containers:
+                    - name: deis-minio
+                      volumeMounts:
+                      - mountPath: /home/minio
+                        name: deis-hephy
+                    volumes:
+                    - name: deis-hephy
+                      persistentVolumeClaim:
+                        claimName: deis-hephy
          # - kind: Ingress
          #   apiVersion: extensions/v1beta1
          #   metadata: