Merge pull request #200 from cybozu-go/update-deprecated-fields

Update deprecated kustomize fields

Author: gokken-roko

config/agent/kustomization.yaml

@@ -4,9 +4,11 @@ images:
 - name: ghcr.io/cybozu-go/meows-controller
   newTag: 0.20.1
 
-commonLabels:
-  app.kubernetes.io/name: meows
-  app.kubernetes.io/component: slack-agent
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: meows
+    app.kubernetes.io/component: slack-agent
 
 resources:
 - manifests.yaml

config/controller/kustomization.yaml

@@ -6,9 +6,11 @@ images:
 
 namePrefix: meows-
 
-commonLabels:
-  app.kubernetes.io/name: meows
-  app.kubernetes.io/component: controller
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: meows
+    app.kubernetes.io/component: controller
 
 resources:
 - certificate.yaml
@@ -24,8 +26,8 @@ resources:
 configurations:
 - kustomizeconfig.yaml
 
-patchesStrategicMerge:
-- webhook_patch.yaml
+patches:
+- path: webhook_patch.yaml
 
 # the following config is for teaching kustomize how to do var substitution
 vars:

config/crd/kustomization.yaml

@@ -5,15 +5,15 @@ resources:
 - bases/meows.cybozu.com_runnerpools.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
+patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 # - patches/webhook_in_runnerpools.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable webhook, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
-- patches/cainjection_in_runnerpools.yaml
+- path: patches/cainjection_in_runnerpools.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.

kindtest/manifests/controller/kustomization.yaml

@@ -1,5 +1,5 @@
-bases:
+resources:
 - ../../../config/controller
 
-patchesStrategicMerge:
-- patch.yaml
+patches:
+- path: patch.yaml

kindtest/manifests/slack-agent/kustomization.yaml

@@ -1,5 +1,5 @@
-bases:
+resources:
 - ../../../config/agent
 
-patchesStrategicMerge:
-- patch.yaml
+patches:
+- path: patch.yaml