Merge pull request #16 from kustomize-everything/highb-new-patch-syntax

New patch syntax
kustomize-everything · Aug 2, 2023 · 6e73eed · 6e73eed
2 parents dea32c8 + fad5cec
commit 6e73eed
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 26 deletions.
diff --git a/env/dev/ingress-dev-patch.yaml b/env/dev/ingress-dev-patch.yaml
@@ -0,0 +1,6 @@
+- op: replace
+  path: /spec/rules/0/host
+  value: guestbook-dev.demo.kustomize-everything.io
+- op: replace
+  path: /spec/tls/0/hosts/0
+  value: guestbook-dev.demo.kustomize-everything.io
diff --git a/env/dev/kustomization.yaml b/env/dev/kustomization.yaml
@@ -7,16 +7,11 @@ resources:
 patchesStrategicMerge:
 - guestbook-debug.yaml
 
-patchesJson6902:
-- target:
-    version: v1
+patches:
+- path: ingress-dev-patch.yaml
+  target:
     group: networking.k8s.io
     kind: Ingress
     name: guestbook
-  patch: |-
-    - op: replace
-      path: /spec/rules/0/host
-      value: guestbook-dev.demo.kustomize-everything.io
-    - op: replace
-      path: /spec/tls/0/hosts/0
-      value: guestbook-dev.demo.kustomize-everything.io
+    version: v1
+
diff --git a/env/prod/ingress-patch.yaml b/env/prod/ingress-patch.yaml
@@ -0,0 +1,6 @@
+- op: replace
+  path: /spec/rules/0/host
+  value: guestbook.demo.kustomize-everything.io
+- op: replace
+  path: /spec/tls/0/hosts/0
+  value: guestbook.demo.kustomize-everything.io
diff --git a/env/prod/kustomization.yaml b/env/prod/kustomization.yaml
@@ -4,14 +4,8 @@ kind: Kustomization
 resources:
 - ../../base
 
-patchesJson6902:
-- patch: |-
-    - op: replace
-      path: /spec/rules/0/host
-      value: guestbook.demo.kustomize-everything.io
-    - op: replace
-      path: /spec/tls/0/hosts/0
-      value: guestbook.demo.kustomize-everything.io
+patches:
+- path: ingress-patch.yaml
   target:
     group: networking.k8s.io
     kind: Ingress
@@ -21,3 +15,4 @@ patchesJson6902:
 images:
 - name: ghcr.io/kustomize-everything/guestbook
   newTag: 00027-d0d1e6a
+
diff --git a/env/stage/ingress-patch.yaml b/env/stage/ingress-patch.yaml
@@ -0,0 +1,6 @@
+- op: replace
+  path: /spec/rules/0/host
+  value: guestbook-stage.demo.kustomize-everything.io
+- op: replace
+  path: /spec/tls/0/hosts/0
+  value: guestbook-stage.demo.kustomize-everything.io
diff --git a/env/stage/kustomization.yaml b/env/stage/kustomization.yaml
@@ -4,14 +4,8 @@ kind: Kustomization
 resources:
 - ../../base
 
-patchesJson6902:
-- patch: |-
-    - op: replace
-      path: /spec/rules/0/host
-      value: guestbook-stage.demo.kustomize-everything.io
-    - op: replace
-      path: /spec/tls/0/hosts/0
-      value: guestbook-stage.demo.kustomize-everything.io
+patches:
+- path: ingress-patch.yaml
   target:
     group: networking.k8s.io
     kind: Ingress