chore: support kustomize v5 (#2702)

Signed-off-by: Takeshi Kohama <khm.mb0@gmail.com>
argoproj · Aug 31, 2023 · 9fb0296 · 9fb0296
1 parent ee3303e
commit 9fb0296
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 61 deletions.
diff --git a/manifests/base/controller-manager/kustomization.yaml b/manifests/base/controller-manager/kustomization.yaml
@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - controller-config.yaml
-  - controller-manager-deployment.yaml
+- controller-config.yaml
+- controller-manager-deployment.yaml
diff --git a/manifests/base/crds/kustomization.yaml b/manifests/base/crds/kustomization.yaml
@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - argoproj.io_eventbus.yaml
-  - argoproj.io_eventsources.yaml
-  - argoproj.io_sensors.yaml
+- argoproj.io_eventbus.yaml
+- argoproj.io_eventsources.yaml
+- argoproj.io_sensors.yaml
diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -6,16 +6,16 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - crds
-  - argo-events-sa.yaml
-  - controller-manager
+- crds
+- argo-events-sa.yaml
+- controller-manager
 
 images:
-  - name: quay.io/argoproj/argo-events
-    newTag: v1.8.0
+- name: quay.io/argoproj/argo-events
+  newTag: v1.8.0
 
-patchesStrategicMerge:
-  - |-
+patches:
+- patch: |-
     apiVersion: apps/v1
     kind: Deployment
     metadata:

diff --git a/manifests/cluster-install/kustomization.yaml b/manifests/cluster-install/kustomization.yaml
@@ -2,8 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../base
-  - rbac
+- ../base
+- rbac
 
 namespace: argo-events
-
diff --git a/manifests/cluster-install/rbac/kustomization.yaml b/manifests/cluster-install/rbac/kustomization.yaml
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - argo-events-aggregate-to-admin.yaml
-  - argo-events-aggregate-to-edit.yaml
-  - argo-events-aggregate-to-view.yaml
-  - argo-events-cluster-role.yaml
-  - argo-events-binding.yaml
+- argo-events-aggregate-to-admin.yaml
+- argo-events-aggregate-to-edit.yaml
+- argo-events-aggregate-to-view.yaml
+- argo-events-cluster-role.yaml
+- argo-events-binding.yaml
diff --git a/manifests/extensions/validating-webhook/kustomization.yaml b/manifests/extensions/validating-webhook/kustomization.yaml
@@ -10,6 +10,5 @@ resources:
 namespace: argo-events
 
 images:
-  - name: quay.io/argoproj/argo-events
-    newTag: v1.8.0
-
+- name: quay.io/argoproj/argo-events
+  newTag: v1.8.0
diff --git a/manifests/namespace-install/kustomization.yaml b/manifests/namespace-install/kustomization.yaml
@@ -2,15 +2,15 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../base
-  - rbac
+- ../base
+- rbac
 
 namespace: argo-events
 
 patches:
-  - patch: |-
-      - op: add
-        path: /spec/template/spec/containers/0/args/-
-        value: --namespaced
-    target:
-      kind: Deployment
+- patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/args/-
+      value: --namespaced
+  target:
+    kind: Deployment
diff --git a/manifests/namespace-install/rbac/kustomization.yaml b/manifests/namespace-install/rbac/kustomization.yaml
@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - argo-events-role.yaml
-  - argo-events-role-binding.yaml
+- argo-events-role.yaml
+- argo-events-role-binding.yaml
diff --git a/test/manifests/kafka/kustomization.yaml b/test/manifests/kafka/kustomization.yaml
@@ -2,5 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - kafka.yaml
-  - zookeeper.yaml
+- kafka.yaml
+- zookeeper.yaml
diff --git a/test/manifests/kustomization.yaml b/test/manifests/kustomization.yaml
@@ -2,35 +2,37 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../manifests/cluster-install
-  - ../../manifests/extensions/validating-webhook
+- ../../manifests/cluster-install
+- ../../manifests/extensions/validating-webhook
 
 patches:
-  - patch: |-
-      - op: replace
-        path: /spec/template/spec/containers/0/imagePullPolicy
+- patch: |-
+    - op: replace
+      path: /spec/template/spec/containers/0/imagePullPolicy
+      value: IfNotPresent
+  target:
+    kind: Deployment
+    name: controller-manager
+- patch: |-
+    - op: replace
+      path: /spec/template/spec/containers/0/imagePullPolicy
+      value: IfNotPresent
+  target:
+    kind: Deployment
+    name: events-webhook
+- patch: |-
+    - op: add
+      path: /spec/template/spec/containers/0/env/-
+      value:
+        name: IMAGE_PULL_POLICY
         value: IfNotPresent
-    target:
-      kind: Deployment
-      name: controller-manager
-  - patch: |-
-      - op: replace
-        path: /spec/template/spec/containers/0/imagePullPolicy
-        value: IfNotPresent
-    target:
-      kind: Deployment
-      name: events-webhook
-  - patch: |-
-      - op: add
-        path: /spec/template/spec/containers/0/env/-
-        value:
-          name: IMAGE_PULL_POLICY
-          value: IfNotPresent
-    target:
-      kind: Deployment
-      name: controller-manager
+  target:
+    kind: Deployment
+    name: controller-manager
 
 namespace: argo-events
 
-commonLabels:
-  "app.kubernetes.io/part-of": "argo-events"
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/part-of: argo-events