Skip to content

Commit 96d5ce1

Browse files
committed
Bump controller-tools to v0.9.0
This version supports CEL validation rules via Go markers.
1 parent 0a8c439 commit 96d5ce1

12 files changed

+7
-70
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ endef
324324
CONTROLLER ?= hack/tools/controller-gen
325325
tools: tools/controller-gen
326326
tools/controller-gen:
327-
$(call go-get-tool,$(CONTROLLER),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0)
327+
$(call go-get-tool,$(CONTROLLER),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.0)
328328

329329
ENVTEST ?= hack/tools/setup-envtest
330330
tools: tools/setup-envtest

build/crd/crunchybridgeclusters/immutable.yaml

-11
This file was deleted.

build/crd/crunchybridgeclusters/kustomization.yaml

-18
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@ resources:
55
- generated/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml
66

77
patches:
8-
# Remove the zero status field included by [email protected]. These zero
9-
# values conflict with the CRD controller in Kubernetes before v1.22.
10-
# - https://github.com/kubernetes-sigs/controller-tools/pull/630
11-
# - https://pr.k8s.io/100970
12-
- target:
13-
group: apiextensions.k8s.io
14-
version: v1
15-
kind: CustomResourceDefinition
16-
name: crunchybridgeclusters.postgres-operator.crunchydata.com
17-
patch: |-
18-
- op: remove
19-
path: /status
208
- target:
219
group: apiextensions.k8s.io
2210
version: v1
@@ -29,9 +17,3 @@ patches:
2917
value:
3018
app.kubernetes.io/name: pgo
3119
app.kubernetes.io/version: latest
32-
- target:
33-
group: apiextensions.k8s.io
34-
version: v1
35-
kind: CustomResourceDefinition
36-
name: crunchybridgeclusters.postgres-operator.crunchydata.com
37-
path: immutable.yaml

build/crd/pgadmins/kustomization.yaml

-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@ resources:
55
- generated/postgres-operator.crunchydata.com_pgadmins.yaml
66

77
patches:
8-
# Remove the zero status field included by [email protected]. These zero
9-
# values conflict with the CRD controller in Kubernetes before v1.22.
10-
# - https://github.com/kubernetes-sigs/controller-tools/pull/630
11-
# - https://pr.k8s.io/100970
12-
- target:
13-
group: apiextensions.k8s.io
14-
version: v1
15-
kind: CustomResourceDefinition
16-
name: pgadmins.postgres-operator.crunchydata.com
17-
patch: |-
18-
- op: remove
19-
path: /status
208
- target:
219
group: apiextensions.k8s.io
2210
version: v1

build/crd/pgupgrades/kustomization.yaml

-12
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,6 @@ resources:
55
- generated/postgres-operator.crunchydata.com_pgupgrades.yaml
66

77
patches:
8-
# Remove the zero status field included by [email protected]. These zero
9-
# values conflict with the CRD controller in Kubernetes before v1.22.
10-
# - https://github.com/kubernetes-sigs/controller-tools/pull/630
11-
# - https://pr.k8s.io/100970
12-
- target:
13-
group: apiextensions.k8s.io
14-
version: v1
15-
kind: CustomResourceDefinition
16-
name: pgupgrades.postgres-operator.crunchydata.com
17-
patch: |-
18-
- op: remove
19-
path: /status
208
- target:
219
group: apiextensions.k8s.io
2210
version: v1

build/crd/postgresclusters/kustomization.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ patchesJson6902:
1111
kind: CustomResourceDefinition
1212
name: postgresclusters.postgres-operator.crunchydata.com
1313
path: condition.yaml
14-
- target:
15-
group: apiextensions.k8s.io
16-
version: v1
17-
kind: CustomResourceDefinition
18-
name: postgresclusters.postgres-operator.crunchydata.com
19-
path: status.yaml
2014
- target:
2115
group: apiextensions.k8s.io
2216
version: v1

build/crd/postgresclusters/status.yaml

-6
This file was deleted.

config/crd/bases/postgres-operator.crunchydata.com_crunchybridgeclusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.8.0
5+
controller-gen.kubebuilder.io/version: v0.9.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: pgo

config/crd/bases/postgres-operator.crunchydata.com_pgadmins.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.8.0
5+
controller-gen.kubebuilder.io/version: v0.9.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: pgo

config/crd/bases/postgres-operator.crunchydata.com_pgupgrades.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.8.0
5+
controller-gen.kubebuilder.io/version: v0.9.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: pgo

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.8.0
5+
controller-gen.kubebuilder.io/version: v0.9.0
66
creationTimestamp: null
77
labels:
88
app.kubernetes.io/name: pgo

pkg/apis/postgres-operator.crunchydata.com/v1beta1/crunchy_bridgecluster_types.go

+2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ type CrunchyBridgeClusterSpec struct {
6464
// Currently Bridge offers aws, azure, and gcp only
6565
// +kubebuilder:validation:Required
6666
// +kubebuilder:validation:Enum={aws,azure,gcp}
67+
// +kubebuilder:validation:XValidation:rule=`self == oldSelf`,message="immutable"
6768
Provider string `json:"provider"`
6869

6970
// The provider region where the cluster is located.
7071
// +kubebuilder:validation:Required
72+
// +kubebuilder:validation:XValidation:rule=`self == oldSelf`,message="immutable"
7173
Region string `json:"region"`
7274

7375
// Roles for which to create Secrets that contain their credentials which

0 commit comments

Comments
 (0)