From 9fb0296e7d4941a9ad70752748cf53b5b245b1c3 Mon Sep 17 00:00:00 2001 From: khmjp <44573383+khmjp@users.noreply.github.com> Date: Tue, 11 Jul 2023 13:54:49 +0900 Subject: [PATCH] chore: support kustomize v5 (#2702) Signed-off-by: Takeshi Kohama --- .../controller-manager/kustomization.yaml | 4 +- manifests/base/crds/kustomization.yaml | 6 +-- manifests/base/kustomization.yaml | 14 ++--- manifests/cluster-install/kustomization.yaml | 5 +- .../cluster-install/rbac/kustomization.yaml | 10 ++-- .../validating-webhook/kustomization.yaml | 5 +- .../namespace-install/kustomization.yaml | 16 +++--- .../namespace-install/rbac/kustomization.yaml | 4 +- test/manifests/kafka/kustomization.yaml | 4 +- test/manifests/kustomization.yaml | 54 ++++++++++--------- 10 files changed, 61 insertions(+), 61 deletions(-) diff --git a/manifests/base/controller-manager/kustomization.yaml b/manifests/base/controller-manager/kustomization.yaml index 4e14874a9c..689b92afa4 100644 --- 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 index 1871141ae5..99933b9db7 100644 --- 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 index 43c1b3e56e..9160575847 100644 --- 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 index 2a085640c1..7a0117cb58 100644 --- 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 index 522513e608..a632c6a5b7 100644 --- 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 index e402ead87b..315bcf3481 100644 --- 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 index 6cc2becf36..31d20da0c6 100644 --- 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 index 887c4ec6b9..66abddb74e 100644 --- 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 index cbd4e4b88b..c386e1eea6 100644 --- 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 index 21758cd9b8..b2e11c38e0 100644 --- 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