Skip to content

Commit

Permalink
Merge pull request #2555 from jrvaldes/release-4.15-submodule-update-…
Browse files Browse the repository at this point in the history 
…11-25

[release-4.15] submodule update 11 25
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Nov 27, 2024
2 parents 6165c36 + da41c98 commit cb14674
Show file tree
Hide file tree
Showing 13 changed files with 490 additions and 140 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ WMCO_VERSION ?= 10.15.4

# *_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.28.13+2ca1a23
KUBELET_GIT_VERSION=v1.28.15+ff493be
KUBE-PROXY_GIT_VERSION=v1.28.3+5d4d580
CONTAINERD_GIT_VERSION=v1.7.16
# CHANNELS define the bundle channels used in the bundle.
Expand Down
38 changes: 23 additions & 15 deletions go.mod
View file
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.20

replace (
// fix the latest working version for go1.20, remove the replacement with the next go bump
golang.org/x/exp => golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
// https://github.com/golang/mod/compare/v0.20.0...v0.21.0
golang.org/x/mod => golang.org/x/mod v0.20.0
sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
)

require (
github.com/apparentlymart/go-cidr v1.1.0
github.com/aws/aws-sdk-go v1.44.298
Expand All @@ -24,13 +32,13 @@ require (
golang.org/x/crypto v0.28.0
golang.org/x/mod v0.20.0
golang.org/x/sys v0.26.0
k8s.io/api v0.28.14
k8s.io/apimachinery v0.28.14
k8s.io/client-go v0.28.14
k8s.io/cloud-provider v0.28.14
k8s.io/api v0.28.15
k8s.io/apimachinery v0.28.15
k8s.io/client-go v0.28.15
k8s.io/cloud-provider v0.28.15
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.28.14
k8s.io/kubelet v0.28.14
k8s.io/kubectl v0.28.15
k8s.io/kubelet v0.28.15
sigs.k8s.io/controller-runtime v0.16.6
sigs.k8s.io/yaml v1.4.0
)
Expand Down Expand Up @@ -97,7 +105,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-20240823005443-9b4947da3948 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.8.0 // indirect
Expand All @@ -110,14 +118,14 @@ 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.28.14 // indirect
k8s.io/cli-runtime v0.28.14 // indirect
k8s.io/component-base v0.28.14 // indirect
k8s.io/component-helpers v0.28.14 // 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.28.15 // indirect
k8s.io/cli-runtime v0.28.15 // indirect
k8s.io/component-base v0.28.15 // indirect
k8s.io/component-helpers v0.28.15 // 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
)
127 changes: 64 additions & 63 deletions go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kubelet
Submodule kubelet updated 29 files
+1 −1 .go-version
+341 −124 CHANGELOG/CHANGELOG-1.28.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 −8 cmd/kubeadm/app/constants/constants.go
+0 −2 cmd/kubeadm/app/preflight/checks_linux.go
+62 −28 cmd/kubeadm/app/util/etcd/etcd.go
+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
+61 −35 pkg/controller/endpointslice/endpointslice_controller.go
+15 −9 pkg/controller/endpointslice/endpointslice_controller_test.go
+2 −1 pkg/kubelet/kubelet.go
+8 −8 pkg/proxy/config/config.go
+1 −1 pkg/scheduler/framework/preemption/preemption.go
+31 −31 staging/publishing/rules.yaml
+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
2 changes: 1 addition & 1 deletion ovn-kubernetes
Submodule ovn-kubernetes updated 11 files
+1 −1 Dockerfile.base
+1 −1 go-controller/pkg/clustermanager/clustermanager_test.go
+6 −5 go-controller/pkg/config/config.go
+2 −2 go-controller/pkg/config/config_test.go
+2 −1 go-controller/pkg/config/utils.go
+6 −2 go-controller/pkg/ovn/hybrid.go
+1 −1 go-controller/pkg/ovn/hybrid_test.go
+1 −1 go-controller/pkg/ovn/master.go
+4 −6 go-controller/pkg/ovn/ovn.go
+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

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
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,10 @@ 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-20240823005443-9b4947da3948
# golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f => golang.org/x/exp v0.0.0-20240823005443-9b4947da3948
## explicit; go 1.20
golang.org/x/exp/maps
# golang.org/x/mod v0.20.0
# golang.org/x/mod v0.20.0 => golang.org/x/mod v0.20.0
## explicit; go 1.18
golang.org/x/mod/internal/lazyregexp
golang.org/x/mod/modfile
Expand Down Expand Up @@ -538,7 +538,7 @@ gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.1
## explicit
gopkg.in/yaml.v3
# k8s.io/api v0.28.14
# k8s.io/api v0.28.15
## explicit; go 1.20
k8s.io/api/admission/v1
k8s.io/api/admission/v1beta1
Expand Down Expand Up @@ -595,11 +595,11 @@ 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.28.14
# k8s.io/apiextensions-apiserver v0.28.15
## explicit; go 1.20
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
# k8s.io/apimachinery v0.28.14
# k8s.io/apimachinery v0.28.15
## explicit; go 1.20
k8s.io/apimachinery/pkg/api/equality
k8s.io/apimachinery/pkg/api/errors
Expand Down Expand Up @@ -658,13 +658,13 @@ 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/cli-runtime v0.28.14
# k8s.io/cli-runtime v0.28.15
## explicit; go 1.20
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.28.14
# k8s.io/client-go v0.28.15
## explicit; go 1.20
k8s.io/client-go/applyconfigurations/admissionregistration/v1
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
Expand Down Expand Up @@ -825,11 +825,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.28.14
# k8s.io/cloud-provider v0.28.15
## explicit; go 1.20
k8s.io/cloud-provider/api
k8s.io/cloud-provider/node/helpers
# k8s.io/component-base v0.28.14
# k8s.io/component-base v0.28.15
## explicit; go 1.20
k8s.io/component-base/cli/flag
k8s.io/component-base/config
Expand All @@ -844,7 +844,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.28.14
# k8s.io/component-helpers v0.28.15
## explicit; go 1.20
k8s.io/component-helpers/node/util
# k8s.io/klog/v2 v2.130.1
Expand All @@ -856,7 +856,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 @@ -868,7 +868,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.28.14
# k8s.io/kubectl v0.28.15
## explicit; go 1.20
k8s.io/kubectl/pkg/cmd/util
k8s.io/kubectl/pkg/drain
Expand All @@ -879,11 +879,11 @@ 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.28.14
# k8s.io/kubelet v0.28.15
## explicit; go 1.20
k8s.io/kubelet/config/v1
k8s.io/kubelet/config/v1beta1
# 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 @@ -943,7 +943,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 @@ -1030,7 +1030,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
## explicit; go 1.13
sigs.k8s.io/structured-merge-diff/v4/fieldpath
sigs.k8s.io/structured-merge-diff/v4/merge
Expand All @@ -1041,3 +1041,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-20240823005443-9b4947da3948
# golang.org/x/mod => golang.org/x/mod v0.20.0
# sigs.k8s.io/json => sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
Loading

0 comments on commit cb14674

Please sign in to comment.