Normalize our kustomize files and get rid of deprecation warnings.

dsessler7 · ValClarkson · commit c623b254686a · 2023-10-25T11:06:34.000-04:00
diff --git a/kustomize/azure/kustomization.yaml b/kustomize/azure/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 secretGenerator:
diff --git a/kustomize/certmanager/certman/kustomization.yaml b/kustomize/certmanager/certman/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - selfsigned-clusterissuer.yaml
 - ca-cert.yaml
diff --git a/kustomize/certmanager/postgres/kustomization.yaml b/kustomize/certmanager/postgres/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 resources:
diff --git a/kustomize/gcs/kustomization.yaml b/kustomize/gcs/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 secretGenerator:
diff --git a/kustomize/high-availability/kustomization.yaml b/kustomize/high-availability/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 resources:
diff --git a/kustomize/install/crd/kustomization.yaml b/kustomize/install/crd/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - bases/postgres-operator.crunchydata.com_postgresclusters.yaml
 - bases/postgres-operator.crunchydata.com_pgupgrades.yaml
diff --git a/kustomize/install/default/kustomization.yaml b/kustomize/install/default/kustomization.yaml
@@ -1,12 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
-commonLabels:
-  app.kubernetes.io/name: pgo
-  # The version below should match the version on the PostgresCluster CRD
-  app.kubernetes.io/version: 5.4.2
-  postgres-operator.crunchydata.com/control-plane: postgres-operator
+labels:
+- includeTemplates: true
+  pairs:
+    app.kubernetes.io/name: pgo
+    # The version below should match the version on the PostgresCluster CRD
+    app.kubernetes.io/version: 5.4.2
+    postgres-operator.crunchydata.com/control-plane: postgres-operator
 
-bases:
+resources:
 - ../crd
 - ../rbac/cluster
 - ../manager
@@ -15,7 +20,3 @@ images:
 - name: postgres-operator
   newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
   newTag: ubi8-5.4.2-0
-
-patchesJson6902:
-- target: { group: apps, version: v1, kind: Deployment, name: pgo }
-  path: selectors.yaml
diff --git a/kustomize/install/default/selectors.yaml b/kustomize/install/default/selectors.yaml
diff --git a/kustomize/install/manager/kustomization.yaml b/kustomize/install/manager/kustomization.yaml
@@ -1,2 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - manager.yaml
diff --git a/kustomize/install/namespace/kustomization.yaml b/kustomize/install/namespace/kustomization.yaml
@@ -1,2 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - namespace.yaml
diff --git a/kustomize/install/rbac/cluster/kustomization.yaml b/kustomize/install/rbac/cluster/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - service_account.yaml
 - role.yaml
diff --git a/kustomize/install/rbac/namespace/kustomization.yaml b/kustomize/install/rbac/namespace/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - service_account.yaml
 - role.yaml
diff --git a/kustomize/install/singlenamespace/kustomization.yaml b/kustomize/install/singlenamespace/kustomization.yaml
@@ -1,12 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
-commonLabels:
-  app.kubernetes.io/name: pgo
-  # The version below should match the version on the PostgresCluster CRD
-  app.kubernetes.io/version: 5.4.2
-  postgres-operator.crunchydata.com/control-plane: postgres-operator
+labels:
+- includeTemplates: true
+  pairs:
+    app.kubernetes.io/name: pgo
+    # The version below should match the version on the PostgresCluster CRD
+    app.kubernetes.io/version: 5.4.2
+    postgres-operator.crunchydata.com/control-plane: postgres-operator
 
-bases:
+resources:
 - ../crd
 - ../rbac/namespace
 - ../manager
@@ -16,9 +21,5 @@ images:
   newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
   newTag: ubi8-5.4.2-0
 
-patchesJson6902:
-- target: { group: apps, version: v1, kind: Deployment, name: pgo }
-  path: selectors.yaml
-
-patchesStrategicMerge:
-- manager-target.yaml
+patches:
+- path: manager-target.yaml
diff --git a/kustomize/install/singlenamespace/selectors.yaml b/kustomize/install/singlenamespace/selectors.yaml
diff --git a/kustomize/keycloak/kustomization.yaml b/kustomize/keycloak/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 resources:
diff --git a/kustomize/multi-backup-repo/kustomization.yaml b/kustomize/multi-backup-repo/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 secretGenerator:
diff --git a/kustomize/postgres/kustomization.yaml b/kustomize/postgres/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 resources:
diff --git a/kustomize/s3/kustomization.yaml b/kustomize/s3/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 secretGenerator:
