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

Jump to bottom

[release-4.16] submodule update 11 25 #2554

Open
wants to merge 7 commits into
base: release-4.16
Choose a base branch
from
+100 −90
Open

[release-4.16] submodule update 11 25 #2554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37752d2
[vendor] fix sigs.k8s.io/json for go1.21
jrvaldes Nov 25, 2024
e3951c9
[vendor] fix golang.org/x/exp for go1.21
jrvaldes Nov 25, 2024
a0a50d7
[vendor] fix sigs.k8s.io/structured-merge-diff
jrvaldes Nov 25, 2024
80b37de
[submodule][ovn-kubernetes] Update to cb50d1472
jrvaldes Nov 25, 2024
903714b
[submodule][kubelet] Update to 67d33871ba2
jrvaldes Nov 25, 2024
42d0364
[build] Update kubelet version to v1.29.10+67d3387
jrvaldes Nov 25, 2024
7ecd341
[vendor] Use v1.29.10+67d3387 k8s and OpenShift libraries
jrvaldes Nov 25, 2024
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WMCO_VERSION ?= 10.16.2

# *_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.29.8+632b078
KUBELET_GIT_VERSION=v1.29.10+67d3387
KUBE-PROXY_GIT_VERSION=v1.29.0+52637c4
CONTAINERD_GIT_VERSION=v1.7.16
# CHANNELS define the bundle channels used in the bundle.
Expand Down
40 changes: 24 additions & 16 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ module github.com/openshift/windows-machine-config-operator

go 1.21

// fix the latest working version for go1.21, remove the replacement with the next go bump
replace (
golang.org/x/exp => golang.org/x/exp v0.0.0-20231006140011-7918f672742d
sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
// fix 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
)

require (
github.com/apparentlymart/go-cidr v1.1.0
github.com/aws/aws-sdk-go v1.45.20
Expand All @@ -24,13 +32,13 @@ require (
golang.org/x/crypto v0.27.0
golang.org/x/mod v0.20.0
golang.org/x/sys v0.25.0
k8s.io/api v0.29.9
k8s.io/apimachinery v0.29.9
k8s.io/client-go v0.29.9
k8s.io/cloud-provider v0.29.9
k8s.io/api v0.29.11
k8s.io/apimachinery v0.29.11
k8s.io/client-go v0.29.11
k8s.io/cloud-provider v0.29.11
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.29.9
k8s.io/kubelet v0.29.9
k8s.io/kubectl v0.29.11
k8s.io/kubelet v0.29.11
k8s.io/kubernetes v1.29.4
sigs.k8s.io/controller-runtime v0.16.6
sigs.k8s.io/yaml v1.4.0
Expand Down Expand Up @@ -99,7 +107,7 @@ 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-20231006140011-7918f672742d // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sync v0.8.0 // indirect
Expand All @@ -112,15 +120,15 @@ require (
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.29.8 // indirect
k8s.io/apiserver v0.29.9 // indirect
k8s.io/cli-runtime v0.29.9 // indirect
k8s.io/component-base v0.29.9 // indirect
k8s.io/component-helpers v0.29.9 // indirect
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
k8s.io/apiextensions-apiserver v0.29.11 // indirect
k8s.io/apiserver v0.29.11 // indirect
k8s.io/cli-runtime v0.29.11 // indirect
k8s.io/component-base v0.29.11 // indirect
k8s.io/component-helpers v0.29.11 // indirect
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
)
107 changes: 53 additions & 54 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kubelet
Open in desktop
Submodule kubelet updated 52 files
+1 −1 .go-version
+304 −85 CHANGELOG/CHANGELOG-1.29.md
+1 −1 build/build-image/cross/VERSION
+2 −2 build/common.sh
+7 −7 build/dependencies.yaml
+2 −2 cluster/gce/manifests/etcd.manifest
+2 −2 cluster/gce/upgrade-aliases.sh
+4 −4 cluster/images/etcd/Makefile
+1 −1 cluster/images/etcd/migrate/options.go
+11 −10 cmd/kubeadm/app/constants/constants.go
+0 −2 cmd/kubeadm/app/preflight/checks_linux.go
+63 −28 cmd/kubeadm/app/util/etcd/etcd.go
+5 −0 cmd/kubelet/app/server.go
+1 −1 go.mod
+1 −1 hack/lib/etcd.sh
+1 −1 openshift-hack/images/hyperkube/Dockerfile.rhel
+1 −0 pkg/controller/daemon/update.go
+69 −0 pkg/controller/daemon/update_test.go
+6 −2 pkg/controller/endpoint/endpoints_controller.go
+60 −35 pkg/controller/endpointslice/endpointslice_controller.go
+15 −9 pkg/controller/endpointslice/endpointslice_controller_test.go
+2 −1 pkg/kubelet/kubelet.go
+7 −2 pkg/kubelet/kuberuntime/kuberuntime_container.go
+7 −5 pkg/kubelet/kuberuntime/kuberuntime_manager.go
+45 −8 pkg/kubelet/kuberuntime/kuberuntime_manager_test.go
+11 −0 pkg/kubelet/types/pod_update.go
+8 −8 pkg/proxy/config/config.go
+2 −1 pkg/proxy/endpoints.go
+0 −60 pkg/scheduler/framework/plugins/volumebinding/binder.go
+0 −141 pkg/scheduler/framework/plugins/volumebinding/binder_test.go
+0 −6 pkg/scheduler/framework/plugins/volumebinding/fake_binder.go
+1 −9 pkg/scheduler/framework/plugins/volumebinding/volume_binding.go
+0 −40 pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
+1 −1 pkg/scheduler/framework/preemption/preemption.go
+8 −0 pkg/scheduler/framework/runtime/framework.go
+3 −0 pkg/scheduler/framework/types.go
+17 −2 pkg/scheduler/schedule_one.go
+227 −55 pkg/scheduler/schedule_one_test.go
+0 −38 pkg/volume/util/util.go
+0 −302 pkg/volume/util/util_test.go
+31 −31 staging/publishing/rules.yaml
+1 −1 staging/src/k8s.io/apiserver/go.mod
+8 −0 staging/src/k8s.io/apiserver/pkg/server/options/tracing.go
+18 −0 staging/src/k8s.io/code-generator/examples/go.work.sum
+1 −1 staging/src/k8s.io/sample-apiserver/artifacts/example/deployment.yaml
+1 −1 test/e2e/framework/providers/gcp.go
+92 −0 test/e2e_node/device_plugin_test.go
+1 −1 test/images/Makefile
+198 −0 test/integration/endpoints/endpoints_test.go
+2 −2 test/utils/image/manifest.go
+264 −0 vendor/go.opentelemetry.io/otel/metric/noop/noop.go
+1 −0 vendor/modules.txt
2 changes: 1 addition & 1 deletion ovn-kubernetes
Open in desktop
Submodule ovn-kubernetes updated 16 files
+0 −0 docs/developer-guide/configuration.md
+39 −0 docs/getting-started/configuration.md
+17 −0 go-controller/pkg/node/gateway_iptables.go
+5 −1 go-controller/pkg/node/gateway_localnet.go
+145 −0 go-controller/pkg/node/gateway_localnet_linux_test.go
+19 −8 go-controller/pkg/node/gateway_shared_intf.go
+8 −0 go-controller/pkg/ovn/base_network_controller.go
+3 −0 go-controller/pkg/ovn/default_network_controller.go
+32 −0 go-controller/pkg/ovn/master.go
+32 −6 go-controller/pkg/ovn/namespace.go
+115 −0 go-controller/pkg/ovn/namespace_test.go
+18 −13 go-controller/pkg/ovn/ovn.go
+51 −0 go-controller/pkg/ovn/pods_test.go
+1 −1 mkdocs.yml
+21 −10 test/e2e/external_gateways.go
+1 −1 test/scripts/e2e-cp.sh
2 changes: 1 addition & 1 deletion vendor/k8s.io/kube-openapi/pkg/util/proto/document.go
View file
Open in desktop

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

35 changes: 19 additions & 16 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ golang.org/x/crypto/openpgp/packet
golang.org/x/crypto/openpgp/s2k
golang.org/x/crypto/ssh
golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
# golang.org/x/exp v0.0.0-20231006140011-7918f672742d
# golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f => golang.org/x/exp v0.0.0-20231006140011-7918f672742d
## explicit; go 1.20
golang.org/x/exp/maps
# golang.org/x/mod v0.20.0
Expand Down Expand Up @@ -544,7 +544,7 @@ gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.29.9
# k8s.io/api v0.29.11
## explicit; go 1.21
k8s.io/api/admission/v1
k8s.io/api/admission/v1beta1
Expand Down Expand Up @@ -601,12 +601,12 @@ k8s.io/api/scheduling/v1beta1
k8s.io/api/storage/v1
k8s.io/api/storage/v1alpha1
k8s.io/api/storage/v1beta1
# k8s.io/apiextensions-apiserver v0.29.8
# k8s.io/apiextensions-apiserver v0.29.11
## explicit; go 1.21
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
k8s.io/apiextensions-apiserver/pkg/features
# k8s.io/apimachinery v0.29.9
# k8s.io/apimachinery v0.29.11
## explicit; go 1.21
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
Expand Down Expand Up @@ -666,17 +666,17 @@ k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/netutil
k8s.io/apimachinery/third_party/forked/golang/reflect
# k8s.io/apiserver v0.29.9
# k8s.io/apiserver v0.29.11
## explicit; go 1.21
k8s.io/apiserver/pkg/features
k8s.io/apiserver/pkg/util/feature
# k8s.io/cli-runtime v0.29.9
# k8s.io/cli-runtime v0.29.11
## explicit; go 1.21
k8s.io/cli-runtime/pkg/genericclioptions
k8s.io/cli-runtime/pkg/genericiooptions
k8s.io/cli-runtime/pkg/printers
k8s.io/cli-runtime/pkg/resource
# k8s.io/client-go v0.29.9
# k8s.io/client-go v0.29.11
## explicit; go 1.21
k8s.io/client-go/applyconfigurations/admissionregistration/v1
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
Expand Down Expand Up @@ -839,11 +839,11 @@ k8s.io/client-go/util/jsonpath
k8s.io/client-go/util/keyutil
k8s.io/client-go/util/retry
k8s.io/client-go/util/workqueue
# k8s.io/cloud-provider v0.29.9
# k8s.io/cloud-provider v0.29.11
## explicit; go 1.21
k8s.io/cloud-provider/api
k8s.io/cloud-provider/node/helpers
# k8s.io/component-base v0.29.9
# k8s.io/component-base v0.29.11
## explicit; go 1.21
k8s.io/component-base/cli/flag
k8s.io/component-base/config
Expand All @@ -858,7 +858,7 @@ k8s.io/component-base/metrics/prometheus/feature
k8s.io/component-base/metrics/prometheusextension
k8s.io/component-base/tracing/api/v1
k8s.io/component-base/version
# k8s.io/component-helpers v0.29.9
# k8s.io/component-helpers v0.29.11
## explicit; go 1.21
k8s.io/component-helpers/node/util
# k8s.io/klog/v2 v2.130.1
Expand All @@ -870,7 +870,7 @@ k8s.io/klog/v2/internal/dbg
k8s.io/klog/v2/internal/serialize
k8s.io/klog/v2/internal/severity
k8s.io/klog/v2/internal/sloghandler
# k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38
# k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
## explicit; go 1.20
k8s.io/kube-openapi/pkg/cached
k8s.io/kube-openapi/pkg/common
Expand All @@ -882,7 +882,7 @@ k8s.io/kube-openapi/pkg/spec3
k8s.io/kube-openapi/pkg/util/proto
k8s.io/kube-openapi/pkg/util/proto/validation
k8s.io/kube-openapi/pkg/validation/spec
# k8s.io/kubectl v0.29.9
# k8s.io/kubectl v0.29.11
## explicit; go 1.21
k8s.io/kubectl/pkg/cmd/util
k8s.io/kubectl/pkg/drain
Expand All @@ -893,15 +893,15 @@ k8s.io/kubectl/pkg/util/openapi
k8s.io/kubectl/pkg/util/templates
k8s.io/kubectl/pkg/util/term
k8s.io/kubectl/pkg/validation
# k8s.io/kubelet v0.29.9
# k8s.io/kubelet v0.29.11
## explicit; go 1.21
k8s.io/kubelet/config/v1
k8s.io/kubelet/config/v1beta1
# k8s.io/kubernetes v1.29.4
## explicit; go 1.21
k8s.io/kubernetes/pkg/credentialprovider
k8s.io/kubernetes/pkg/features
# k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
# k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
## explicit; go 1.18
k8s.io/utils/buffer
k8s.io/utils/clock
Expand Down Expand Up @@ -961,7 +961,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook
sigs.k8s.io/controller-runtime/pkg/webhook/admission
sigs.k8s.io/controller-runtime/pkg/webhook/conversion
sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics
# sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
# sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 => sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
## explicit; go 1.18
sigs.k8s.io/json
sigs.k8s.io/json/internal/golang/encoding/json
Expand Down Expand Up @@ -1048,7 +1048,7 @@ sigs.k8s.io/kustomize/kyaml/yaml/merge2
sigs.k8s.io/kustomize/kyaml/yaml/merge3
sigs.k8s.io/kustomize/kyaml/yaml/schema
sigs.k8s.io/kustomize/kyaml/yaml/walk
# sigs.k8s.io/structured-merge-diff/v4 v4.4.1
# sigs.k8s.io/structured-merge-diff/v4 v4.4.3 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1
## explicit; go 1.13
sigs.k8s.io/structured-merge-diff/v4/fieldpath
sigs.k8s.io/structured-merge-diff/v4/merge
Expand All @@ -1059,3 +1059,6 @@ sigs.k8s.io/structured-merge-diff/v4/value
## explicit; go 1.12
sigs.k8s.io/yaml
sigs.k8s.io/yaml/goyaml.v2
# golang.org/x/exp => golang.org/x/exp v0.0.0-20231006140011-7918f672742d
# sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
# sigs.k8s.io/structured-merge-diff/v4 => sigs.k8s.io/structured-merge-diff/v4 v4.4.1