Skip to content

Commit 5df87de

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #624 from stuggi/ocp-4.20-bump
Bump dependencies for OCP 4.20
2 parents 2c13031 + d4e7c1e commit 5df87de

10 files changed

Lines changed: 141 additions & 193 deletions

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OPERATOR_SDK_VERSION ?= v1.42.3
5454
DEFAULT_IMG ?= quay.io/openstack-k8s-operators/infra-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.31
57+
ENVTEST_K8S_VERSION = 1.33
5858

5959
SETUP_ENVTEST_VERSION ?= release-0.22
6060

@@ -398,7 +398,7 @@ force-bump: ## Force bump operator and lib-common dependencies
398398
cd ./apis && go get $$dep@$(BRANCH) && cd .. ; \
399399
done
400400

401-
CRD_SCHEMA_CHECKER_VERSION ?= release-4.16
401+
CRD_SCHEMA_CHECKER_VERSION ?= release-4.18
402402

403403
PHONY: crd-schema-check
404404
crd-schema-check: manifests

‎apis/bases/rabbitmq.openstack.org_rabbitmqs.yaml‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ spec:
335335
pod labels will be ignored. The default value is empty.
336336
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
337337
Also, matchLabelKeys cannot be set when labelSelector isn't set.
338-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
339338
items:
340339
type: string
341340
type: array
@@ -350,7 +349,6 @@ spec:
350349
pod labels will be ignored. The default value is empty.
351350
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
352351
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
353-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
354352
items:
355353
type: string
356354
type: array
@@ -516,7 +514,6 @@ spec:
516514
pod labels will be ignored. The default value is empty.
517515
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
518516
Also, matchLabelKeys cannot be set when labelSelector isn't set.
519-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
520517
items:
521518
type: string
522519
type: array
@@ -531,7 +528,6 @@ spec:
531528
pod labels will be ignored. The default value is empty.
532529
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
533530
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
534-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
535531
items:
536532
type: string
537533
type: array
@@ -694,7 +690,6 @@ spec:
694690
pod labels will be ignored. The default value is empty.
695691
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
696692
Also, matchLabelKeys cannot be set when labelSelector isn't set.
697-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
698693
items:
699694
type: string
700695
type: array
@@ -709,7 +704,6 @@ spec:
709704
pod labels will be ignored. The default value is empty.
710705
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
711706
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
712-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
713707
items:
714708
type: string
715709
type: array
@@ -875,7 +869,6 @@ spec:
875869
pod labels will be ignored. The default value is empty.
876870
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
877871
Also, matchLabelKeys cannot be set when labelSelector isn't set.
878-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
879872
items:
880873
type: string
881874
type: array
@@ -890,7 +883,6 @@ spec:
890883
pod labels will be ignored. The default value is empty.
891884
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
892885
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
893-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
894886
items:
895887
type: string
896888
type: array
@@ -1343,13 +1335,12 @@ spec:
13431335
type: object
13441336
trafficDistribution:
13451337
description: |-
1346-
TrafficDistribution offers a way to express preferences for how traffic is
1347-
distributed to Service endpoints. Implementations can use this field as a
1348-
hint, but are not required to guarantee strict adherence. If the field is
1349-
not set, the implementation will apply its default routing strategy. If set
1350-
to "PreferClose", implementations should prioritize endpoints that are
1351-
topologically close (e.g., same zone).
1352-
This is an alpha field and requires enabling ServiceTrafficDistribution feature.
1338+
TrafficDistribution offers a way to express preferences for how traffic
1339+
is distributed to Service endpoints. Implementations can use this field
1340+
as a hint, but are not required to guarantee strict adherence. If the
1341+
field is not set, the implementation will apply its default routing
1342+
strategy. If set to "PreferClose", implementations should prioritize
1343+
endpoints that are in the same zone.
13531344
type: string
13541345
type:
13551346
description: |-

‎apis/bases/topology.openstack.org_topologies.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,6 @@ spec:
329329
pod labels will be ignored. The default value is empty.
330330
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
331331
Also, matchLabelKeys cannot be set when labelSelector isn't set.
332-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
333332
items:
334333
type: string
335334
type: array
@@ -344,7 +343,6 @@ spec:
344343
pod labels will be ignored. The default value is empty.
345344
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
346345
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
347-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
348346
items:
349347
type: string
350348
type: array
@@ -510,7 +508,6 @@ spec:
510508
pod labels will be ignored. The default value is empty.
511509
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
512510
Also, matchLabelKeys cannot be set when labelSelector isn't set.
513-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
514511
items:
515512
type: string
516513
type: array
@@ -525,7 +522,6 @@ spec:
525522
pod labels will be ignored. The default value is empty.
526523
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
527524
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
528-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
529525
items:
530526
type: string
531527
type: array
@@ -688,7 +684,6 @@ spec:
688684
pod labels will be ignored. The default value is empty.
689685
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
690686
Also, matchLabelKeys cannot be set when labelSelector isn't set.
691-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
692687
items:
693688
type: string
694689
type: array
@@ -703,7 +698,6 @@ spec:
703698
pod labels will be ignored. The default value is empty.
704699
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
705700
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
706-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
707701
items:
708702
type: string
709703
type: array
@@ -869,7 +863,6 @@ spec:
869863
pod labels will be ignored. The default value is empty.
870864
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
871865
Also, matchLabelKeys cannot be set when labelSelector isn't set.
872-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
873866
items:
874867
type: string
875868
type: array
@@ -884,7 +877,6 @@ spec:
884877
pod labels will be ignored. The default value is empty.
885878
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
886879
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
887-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
888880
items:
889881
type: string
890882
type: array
@@ -1090,7 +1082,6 @@ spec:
10901082
- Ignore: nodeAffinity/nodeSelector are ignored. All nodes are included in the calculations.
10911083
10921084
If this value is nil, the behavior is equivalent to the Honor policy.
1093-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
10941085
type: string
10951086
nodeTaintsPolicy:
10961087
description: |-
@@ -1101,7 +1092,6 @@ spec:
11011092
- Ignore: node taints are ignored. All nodes are included.
11021093
11031094
If this value is nil, the behavior is equivalent to the Ignore policy.
1104-
This is a beta-level feature default enabled by the NodeInclusionPolicyInPodTopologySpread feature flag.
11051095
type: string
11061096
topologyKey:
11071097
description: |-

‎apis/go.mod‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ go 1.26.3
55
require (
66
github.com/go-logr/logr v1.4.3
77
github.com/onsi/gomega v1.42.1
8-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260713090837-13a3b65580c3
9-
k8s.io/api v0.31.14
10-
k8s.io/apiextensions-apiserver v0.33.2
11-
k8s.io/apimachinery v0.31.14
8+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260717092345-ab1ee7b97c67
9+
k8s.io/api v0.33.13
10+
k8s.io/apiextensions-apiserver v0.33.13
11+
k8s.io/apimachinery v0.33.13
1212
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
13-
sigs.k8s.io/controller-runtime v0.19.7
13+
sigs.k8s.io/controller-runtime v0.21.0
1414
)
1515

1616
require (
@@ -26,13 +26,10 @@ require (
2626
github.com/go-openapi/jsonreference v0.21.0 // indirect
2727
github.com/go-openapi/swag v0.23.1 // indirect
2828
github.com/gogo/protobuf v1.3.2 // indirect
29-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
30-
github.com/golang/protobuf v1.5.4 // indirect
29+
github.com/google/btree v1.1.3 // indirect
3130
github.com/google/gnostic-models v0.7.0 // indirect
3231
github.com/google/go-cmp v0.7.0 // indirect
33-
github.com/google/gofuzz v1.2.0 // indirect
3432
github.com/google/uuid v1.6.0 // indirect
35-
github.com/imdario/mergo v0.3.16 // indirect
3633
github.com/josharian/intern v1.0.0 // indirect
3734
github.com/json-iterator/go v1.1.12 // indirect
3835
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7 // indirect
@@ -46,24 +43,23 @@ require (
4643
github.com/prometheus/client_model v0.6.2 // indirect
4744
github.com/prometheus/common v0.65.0 // indirect
4845
github.com/prometheus/procfs v0.16.1 // indirect
49-
github.com/rogpeppe/go-internal v1.13.1 // indirect
5046
github.com/spf13/pflag v1.0.9 // indirect
51-
github.com/stretchr/testify v1.11.1 // indirect
5247
github.com/x448/float16 v0.8.4 // indirect
5348
go.yaml.in/yaml/v2 v2.4.2 // indirect
5449
go.yaml.in/yaml/v3 v3.0.4 // indirect
55-
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
5650
golang.org/x/net v0.56.0 // indirect
5751
golang.org/x/oauth2 v0.30.0 // indirect
52+
golang.org/x/sync v0.22.0 // indirect
5853
golang.org/x/sys v0.47.0 // indirect
5954
golang.org/x/term v0.45.0 // indirect
6055
golang.org/x/text v0.40.0 // indirect
6156
golang.org/x/time v0.12.0 // indirect
6257
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
6358
google.golang.org/protobuf v1.36.7 // indirect
59+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6460
gopkg.in/inf.v0 v0.9.1 // indirect
6561
gopkg.in/yaml.v3 v3.0.1 // indirect
66-
k8s.io/client-go v0.31.14 // indirect
62+
k8s.io/client-go v0.33.13 // indirect
6763
k8s.io/klog/v2 v2.130.1 // indirect
6864
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
6965
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
@@ -72,25 +68,25 @@ require (
7268
sigs.k8s.io/yaml v1.6.0 // indirect
7369
)
7470

75-
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
71+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20260710141509-36dec0bfafe4 //allow-merging
7672

77-
// pin these to avoid later versions pulled by rabbitmq
78-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.14 //allow-merging
73+
// pin these to avoid later versions pulled
74+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.13 //allow-merging
7975

80-
replace k8s.io/api => k8s.io/api v0.31.14 //allow-merging
76+
replace k8s.io/api => k8s.io/api v0.33.13 //allow-merging
8177

82-
replace k8s.io/apiserver => k8s.io/apiserver v0.31.14 //allow-merging
78+
replace k8s.io/apiserver => k8s.io/apiserver v0.33.13 //allow-merging
8379

84-
replace k8s.io/client-go => k8s.io/client-go v0.31.14 //allow-merging
80+
replace k8s.io/client-go => k8s.io/client-go v0.33.13 //allow-merging
8581

86-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.14 //allow-merging
82+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.13 //allow-merging
8783

88-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.14 //allow-merging
84+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.13 //allow-merging
8985

90-
replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
86+
replace k8s.io/code-generator => k8s.io/code-generator v0.33.13 //allow-merging
9187

92-
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
88+
replace k8s.io/component-base => k8s.io/component-base v0.33.13 //allow-merging
9389

9490
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
9591

96-
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
92+
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.3.0 //allow-merging

0 commit comments

Comments
 (0)