Skip to content

Commit c623b25

Browse files
dsessler7ValClarkson
authored andcommitted
Normalize our kustomize files and get rid of deprecation warnings.
1 parent 8dacf79 commit c623b25

File tree

18 files changed

+66
-38
lines changed

18 files changed

+66
-38
lines changed

kustomize/azure/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
secretGenerator:

kustomize/certmanager/certman/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
resources:
25
- selfsigned-clusterissuer.yaml
36
- ca-cert.yaml

kustomize/certmanager/postgres/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
resources:

kustomize/gcs/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
secretGenerator:

kustomize/high-availability/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
resources:
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
resources:
25
- bases/postgres-operator.crunchydata.com_postgresclusters.yaml
36
- bases/postgres-operator.crunchydata.com_pgupgrades.yaml

kustomize/install/default/kustomization.yaml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

3-
commonLabels:
4-
app.kubernetes.io/name: pgo
5-
# The version below should match the version on the PostgresCluster CRD
6-
app.kubernetes.io/version: 5.4.2
7-
postgres-operator.crunchydata.com/control-plane: postgres-operator
6+
labels:
7+
- includeTemplates: true
8+
pairs:
9+
app.kubernetes.io/name: pgo
10+
# The version below should match the version on the PostgresCluster CRD
11+
app.kubernetes.io/version: 5.4.2
12+
postgres-operator.crunchydata.com/control-plane: postgres-operator
813

9-
bases:
14+
resources:
1015
- ../crd
1116
- ../rbac/cluster
1217
- ../manager
@@ -15,7 +20,3 @@ images:
1520
- name: postgres-operator
1621
newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
1722
newTag: ubi8-5.4.2-0
18-
19-
patchesJson6902:
20-
- target: { group: apps, version: v1, kind: Deployment, name: pgo }
21-
path: selectors.yaml

kustomize/install/default/selectors.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
resources:
25
- manager.yaml
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
resources:
25
- namespace.yaml

kustomize/install/rbac/cluster/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
resources:
25
- service_account.yaml
36
- role.yaml

kustomize/install/rbac/namespace/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
resources:
25
- service_account.yaml
36
- role.yaml
Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

3-
commonLabels:
4-
app.kubernetes.io/name: pgo
5-
# The version below should match the version on the PostgresCluster CRD
6-
app.kubernetes.io/version: 5.4.2
7-
postgres-operator.crunchydata.com/control-plane: postgres-operator
6+
labels:
7+
- includeTemplates: true
8+
pairs:
9+
app.kubernetes.io/name: pgo
10+
# The version below should match the version on the PostgresCluster CRD
11+
app.kubernetes.io/version: 5.4.2
12+
postgres-operator.crunchydata.com/control-plane: postgres-operator
813

9-
bases:
14+
resources:
1015
- ../crd
1116
- ../rbac/namespace
1217
- ../manager
@@ -16,9 +21,5 @@ images:
1621
newName: registry.developers.crunchydata.com/crunchydata/postgres-operator
1722
newTag: ubi8-5.4.2-0
1823

19-
patchesJson6902:
20-
- target: { group: apps, version: v1, kind: Deployment, name: pgo }
21-
path: selectors.yaml
22-
23-
patchesStrategicMerge:
24-
- manager-target.yaml
24+
patches:
25+
- path: manager-target.yaml

kustomize/install/singlenamespace/selectors.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

kustomize/keycloak/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
resources:

kustomize/multi-backup-repo/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
secretGenerator:

kustomize/postgres/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
resources:

kustomize/s3/kustomization.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
14
namespace: postgres-operator
25

36
secretGenerator:

0 commit comments

Comments
 (0)