From 754e5473dc91be9deffea9eef5e5e7c2ded2c1cc Mon Sep 17 00:00:00 2001
From: 012xx <night.fox.045@gmail.com>
Date: Thu, 29 Aug 2024 07:18:51 +0000
Subject: [PATCH] chore: Update generated files via

---
 config/crd/kustomization.yaml            | 10 ++++++----
 config/helm/crds/kustomization.yaml      | 10 +++++++---
 config/helm/templates/kustomization.yaml | 18 +++++++++++-------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
index f47c921..86b14ca 100644
--- a/config/crd/kustomization.yaml
+++ b/config/crd/kustomization.yaml
@@ -2,11 +2,9 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-  - bases/cattage.cybozu.io_tenants.yaml
+- bases/cattage.cybozu.io_tenants.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
-patchesStrategicMerge:
-  - patches/fix-crd.yaml
 # [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_tenants.yaml
@@ -19,4 +17,8 @@ patchesStrategicMerge:
 
 # the following config is for teaching kustomize how to do kustomization for CRDs.
 configurations:
-  - kustomizeconfig.yaml
+- kustomizeconfig.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patches:
+- path: patches/fix-crd.yaml
diff --git a/config/helm/crds/kustomization.yaml b/config/helm/crds/kustomization.yaml
index 8694560..4b91916 100644
--- a/config/helm/crds/kustomization.yaml
+++ b/config/helm/crds/kustomization.yaml
@@ -1,5 +1,9 @@
 resources:
-  - ../../crd
+- ../../crd
 
-commonLabels:
-  app.kubernetes.io/name: cattage
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: cattage
diff --git a/config/helm/templates/kustomization.yaml b/config/helm/templates/kustomization.yaml
index a3e9fc4..5af354c 100644
--- a/config/helm/templates/kustomization.yaml
+++ b/config/helm/templates/kustomization.yaml
@@ -1,16 +1,20 @@
 resources:
-  - ../../rbac
-  - ../../webhook
+- ../../rbac
+- ../../webhook
 
 namespace: '{{ .Release.Namespace }}'
 
 namePrefix: '{{ template "cattage.fullname" . }}-'
 
-commonLabels:
-  app.kubernetes.io/name: '{{ include "cattage.name" . }}'
 
-patchesStrategicMerge:
-  - webhookcainjection_patch.yaml
 
 transformers:
-  - label-transformer.yaml
+- label-transformer.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+labels:
+- includeSelectors: true
+  pairs:
+    app.kubernetes.io/name: '{{ include "cattage.name" . }}'
+patches:
+- path: webhookcainjection_patch.yaml