Skip to content

Commit d1ff901

Browse files
ChunyiLyuChunyiLyu
authored
Bump k8s api 1.22 (#913)
* Bump k8s api 1.22 - bump to latest controller-tools, controller-runtime - latest k8s api 1.22 removes spec.topologyKeys from services spec which removes this key from our CRD service override - controller-gen now does not support CRD v1beta1 and crd options such as trivialVersions and preserveUnknownFields are not necessary anymore
1 parent 35f8fbb commit d1ff901

File tree

7 files changed

+312
-136
lines changed

7 files changed

+312
-136
lines changed

‎Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ unit-tests: install-tools $(KUBEBUILDER_ASSETS) generate fmt vet manifests ## Ru
2525
integration-tests: install-tools $(KUBEBUILDER_ASSETS) generate fmt vet manifests ## Run integration tests
2626
ginkgo -r controllers/
2727

28-
CRD_OPTIONS ?= "crd:trivialVersions=true, preserveUnknownFields=false"
29-
3028
manifests: install-tools ## Generate manifests e.g. CRD, RBAC etc.
31-
controller-gen $(CRD_OPTIONS) rbac:roleName=operator-role paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
29+
controller-gen crd rbac:roleName=operator-role paths="./api/...;./controllers/..." output:crd:artifacts:config=config/crd/bases
3230
./hack/remove-override-descriptions.sh
3331
./hack/add-notice-to-yaml.sh config/rbac/role.yaml
3432
./hack/add-notice-to-yaml.sh config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml

‎config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml‎

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
annotations:
13-
controller-gen.kubebuilder.io/version: v0.6.2
13+
controller-gen.kubebuilder.io/version: v0.7.0
1414
creationTimestamp: null
1515
name: rabbitmqclusters.rabbitmq.com
1616
spec:
@@ -216,7 +216,7 @@ spec:
216216
type: object
217217
type: object
218218
namespaceSelector:
219-
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is alpha-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
219+
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
220220
properties:
221221
matchExpressions:
222222
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -301,7 +301,7 @@ spec:
301301
type: object
302302
type: object
303303
namespaceSelector:
304-
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is alpha-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
304+
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
305305
properties:
306306
matchExpressions:
307307
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -385,7 +385,7 @@ spec:
385385
type: object
386386
type: object
387387
namespaceSelector:
388-
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is alpha-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
388+
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
389389
properties:
390390
matchExpressions:
391391
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -470,7 +470,7 @@ spec:
470470
type: object
471471
type: object
472472
namespaceSelector:
473-
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is alpha-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
473+
description: A label query over the set of namespaces that the term applies to. The term is applied to the union of the namespaces selected by this field and the ones listed in the namespaces field. null selector and null or empty namespaces list means "this pod's namespace". An empty selector ({}) matches all namespaces. This field is beta-level and is only honored when PodAffinityNamespaceSelector feature is enabled.
474474
properties:
475475
matchExpressions:
476476
description: matchExpressions is a list of label selector requirements. The requirements are ANDed.
@@ -615,6 +615,7 @@ spec:
615615
additionalProperties:
616616
type: string
617617
type: object
618+
x-kubernetes-map-type: atomic
618619
sessionAffinity:
619620
type: string
620621
sessionAffinityConfig:
@@ -626,10 +627,6 @@ spec:
626627
type: integer
627628
type: object
628629
type: object
629-
topologyKeys:
630-
items:
631-
type: string
632-
type: array
633630
type:
634631
type: string
635632
type: object
@@ -1492,6 +1489,8 @@ spec:
14921489
type: string
14931490
gmsaCredentialSpecName:
14941491
type: string
1492+
hostProcess:
1493+
type: boolean
14951494
runAsUserName:
14961495
type: string
14971496
type: object
@@ -2067,6 +2066,8 @@ spec:
20672066
type: string
20682067
gmsaCredentialSpecName:
20692068
type: string
2069+
hostProcess:
2070+
type: boolean
20702071
runAsUserName:
20712072
type: string
20722073
type: object
@@ -2650,6 +2651,8 @@ spec:
26502651
type: string
26512652
gmsaCredentialSpecName:
26522653
type: string
2654+
hostProcess:
2655+
type: boolean
26532656
runAsUserName:
26542657
type: string
26552658
type: object
@@ -2776,6 +2779,7 @@ spec:
27762779
additionalProperties:
27772780
type: string
27782781
type: object
2782+
x-kubernetes-map-type: atomic
27792783
overhead:
27802784
additionalProperties:
27812785
anyOf:
@@ -2864,6 +2868,8 @@ spec:
28642868
type: string
28652869
gmsaCredentialSpecName:
28662870
type: string
2871+
hostProcess:
2872+
type: boolean
28672873
runAsUserName:
28682874
type: string
28692875
type: object
@@ -3147,6 +3153,18 @@ spec:
31473153
- kind
31483154
- name
31493155
type: object
3156+
dataSourceRef:
3157+
properties:
3158+
apiGroup:
3159+
type: string
3160+
kind:
3161+
type: string
3162+
name:
3163+
type: string
3164+
required:
3165+
- kind
3166+
- name
3167+
type: object
31503168
resources:
31513169
properties:
31523170
limits:
@@ -3663,6 +3681,18 @@ spec:
36633681
- kind
36643682
- name
36653683
type: object
3684+
dataSourceRef:
3685+
properties:
3686+
apiGroup:
3687+
type: string
3688+
kind:
3689+
type: string
3690+
name:
3691+
type: string
3692+
required:
3693+
- kind
3694+
- name
3695+
type: object
36663696
resources:
36673697
properties:
36683698
limits:

‎docs/api/autogen/config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
render:
2-
kubernetesVersion: "1.20"
2+
kubernetesVersion: "1.22"
33

0 commit comments

Comments
 (0)