Normalize our kustomize files and get rid of deprecation warnings.

CrunchyData · Oct 12, 2023 · c9e3267 · c9e3267
1 parent beac752
commit c9e3267
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 11 deletions.
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -1,10 +1,15 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
-commonLabels:
-  # Note: this label differs from the label set in postgres-operator-examples
-  postgres-operator.crunchydata.com/control-plane: postgres-operator
+labels:
+- includeSelectors: true
+  pairs:
+    # Note: this label differs from the label set in postgres-operator-examples
+    postgres-operator.crunchydata.com/control-plane: postgres-operator
 
-bases:
+resources:
 - ../crd
 - ../rbac/cluster
 - ../manager

diff --git a/config/dev/kustomization.yaml b/config/dev/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-bases:
+resources:
 - ../default
 
 patches:

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,2 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - manager.yaml
diff --git a/config/namespace/kustomization.yaml b/config/namespace/kustomization.yaml
@@ -1,2 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - namespace.yaml
diff --git a/config/rbac/cluster/kustomization.yaml b/config/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/config/rbac/namespace/kustomization.yaml b/config/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/config/singlenamespace/kustomization.yaml b/config/singlenamespace/kustomization.yaml
@@ -1,17 +1,22 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
-commonLabels:
-  postgres-operator.crunchydata.com/control-plane: postgres-operator
+labels:
+- includeSelectors: true
+  pairs:
+    postgres-operator.crunchydata.com/control-plane: postgres-operator
 
-bases:
+resources:
 - ../crd
 - ../rbac/namespace
 - ../manager
 
-patches:
-- path: manager-target.yaml
-
 images:
 - name: postgres-operator
   newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
   newTag: latest
+
+patches:
+- path: manager-target.yaml
diff --git a/examples/pgadmin/kustomization.yaml b/examples/pgadmin/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 resources:

diff --git a/examples/postgrescluster/kustomization.yaml b/examples/postgrescluster/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 namespace: postgres-operator
 
 resources: