Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-48309: [release-4.17] submodule update 02 19 #2731

Open
wants to merge 9 commits into
base: release-4.17
Choose a base branch
from
Open

OCPBUGS-48309: [release-4.17] submodule update 02 19 #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
15a100d
[submodule] set windows_exporter to 4.17 branch
jrvaldes Feb 5, 2025
69295ee
[vendor] fix golang.org/x/exp for go1.22
jrvaldes Feb 19, 2025
a46c8ea
[submodule][ovn-kubernetes] Update to aa5bec3a1
jrvaldes Feb 19, 2025
1ff84c7
[submodule][kubelet] Update to 75240ebc82a
jrvaldes Feb 19, 2025
7dfcaa9
[build] Update kubelet version to v1.30.9+75240eb
jrvaldes Feb 19, 2025
c0c4b51
[vendor] Use v1.30.9+75240eb k8s and OpenShift libraries
jrvaldes Feb 19, 2025
f924455
[submodule][containerd] Update to bcc810d6b
jrvaldes Feb 19, 2025
f1ee224
[build] Update containerd version to v1.7.25
jrvaldes Feb 19, 2025
477d1b7
[submodule][csi-proxy] Update to 0939e7a
jrvaldes Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
[submodule "windows_exporter"]
path = windows_exporter
url = https://github.com/openshift/prometheus-community-windows_exporter
branch = release-4.17
[submodule "kubelet"]
path = kubelet
url = https://github.com/openshift/kubernetes
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ WMCO_VERSION ?= 10.17.1

# *_GIT_VERSION are the k8s versions. Any update to the build line could potentially require an update to the sed
# command in generate_k8s_version_commit() in hack/update_submodules.sh
KUBELET_GIT_VERSION=v1.30.7+f868289
KUBELET_GIT_VERSION=v1.30.9+75240eb
KUBE-PROXY_GIT_VERSION=v1.30.0
CONTAINERD_GIT_VERSION=v1.7.25-1-ga245e3bf2
CONTAINERD_GIT_VERSION=v1.7.25
# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
# To re-generate a bundle for other specific channels without changing the standard setup, you can:
Expand Down
2 changes: 1 addition & 1 deletion containerd
Open in desktop
Submodule containerd updated 0 files
2 changes: 1 addition & 1 deletion csi-proxy
Open in desktop
Submodule csi-proxy updated 619 files
43 changes: 22 additions & 21 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ go 1.22.0
toolchain go1.22.3

replace (
// fix the latest working version for go1.22, remove the replacement with the go1.23 bump
// fix the latest working version for go1.22
golang.org/x/exp => golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac
sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
// fix to solve the issue of unknown field IgnoredFields in struct literal of type merge.Updater
sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
Expand All @@ -17,7 +18,7 @@ require (
github.com/coreos/ignition/v2 v2.16.2
github.com/go-imports-organizer/goio v1.3.3
github.com/go-logr/logr v1.4.2
github.com/openshift/api v0.0.0-20240912201240-0a8800162826
github.com/openshift/api v0.0.0-20250214103856-0cfc958f642b
github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
github.com/openshift/library-go v0.0.0-20241118144106-bfd968d8eef4
github.com/operator-framework/api v0.16.0
Expand All @@ -31,16 +32,16 @@ require (
github.com/stretchr/testify v1.9.0
github.com/vincent-petithory/dataurl v1.0.0
go.uber.org/zap v1.26.0
golang.org/x/crypto v0.32.0
golang.org/x/mod v0.22.0
golang.org/x/sys v0.29.0
k8s.io/api v0.30.9
k8s.io/apimachinery v0.30.9
k8s.io/client-go v0.30.9
k8s.io/cloud-provider v0.30.9
golang.org/x/crypto v0.33.0
golang.org/x/mod v0.23.0
golang.org/x/sys v0.30.0
k8s.io/api v0.30.10
k8s.io/apimachinery v0.30.10
k8s.io/client-go v0.30.10
k8s.io/cloud-provider v0.30.10
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.30.9
k8s.io/kubelet v0.30.9
k8s.io/kubectl v0.30.10
k8s.io/kubelet v0.30.10
k8s.io/kubernetes v1.30.4
sigs.k8s.io/controller-runtime v0.18.7
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -109,24 +110,24 @@ require (
github.com/xlab/treeprint v1.2.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/exp v0.0.0-20250218142911-aa4b98e5adaa // indirect
golang.org/x/net v0.35.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sync v0.10.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/sync v0.11.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.5.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/protobuf v1.35.2 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.9 // indirect
k8s.io/apiserver v0.30.9 // indirect
k8s.io/cli-runtime v0.30.9 // indirect
k8s.io/component-base v0.30.9 // indirect
k8s.io/component-helpers v0.30.9 // indirect
k8s.io/apiextensions-apiserver v0.30.10 // indirect
k8s.io/apiserver v0.30.10 // indirect
k8s.io/cli-runtime v0.30.10 // indirect
k8s.io/component-base v0.30.10 // indirect
k8s.io/component-helpers v0.30.10 // indirect
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
Expand Down
Loading