From a3926b93d87ad9cdd9d2d20b209b6213470ebb98 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Fri, 6 Dec 2024 16:23:21 +0100 Subject: [PATCH] Bump CONTROLLER_TOOLS_VERSION to 0.14.0 bump controller tools to the version which bumps k8s deps to v0.29.0, which aligns with the version in the operators. Signed-off-by: Martin Schuppert --- Makefile | 2 +- ...client.openstack.org_openstackclients.yaml | 3 +-- ....openstack.org_openstackcontrolplanes.yaml | 12 ++++++++-- .../core.openstack.org_openstackversions.yaml | 3 +-- ...ack.org_openstackdataplanedeployments.yaml | 3 +-- ...nstack.org_openstackdataplanenodesets.yaml | 3 +-- ...nstack.org_openstackdataplaneservices.yaml | 3 +-- apis/client/v1beta1/zz_generated.deepcopy.go | 1 - apis/core/v1beta1/zz_generated.deepcopy.go | 16 +++++++++----- .../v1beta1/zz_generated.deepcopy.go | 22 ++++++++++++------- ...client.openstack.org_openstackclients.yaml | 3 +-- ....openstack.org_openstackcontrolplanes.yaml | 12 ++++++++-- .../core.openstack.org_openstackversions.yaml | 3 +-- ...ack.org_openstackdataplanedeployments.yaml | 3 +-- ...nstack.org_openstackdataplanenodesets.yaml | 3 +-- ...nstack.org_openstackdataplaneservices.yaml | 3 +-- ...nstack-operator.clusterserviceversion.yaml | 5 ++++- config/rbac/role.yaml | 1 - config/webhook/manifests.yaml | 2 -- 19 files changed, 59 insertions(+), 44 deletions(-) diff --git a/Makefile b/Makefile index df1819692..926c1692d 100644 --- a/Makefile +++ b/Makefile @@ -271,7 +271,7 @@ KUTTL ?= $(LOCALBIN)/kubectl-kuttl ## Tool Versions KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.11.1 +CONTROLLER_TOOLS_VERSION ?= v0.14.0 CRD_MARKDOWN_VERSION ?= v0.0.3 KUTTL_VERSION ?= 0.17.0 GOTOOLCHAIN_VERSION ?= go1.21.0 diff --git a/apis/bases/client.openstack.org_openstackclients.yaml b/apis/bases/client.openstack.org_openstackclients.yaml index 96dd6f0ac..8bc98c829 100644 --- a/apis/bases/client.openstack.org_openstackclients.yaml +++ b/apis/bases/client.openstack.org_openstackclients.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackclients.client.openstack.org spec: group: client.openstack.org diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 7538af6d9..378e3144d 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackcontrolplanes.core.openstack.org spec: group: core.openstack.org @@ -3745,8 +3744,10 @@ spec: required: - containerImage type: object + default: {} type: object imageCache: + default: {} properties: cleanerScheduler: default: '*/30 * * * *' @@ -4584,6 +4585,7 @@ spec: type: string type: object extraMounts: + default: [] items: properties: extraVol: @@ -9108,6 +9110,7 @@ spec: template: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9345,6 +9348,7 @@ spec: octaviaHealthManager: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9478,6 +9482,7 @@ spec: octaviaHousekeeping: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9699,6 +9704,7 @@ spec: octaviaWorker: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9934,8 +9940,10 @@ spec: ovnController: properties: external-ids: + default: {} properties: availability-zones: + default: [] items: type: string type: array diff --git a/apis/bases/core.openstack.org_openstackversions.yaml b/apis/bases/core.openstack.org_openstackversions.yaml index a4b7becfc..7b9e59a7a 100644 --- a/apis/bases/core.openstack.org_openstackversions.yaml +++ b/apis/bases/core.openstack.org_openstackversions.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackversions.core.openstack.org spec: group: core.openstack.org diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml index 939559fd1..ed9687c53 100644 --- a/apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml +++ b/apis/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackdataplanedeployments.dataplane.openstack.org spec: group: dataplane.openstack.org diff --git a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 5cf26d9a5..78b62e91d 100644 --- a/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackdataplanenodesets.dataplane.openstack.org spec: group: dataplane.openstack.org diff --git a/apis/bases/dataplane.openstack.org_openstackdataplaneservices.yaml b/apis/bases/dataplane.openstack.org_openstackdataplaneservices.yaml index f4eb7e6ca..79c24c635 100644 --- a/apis/bases/dataplane.openstack.org_openstackdataplaneservices.yaml +++ b/apis/bases/dataplane.openstack.org_openstackdataplaneservices.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackdataplaneservices.dataplane.openstack.org spec: group: dataplane.openstack.org diff --git a/apis/client/v1beta1/zz_generated.deepcopy.go b/apis/client/v1beta1/zz_generated.deepcopy.go index 010dfef40..1379722f5 100644 --- a/apis/client/v1beta1/zz_generated.deepcopy.go +++ b/apis/client/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022. diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go index 9e3ebff7c..81798cdd3 100644 --- a/apis/core/v1beta1/zz_generated.deepcopy.go +++ b/apis/core/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022. @@ -211,7 +210,8 @@ func (in *ContainerImages) DeepCopyInto(out *ContainerImages) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(string) **out = **in } @@ -226,7 +226,8 @@ func (in *ContainerImages) DeepCopyInto(out *ContainerImages) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(string) **out = **in } @@ -682,7 +683,8 @@ func (in *CustomContainerImages) DeepCopyInto(out *CustomContainerImages) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(string) **out = **in } @@ -697,7 +699,8 @@ func (in *CustomContainerImages) DeepCopyInto(out *CustomContainerImages) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(string) **out = **in } @@ -1331,7 +1334,8 @@ func (in *OpenStackVersionStatus) DeepCopyInto(out *OpenStackVersionStatus) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = new(ContainerDefaults) (*in).DeepCopyInto(*out) } diff --git a/apis/dataplane/v1beta1/zz_generated.deepcopy.go b/apis/dataplane/v1beta1/zz_generated.deepcopy.go index ebe72aef3..ce7562f10 100644 --- a/apis/dataplane/v1beta1/zz_generated.deepcopy.go +++ b/apis/dataplane/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright 2022. @@ -56,7 +55,8 @@ func (in *AnsibleEESpec) DeepCopyInto(out *AnsibleEESpec) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(json.RawMessage, len(*in)) copy(*out, *in) } @@ -96,7 +96,8 @@ func (in *AnsibleOpts) DeepCopyInto(out *AnsibleOpts) { if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(json.RawMessage, len(*in)) copy(*out, *in) } @@ -343,7 +344,8 @@ func (in *OpenStackDataPlaneDeploymentSpec) DeepCopyInto(out *OpenStackDataPlane if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(json.RawMessage, len(*in)) copy(*out, *in) } @@ -385,7 +387,8 @@ func (in *OpenStackDataPlaneDeploymentStatus) DeepCopyInto(out *OpenStackDataPla if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(condition.Conditions, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) @@ -571,7 +574,8 @@ func (in *OpenStackDataPlaneNodeSetStatus) DeepCopyInto(out *OpenStackDataPlaneN if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(condition.Conditions, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) @@ -588,7 +592,8 @@ func (in *OpenStackDataPlaneNodeSetStatus) DeepCopyInto(out *OpenStackDataPlaneN if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(map[networkv1beta1.NetNameStr]string, len(*in)) for key, val := range *in { (*out)[key] = val @@ -605,7 +610,8 @@ func (in *OpenStackDataPlaneNodeSetStatus) DeepCopyInto(out *OpenStackDataPlaneN if val == nil { (*out)[key] = nil } else { - in, out := &val, &outVal + inVal := (*in)[key] + in, out := &inVal, &outVal *out = make(map[networkv1beta1.NetNameStr]string, len(*in)) for key, val := range *in { (*out)[key] = val diff --git a/config/crd/bases/client.openstack.org_openstackclients.yaml b/config/crd/bases/client.openstack.org_openstackclients.yaml index 96dd6f0ac..8bc98c829 100644 --- a/config/crd/bases/client.openstack.org_openstackclients.yaml +++ b/config/crd/bases/client.openstack.org_openstackclients.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackclients.client.openstack.org spec: group: client.openstack.org diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 7538af6d9..378e3144d 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackcontrolplanes.core.openstack.org spec: group: core.openstack.org @@ -3745,8 +3744,10 @@ spec: required: - containerImage type: object + default: {} type: object imageCache: + default: {} properties: cleanerScheduler: default: '*/30 * * * *' @@ -4584,6 +4585,7 @@ spec: type: string type: object extraMounts: + default: [] items: properties: extraVol: @@ -9108,6 +9110,7 @@ spec: template: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9345,6 +9348,7 @@ spec: octaviaHealthManager: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9478,6 +9482,7 @@ spec: octaviaHousekeeping: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9699,6 +9704,7 @@ spec: octaviaWorker: properties: amphoraCustomFlavors: + default: [] items: properties: RAM: @@ -9934,8 +9940,10 @@ spec: ovnController: properties: external-ids: + default: {} properties: availability-zones: + default: [] items: type: string type: array diff --git a/config/crd/bases/core.openstack.org_openstackversions.yaml b/config/crd/bases/core.openstack.org_openstackversions.yaml index a4b7becfc..7b9e59a7a 100644 --- a/config/crd/bases/core.openstack.org_openstackversions.yaml +++ b/config/crd/bases/core.openstack.org_openstackversions.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackversions.core.openstack.org spec: group: core.openstack.org diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml index 939559fd1..ed9687c53 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanedeployments.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackdataplanedeployments.dataplane.openstack.org spec: group: dataplane.openstack.org diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml index 5cf26d9a5..78b62e91d 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackdataplanenodesets.dataplane.openstack.org spec: group: dataplane.openstack.org diff --git a/config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml b/config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml index f4eb7e6ca..79c24c635 100644 --- a/config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml +++ b/config/crd/bases/dataplane.openstack.org_openstackdataplaneservices.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: openstackdataplaneservices.dataplane.openstack.org spec: group: dataplane.openstack.org diff --git a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml index f44cee10a..e0181c04e 100644 --- a/config/manifests/bases/openstack-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/openstack-operator.clusterserviceversion.yaml @@ -267,7 +267,7 @@ spec: displayName: Template path: neutron.template - description: NodeSelector to target subset of worker nodes running control - plane services (currently only applies to KeystoneAPI and PlacementAPI) + plane services displayName: Node Selector path: nodeSelector - description: Nova - Parameters related to the Nova services @@ -374,6 +374,9 @@ spec: - description: Templates - Overrides to use when creating the Rabbitmq clusters displayName: Templates path: rabbitmq.templates + - description: NodeSelector to target subset of worker nodes running this service + displayName: Node Selector + path: rabbitmq.templates.nodeSelector - description: Enabled - Whether the Redis service should be deployed and managed displayName: Enabled path: redis.enabled diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index 4a072bbcc..19a4ea9ba 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 98d40b57b..2fd1496ca 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - creationTimestamp: null name: mutating-webhook-configuration webhooks: - admissionReviewVersions: @@ -129,7 +128,6 @@ webhooks: apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: