Skip to content

Commit

Permalink
Bump CONTROLLER_TOOLS_VERSION to 0.14.0
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
stuggi committed Dec 18, 2024
1 parent 7456bee commit a5fc7f5
Show file tree
Hide file tree
Showing 18 changed files with 53 additions and 43 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,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
Expand Down
3 changes: 1 addition & 2 deletions apis/bases/client.openstack.org_openstackclients.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -3852,6 +3851,7 @@ spec:
required:
- containerImage
type: object
default: {}
type: object
imageCache:
properties:
Expand Down Expand Up @@ -4691,6 +4691,7 @@ spec:
type: string
type: object
extraMounts:
default: []
items:
properties:
extraVol:
Expand Down Expand Up @@ -9215,6 +9216,7 @@ spec:
template:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -9455,6 +9457,7 @@ spec:
octaviaHealthManager:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -9588,6 +9591,7 @@ spec:
octaviaHousekeeping:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -9809,6 +9813,7 @@ spec:
octaviaWorker:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -10044,8 +10049,10 @@ spec:
ovnController:
properties:
external-ids:
default: {}
properties:
availability-zones:
default: []
items:
type: string
type: array
Expand Down
3 changes: 1 addition & 2 deletions apis/bases/core.openstack.org_openstackversions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion apis/client/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions apis/core/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 14 additions & 8 deletions apis/dataplane/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions config/crd/bases/client.openstack.org_openstackclients.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 9 additions & 2 deletions config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -3852,6 +3851,7 @@ spec:
required:
- containerImage
type: object
default: {}
type: object
imageCache:
properties:
Expand Down Expand Up @@ -4691,6 +4691,7 @@ spec:
type: string
type: object
extraMounts:
default: []
items:
properties:
extraVol:
Expand Down Expand Up @@ -9215,6 +9216,7 @@ spec:
template:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -9455,6 +9457,7 @@ spec:
octaviaHealthManager:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -9588,6 +9591,7 @@ spec:
octaviaHousekeeping:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -9809,6 +9813,7 @@ spec:
octaviaWorker:
properties:
amphoraCustomFlavors:
default: []
items:
properties:
RAM:
Expand Down Expand Up @@ -10044,8 +10049,10 @@ spec:
ovnController:
properties:
external-ids:
default: {}
properties:
availability-zones:
default: []
items:
type: string
type: array
Expand Down
3 changes: 1 addition & 2 deletions config/crd/bases/core.openstack.org_openstackversions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
creationTimestamp: null
name: manager-role
rules:
- apiGroups:
Expand Down
Loading

0 comments on commit a5fc7f5

Please sign in to comment.