Merge pull request #5201 from danistrebel/fix/examples-patches

fix(examples): move examples from patchesStrategicMerge to patches

examples/breakfast.md

@@ -73,8 +73,8 @@ commonLabels:
   who: alice
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- temperature.yaml
+- path: temperature.yaml
 EOF
 
 cat <<EOF >$DEMO_HOME/breakfast/overlays/alice/temperature.yaml
@@ -96,8 +96,8 @@ commonLabels:
   who: bob
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- topping.yaml
+- path: topping.yaml
 EOF
 
 cat <<EOF >$DEMO_HOME/breakfast/overlays/bob/topping.yaml

examples/components.md

@@ -127,8 +127,8 @@ secretGenerator:
       - site_key.txt
       - secret_key.txt
 
-patchesStrategicMerge:
+patches:
-  - configmap.yaml
+  - path: configmap.yaml
 
 patchesJson6902:
 - target:
@@ -225,8 +225,8 @@ secretGenerator:
     files:
       - dbpass.txt
 
-patchesStrategicMerge:
+patches:
-  - configmap.yaml
+  - path: configmap.yaml
 
 patchesJson6902:
 - target:
@@ -326,8 +326,8 @@ secretGenerator:
       - site_key.txt
       - secret_key.txt
 
-patchesStrategicMerge:
+patches:
-  - configmap.yaml
+  - path: configmap.yaml
 
 patchesJson6902:
 - target:
@@ -536,8 +536,8 @@ secretGenerator:
   files:
     - dbpass.txt
 
-patchesStrategicMerge:
+patches:
-  - configmap.yaml
+  - path: configmap.yaml
 
 patchesJson6902:
 - target:
@@ -592,8 +592,8 @@ secretGenerator:
   files:
     - ldappass.txt
 
-patchesStrategicMerge:
+patches:
-  - configmap.yaml
+  - path: configmap.yaml
 
 patchesJson6902:
 - target:

examples/configGeneration.md

@@ -72,8 +72,8 @@ commonAnnotations:
   note: Hello, I am staging!
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- map.yaml
+  - path: map.yaml
 EOF
 
 cat <<EOF >$OVERLAYS/staging/map.yaml

examples/helloWorld/README.md

@@ -150,8 +150,8 @@ commonAnnotations:
   note: Hello, I am staging!
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- map.yaml
+- path: map.yaml
 EOF
 ```
 
@@ -191,8 +191,8 @@ commonAnnotations:
   note: Hello, I am production!
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- deployment.yaml
+- path: deployment.yaml
 EOF
 ```
 

examples/inlinePatch.md

@@ -44,9 +44,9 @@ EOF
 ```
 
 
-## Inline Patch for PatchesStrategicMerge
+## Inline Patch
 
-Create an overlay and add an inline patch in `patchesStrategicMerge` field to the kustomization file
+Create an overlay and add an inline patch in the `patches` field to the kustomization file
 to change the image from `nginx` to `nginx:latest`.
 
 <!-- @addSMPatch @test -->
@@ -57,18 +57,18 @@ cat <<EOF >$SMP_OVERLAY/kustomization.yaml
 resources:
 - ../base
 
-patchesStrategicMerge:
+patches:
-- |-
+- patch: |-
-  apiVersion: apps/v1
+    apiVersion: apps/v1
-  kind: Deployment
+    kind: Deployment
-  metadata:
+    metadata:
-    name: deploy
+      name: deploy
-  spec:
+    spec:
-    template:
+      template:
-      spec:
+        spec:
-        containers:
+          containers:
-        - name: nginx
+          - name: nginx
-          image: nginx:latest
+            image: nginx:latest
           
 EOF
 ```
@@ -110,18 +110,18 @@ cat <<EOF >$SMP_OVERLAY/kustomization.yaml
 resources:
 - ../base
 
-patchesStrategicMerge:
+patches:
-- |-
+- patch: |-
-  apiVersion: apps/v1
+    apiVersion: apps/v1
-  kind: Deployment
+    kind: Deployment
-  metadata:
+    metadata:
-    name: deploy
+      name: deploy
-  spec:
+    spec:
-    template:
+      template:
-      spec:
+        spec:
-        containers:
+          containers:
-        - name: nginx
+          - name: nginx
-          $patch: delete
+            $patch: delete
           
 EOF
 ```

examples/ldap/overlays/production/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
   - ../../base
-patchesStrategicMerge:
+patches:
-  - deployment.yaml
+  - path: deployment.yaml
 namePrefix: production-

examples/ldap/overlays/staging/kustomization.yaml

@@ -1,7 +1,7 @@
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
- - deployment.yaml
+ - path: deployment.yaml
 namePrefix: staging-
 configMapGenerator:
 - name: env-config

examples/mySql/README.md

@@ -150,7 +150,7 @@ Off the shelf MySQL uses `emptyDir` type volume, which
 gets wiped away if the MySQL Pod is recreated, and that
 is certainly not desirable for production
 environment. So we want to use Persistent Disk in
-production. kustomize lets you apply `patchesStrategicMerge` to the
+production. kustomize lets you apply `patches` to the
 resources.
 
 <!-- @createPatchFile @testAgainstLatestRelease -->
@@ -176,8 +176,8 @@ Add the patch file to `kustomization.yaml`:
 <!-- @specifyPatch @testAgainstLatestRelease -->
 ```
 cat <<'EOF' >> $DEMO_HOME/kustomization.yaml
-patchesStrategicMerge:
+patches:
-- persistent-disk.yaml
+- path: persistent-disk.yaml
 EOF
 ```
 
@@ -190,7 +190,7 @@ Lets break this down:
   in deployment.yaml
 
 - Then we added `persistent-disk.yaml` to list of
-  `patchesStrategicMerge` in `kustomization.yaml`. `kustomize build`
+  `patches` in `kustomization.yaml`. `kustomize build`
   will apply this patch to the deployment resource with
   the name `mysql` as defined in the patch.
 

examples/wordpress/README.md

@@ -55,8 +55,8 @@ resources:
 - wordpress
 - mysql
 namePrefix: demo-
-patchesStrategicMerge:
+patches:
-- patch.yaml
+- path: patch.yaml
 EOF
 ```
 

examples/wordpress/kustomization.yaml

@@ -1,8 +1,8 @@
 resources:
 - wordpress
 - mysql
-patchesStrategicMerge:
+patches:
-- patch.yaml
+- path: patch.yaml
 namePrefix: demo-
 
 vars:

examples/zh/breakfast.md

@@ -67,8 +67,8 @@ commonLabels:
   who: alice
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- temperature.yaml
+- path: temperature.yaml
 EOF
 
 cat <<EOF >$DEMO_HOME/breakfast/overlays/alice/temperature.yaml
@@ -90,8 +90,8 @@ commonLabels:
   who: bob
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- topping.yaml
+- path: topping.yaml
 EOF
 
 cat <<EOF >$DEMO_HOME/breakfast/overlays/bob/topping.yaml

examples/zh/configGeneration.md

@@ -77,8 +77,8 @@ commonAnnotations:
   note: Hello, I am staging!
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- map.yaml
+- path: map.yaml
 EOF
 
 cat <<EOF >$OVERLAYS/staging/map.yaml

examples/zh/helloWorld.md

@@ -138,8 +138,8 @@ commonAnnotations:
   note: Hello, I am staging!
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- map.yaml
+- path: map.yaml
 EOF
 ```
 
@@ -177,8 +177,8 @@ commonAnnotations:
   note: Hello, I am production!
 resources:
 - ../../base
-patchesStrategicMerge:
+patches:
-- deployment.yaml
+- path: deployment.yaml
 EOF
 ```
 

examples/zh/mysql.md

@@ -128,7 +128,7 @@ sed -i.bak 's/app: helloworld/app: prod/' \
 
 ### 存储定制
 
-现成的 MySQL 使用 `emptyDir` 类型的 volume，如果 MySQL Pod 被重新部署，则该类型的 volume 将会消失，这是不能应用于生产环境的，因此在生产环境中我们需要使用持久化磁盘。在 kustomize 中可以使用`patchesStrategicMerge` 来应用资源。
+现成的 MySQL 使用 `emptyDir` 类型的 volume，如果 MySQL Pod 被重新部署，则该类型的 volume 将会消失，这是不能应用于生产环境的，因此在生产环境中我们需要使用持久化磁盘。在 kustomize 中可以使用`patches` 来应用资源。
 
 <!-- @createPatchFile @testAgainstLatestRelease -->
 ```
@@ -153,15 +153,15 @@ EOF
 <!-- @specifyPatch @testAgainstLatestRelease -->
 ```
 cat <<'EOF' >> $DEMO_HOME/kustomization.yaml
-patchesStrategicMerge:
+patches:
-- persistent-disk.yaml
+- path: persistent-disk.yaml
 EOF
 ```
 
 `mysql-persistent-storage` 必须存在一个持久化磁盘才能使其成功运行，分为两步：
 
 1. 创建一个名为 `persistent-disk.yaml` 的 YAML 文件，用于修改 deployment.yaml 的定义。
-2. 在 `kustomization.yaml` 中添加 `persistent-disk.yaml` 到 `patchesStrategicMerge` 列表中。运行 `kustomize build` 将 patch 应用于 Deployment 资源。
+2. 在 `kustomization.yaml` 中添加 `persistent-disk.yaml` 到 `patches` 列表中。运行 `kustomize build` 将 patch 应用于 Deployment 资源。
 
 现在就可以将完整的配置输出并在集群中部署（将结果通过管道输出给 `kubectl apply`），在生产环境创建MySQL 应用。
 

examples/zh/vars.md

@@ -54,8 +54,8 @@ resources:
 - wordpress
 - mysql
 namePrefix: demo-
-patchesStrategicMerge:
+patches:
-- patch.yaml
+- path: patch.yaml
 EOF
 ```