Skip to content

Commit e7f05cf

Browse files
stuggistuggi
committed
Bump k8s api to match OCP 4.16
* Bump k8s api, apimachinery, client-go to 0.29 * bump controller-runtime to 0.17 * change github.com/openshift/api to match latest commit for release-4.16 branch * update ENVTEST_K8S_VERSION to 1.29 match with k8s version Signed-off-by: Martin Schuppert <[email protected]>
1 parent ed0ac32 commit e7f05cf

9 files changed

+1655
-285
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPERATOR_SDK_VERSION ?= v1.31.0
5454
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/openstack-operator:latest
5555
IMG ?= $(DEFAULT_IMG)
5656
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
57-
ENVTEST_K8S_VERSION = 1.28.0
57+
ENVTEST_K8S_VERSION = 1.29
5858

5959
CRDDESC_OVERRIDE ?= :maxDescLen=0
6060

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 766 additions & 108 deletions
Large diffs are not rendered by default.

‎apis/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 39 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -567,18 +567,6 @@ spec:
567567
type: object
568568
resources:
569569
properties:
570-
claims:
571-
items:
572-
properties:
573-
name:
574-
type: string
575-
required:
576-
- name
577-
type: object
578-
type: array
579-
x-kubernetes-list-map-keys:
580-
- name
581-
x-kubernetes-list-type: map
582570
limits:
583571
additionalProperties:
584572
anyOf:
@@ -622,6 +610,8 @@ spec:
622610
x-kubernetes-map-type: atomic
623611
storageClassName:
624612
type: string
613+
volumeAttributesClassName:
614+
type: string
625615
volumeMode:
626616
type: string
627617
volumeName:
@@ -810,6 +800,43 @@ spec:
810800
sources:
811801
items:
812802
properties:
803+
clusterTrustBundle:
804+
properties:
805+
labelSelector:
806+
properties:
807+
matchExpressions:
808+
items:
809+
properties:
810+
key:
811+
type: string
812+
operator:
813+
type: string
814+
values:
815+
items:
816+
type: string
817+
type: array
818+
required:
819+
- key
820+
- operator
821+
type: object
822+
type: array
823+
matchLabels:
824+
additionalProperties:
825+
type: string
826+
type: object
827+
type: object
828+
x-kubernetes-map-type: atomic
829+
name:
830+
type: string
831+
optional:
832+
type: boolean
833+
path:
834+
type: string
835+
signerName:
836+
type: string
837+
required:
838+
- path
839+
type: object
813840
configMap:
814841
properties:
815842
items:

‎apis/go.mod‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ require (
3535
go.uber.org/zap v1.27.0 // indirect
3636
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3737
golang.org/x/tools v0.24.0 // indirect
38-
k8s.io/api v0.28.13
39-
k8s.io/apimachinery v0.28.13
40-
k8s.io/client-go v0.28.13
41-
sigs.k8s.io/controller-runtime v0.16.6
38+
k8s.io/api v0.29.9
39+
k8s.io/apimachinery v0.29.9
40+
k8s.io/client-go v0.29.9
41+
sigs.k8s.io/controller-runtime v0.17.6
4242
)
4343

4444
require k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
@@ -100,8 +100,8 @@ require (
100100
gopkg.in/inf.v0 v0.9.1 // indirect
101101
gopkg.in/yaml.v2 v2.4.0 // indirect
102102
gopkg.in/yaml.v3 v3.0.1 // indirect
103-
k8s.io/apiextensions-apiserver v0.28.13 // indirect
104-
k8s.io/component-base v0.28.13 // indirect
103+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
104+
k8s.io/component-base v0.29.2 // indirect
105105
k8s.io/klog/v2 v2.120.1 // indirect
106106
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
107107
sigs.k8s.io/gateway-api v0.8.0 // indirect
@@ -110,9 +110,9 @@ require (
110110
sigs.k8s.io/yaml v1.4.0 // indirect
111111
)
112112

113-
// mschuppert: map to latest commit from release-4.13 tag
113+
// mschuppert: map to latest commit from release-4.16 tag
114114
// must consistent within modules and service operators
115-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
115+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 //allow-merging
116116

117117
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
118118
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240719064129-c0201810c8f5 //allow-merging

‎apis/go.sum‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo
9292
github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
9393
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
9494
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
95-
github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 h1:rncLxJBpFGqBztyxCMwNRnMjhhIDOWHJowi6q8G6koI=
96-
github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4=
95+
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
96+
github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
9797
github.com/openstack-k8s-operators/barbican-operator/api v0.4.1-0.20240909083835-c6413c0a9d5f h1:J+iRBVEk52WVD+yZpZP+35TAkbGn+Lat71m1gdUolmk=
9898
github.com/openstack-k8s-operators/barbican-operator/api v0.4.1-0.20240909083835-c6413c0a9d5f/go.mod h1:mZxiqEmn7/sad8vJ6xe+PX5jVix0HpZzam9xhpWj3po=
9999
github.com/openstack-k8s-operators/cinder-operator/api v0.4.1-0.20240909075804-5d4846332a62 h1:u8HssgBwGXRIBDcAxMsMYPMMV68u+QcfkgrcuYscd+g=
@@ -255,24 +255,24 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
255255
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
256256
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
257257
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
258-
k8s.io/api v0.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4=
259-
k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q=
260-
k8s.io/apiextensions-apiserver v0.28.13 h1:+Q3jtMXBxvURuW0tzW1UsZMPud3T4OvgVPuI/uQUEQ8=
261-
k8s.io/apiextensions-apiserver v0.28.13/go.mod h1:yThTxyuc0ba1rXKZNK2aQNIbFxmGcU+CPc8YB40IGj0=
262-
k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g=
263-
k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o=
264-
k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk=
265-
k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g=
266-
k8s.io/component-base v0.28.13 h1:hNgX2QcMt7Z5vy/9MB2rodbvBJj6H4Jq1JZDqGvVuf8=
267-
k8s.io/component-base v0.28.13/go.mod h1:G37g+bIAcjV2cAMEpFG2SEN7NgRFMizqSksOLpPN2bM=
258+
k8s.io/api v0.29.9 h1:FwdflpNsfMUYUOblMZNWJ4K/q0OSL5A4jGa0iOgcJco=
259+
k8s.io/api v0.29.9/go.mod h1:fNhmzRfKaSEHCmczA/jRx6CiDKhYOnFLJBERMJAXEk8=
260+
k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg=
261+
k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8=
262+
k8s.io/apimachinery v0.29.9 h1:YZ8HUid1TzQVz94cnNlsQjLdH0VoAhWSqz7t0q6B12A=
263+
k8s.io/apimachinery v0.29.9/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
264+
k8s.io/client-go v0.29.9 h1:4f/Wz6li3rEyIPFj32XAQMtOGMM1tg7KQi1oeS6ibPg=
265+
k8s.io/client-go v0.29.9/go.mod h1:2N1drQEZ5yiYrWVaE2Un8JiISUhl47D8pyZlYLszke4=
266+
k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8=
267+
k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM=
268268
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
269269
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
270270
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
271271
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
272272
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
273273
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
274-
sigs.k8s.io/controller-runtime v0.16.6 h1:FiXwTuFF5ZJKmozfP2Z0j7dh6kmxP4Ou1KLfxgKKC3I=
275-
sigs.k8s.io/controller-runtime v0.16.6/go.mod h1:+dQzkZxnylD0u49e0a+7AR+vlibEBaThmPca7lTyUsI=
274+
sigs.k8s.io/controller-runtime v0.17.6 h1:12IXsozEsIXWAMRpgRlYS1jjAHQXHtWEOMdULh3DbEw=
275+
sigs.k8s.io/controller-runtime v0.17.6/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
276276
sigs.k8s.io/gateway-api v0.8.0 h1:isQQ3Jx2qFP7vaA3ls0846F0Amp9Eq14P08xbSwVbQg=
277277
sigs.k8s.io/gateway-api v0.8.0/go.mod h1:okOnjPNBFbIS/Rw9kAhuIUaIkLhTKEu+ARIuXk2dgaM=
278278
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

0 commit comments

Comments
 (0)