diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index 85e74bc8d3..82b2310ca0 100644 --- 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 index d837c90677..2794e5fb69 100644 --- 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 index 5c5f0b84cb..dfce22e6c5 100644 --- 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 index bf20f4df68..e06cce134a 100644 --- 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 index 664fcac061..82cfb0841b 100644 --- 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 index 664fcac061..82cfb0841b 100644 --- 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 index a8ca44ba6a..a6dc8de538 100644 --- 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 index 2e16c17f76..600eb8b82d 100644 --- 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 index 240a6e2067..7035765b87 100644 --- 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: