Skip to content

Commit 7c69ef6

Browse files
Merge pull request #3480 from jrvaldes/master-submodule-update-10-23
WINC-1490: React to 1.34 kube rebase
2 parents 4575d9a + 60751ae commit 7c69ef6

File tree

840 files changed

+61423
-30362
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

840 files changed

+61423
-30362
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WMCO_VERSION ?= 10.21.0
77

88
# *_GIT_VERSION are the k8s versions. Any update to the build line could potentially require an update to the sed
99
# command in generate_k8s_version_commit() in hack/update_submodules.sh
10-
KUBELET_GIT_VERSION=v1.33.5+fb128b9
10+
KUBELET_GIT_VERSION=v1.34.1+96593f3
1111
CONTAINERD_GIT_VERSION=v1.7.27
1212
# CHANNELS define the bundle channels used in the bundle.
1313
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")

bundle/manifests/windows-machine-config-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ spec:
535535
536536
name: Red Hat, Windows Container Support for OpenShift
537537
maturity: stable
538-
minKubeVersion: 1.33.0
538+
minKubeVersion: 1.34.0
539539
provider:
540540
name: Red Hat
541541
version: 10.21.0

config/manifests/bases/windows-machine-config-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ spec:
176176
177177
name: Red Hat, Windows Container Support for OpenShift
178178
maturity: stable
179-
minKubeVersion: 1.33.0
179+
minKubeVersion: 1.34.0
180180
provider:
181181
name: Red Hat
182182
version: 0.0.0

config/rbac/role.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRole
44
metadata:
5-
creationTimestamp: null
65
name: windows-machine-config-operator
76
rules:
87
- apiGroups:
@@ -107,7 +106,6 @@ rules:
107106
resources:
108107
- certificatesigningrequests
109108
verbs:
110-
- create
111109
- get
112110
- list
113111
- watch

containernetworking-plugins

go.mod

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ replace (
88
// fix CVE-2025-30204 transitive deps still using older v4. Remove once `go mod graph` shows only 4.5.2 or higher
99
github.com/golang-jwt/jwt/v4 => github.com/golang-jwt/jwt/v4 v4.5.2
1010
github.com/golang-jwt/jwt/v5 => github.com/golang-jwt/jwt/v5 v5.2.2
11-
12-
// pin kube-openapi to pre structured-merge-diff/v6 to resolve apimachinery type mismatch
13-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250628140032-d90c4fd18f59
1411
)
1512

1613
require (
@@ -19,9 +16,9 @@ require (
1916
github.com/coreos/ignition/v2 v2.23.0
2017
github.com/go-imports-organizer/goio v1.5.0
2118
github.com/go-logr/logr v1.4.3
22-
github.com/openshift/api v0.0.0-20251002150504-230d0e045316
23-
github.com/openshift/client-go v0.0.0-20250922201106-dd37bfd2e597
24-
github.com/openshift/library-go v0.0.0-20251003131124-f838eb5c6019
19+
github.com/openshift/api v0.0.0-20251023193535-8691c3014652
20+
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
21+
github.com/openshift/library-go v0.0.0-20251021141706-f489e811f030
2522
github.com/operator-framework/api v0.16.0
2623
github.com/operator-framework/operator-lib v0.4.0
2724
github.com/operator-framework/operator-lifecycle-manager v0.22.0
@@ -36,14 +33,14 @@ require (
3633
golang.org/x/crypto v0.42.0
3734
golang.org/x/mod v0.29.0
3835
golang.org/x/sys v0.37.0
39-
k8s.io/api v0.33.5
40-
k8s.io/apimachinery v0.33.5
41-
k8s.io/client-go v0.33.5
42-
k8s.io/cloud-provider v0.33.5
36+
k8s.io/api v0.34.1
37+
k8s.io/apimachinery v0.34.1
38+
k8s.io/client-go v0.34.1
39+
k8s.io/cloud-provider v0.34.1
4340
k8s.io/klog/v2 v2.130.1
44-
k8s.io/kubectl v0.33.5
45-
k8s.io/kubelet v0.33.5
46-
k8s.io/kubernetes v1.33.4
41+
k8s.io/kubectl v0.34.1
42+
k8s.io/kubelet v0.34.1
43+
k8s.io/kubernetes v1.34.1
4744
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
4845
sigs.k8s.io/controller-runtime v0.21.0
4946
sigs.k8s.io/yaml v1.6.0
@@ -69,7 +66,7 @@ require (
6966
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
7067
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
7168
github.com/felixge/httpsnoop v1.0.4 // indirect
72-
github.com/fsnotify/fsnotify v1.8.0 // indirect
69+
github.com/fsnotify/fsnotify v1.9.0 // indirect
7370
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
7471
github.com/go-errors/errors v1.4.2 // indirect
7572
github.com/go-logr/stdr v1.2.2 // indirect
@@ -80,14 +77,13 @@ require (
8077
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
8178
github.com/gogo/protobuf v1.3.2 // indirect
8279
github.com/google/btree v1.1.3 // indirect
83-
github.com/google/cel-go v0.23.2 // indirect
80+
github.com/google/cel-go v0.26.0 // indirect
8481
github.com/google/gnostic-models v0.7.0 // indirect
8582
github.com/google/go-cmp v0.7.0 // indirect
86-
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
8783
github.com/google/uuid v1.6.0 // indirect
8884
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
8985
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
90-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
86+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
9187
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9288
github.com/jmespath/go-jmespath v0.4.0 // indirect
9389
github.com/josharian/intern v1.0.0 // indirect
@@ -99,7 +95,7 @@ require (
9995
github.com/moby/spdystream v0.5.0 // indirect
10096
github.com/moby/term v0.5.2 // indirect
10197
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
102-
github.com/modern-go/reflect2 v1.0.2 // indirect
98+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
10399
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
104100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
105101
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -122,12 +118,12 @@ require (
122118
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
123119
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
124120
go.opentelemetry.io/otel v1.36.0 // indirect
125-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
126-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
121+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
122+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
127123
go.opentelemetry.io/otel/metric v1.36.0 // indirect
128124
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
129125
go.opentelemetry.io/otel/trace v1.36.0 // indirect
130-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
126+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
131127
go.uber.org/multierr v1.11.0 // indirect
132128
go.yaml.in/yaml/v2 v2.4.3 // indirect
133129
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -146,16 +142,16 @@ require (
146142
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
147143
gopkg.in/inf.v0 v0.9.1 // indirect
148144
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
k8s.io/apiextensions-apiserver v0.33.5 // indirect
150-
k8s.io/apiserver v0.33.5 // indirect
151-
k8s.io/cli-runtime v0.33.5 // indirect
152-
k8s.io/component-base v0.33.5 // indirect
153-
k8s.io/controller-manager v0.33.5 // indirect
145+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
146+
k8s.io/apiserver v0.34.1 // indirect
147+
k8s.io/cli-runtime v0.34.1 // indirect
148+
k8s.io/component-base v0.34.1 // indirect
149+
k8s.io/controller-manager v0.34.1 // indirect
154150
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
155151
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
156152
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
157-
sigs.k8s.io/kustomize/api v0.19.0 // indirect
158-
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
153+
sigs.k8s.io/kustomize/api v0.20.1 // indirect
154+
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
159155
sigs.k8s.io/randfill v1.0.0 // indirect
160-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
156+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
161157
)

0 commit comments

Comments
 (0)