mirrors/k0s
0
0 Fork 0
mirror of https://github.com/k0sproject/k0s.git synced 2026-10-28 11:04:40 +08:00
Code Activity

Bump Kubernetes to v1.37.0-alpha.3

Browse Source 
Bring back the containerd cAdvisor flags for now, until we can safely
switch over to the new KEP.

Co-Authored-By: k0s-bot <110385897+k0s-bot@users.noreply.github.com>
Signed-off-by: Tom Wieczorek <twieczorek@mirantis.com>
This commit is contained in:
Tom Wieczorekandk0s-bot committed 2026-07-30 16:47:52 +02:00
1 parent d0d46767b6
commit c82e23ca86
14 files changed
+168 -145
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

embedded-bins/Makefile
+2
View File
@@ -110,3 +110,5 @@ build_docker_image = \
.docker-image.%.windows.stamp: %/Dockerfile Makefile.variables
$(build_docker_image)
.docker-image.kubernetes.stamp .docker-image.kubernetes.windows.stamp: $(wildcard kubernetes/patches/*)
embedded-bins/Makefile.variables
+1 -1
View File
@@ -31,7 +31,7 @@ containerd_build_go_ldflags = -w -s
containerd_build_go_ldflags_extra = -extldflags=-static
# renovate: datasource=github-releases depName=kubernetes/kubernetes
kubernetes_version = 1.37.0-alpha.2
kubernetes_version = 1.37.0-alpha.3
kubernetes_buildimage = $(golang_buildimage)
kubernetes_build_go_tags = "providerless"
#kubernetes_build_go_cgo_enabled =
embedded-bins/kubernetes/Dockerfile
+3 -4
View File
@@ -24,11 +24,10 @@ ARG TARGET_OS \
BUILD_GO_LDFLAGS \
KUBERNETES_BINS
COPY riscv64.patch .
RUN \
RUN --mount=source=patches,target=/run/patches,ro \
set -ex; \
git apply < riscv64.patch; \
git apply < /run/patches/riscv64.patch; \
git apply < /run/patches/cadvisor-flags.patch; \
export GOPATH=/go; \
if [ "${TARGET_OS}" = windows ]; then \
commands="${KUBERNETES_BINS}"; \
embedded-bins/kubernetes/patches/cadvisor-flags.patch
+33
View File
@@ -0,0 +1,33 @@
diff --git a/cmd/kubelet/app/options/globalflags_linux.go b/cmd/kubelet/app/options/globalflags_linux.go
index b68c9591fea..e8dcecac6bb 100644
--- a/cmd/kubelet/app/options/globalflags_linux.go
+++ b/cmd/kubelet/app/options/globalflags_linux.go
@@ -24,6 +24,8 @@ import (
"github.com/spf13/pflag"
+ utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+
"github.com/google/cadvisor/lib/cadvisorflags"
// registers housekeeping_interval on the global flag set
@@ -36,9 +38,19 @@ func addCadvisorFlags(fs *pflag.FlagSet) {
global := flag.CommandLine
local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError)
+ register(global, local, cadvisorflags.Containerd)
+ register(global, local, cadvisorflags.ContainerdNamespace)
+
// e2e node tests rely on this
register(global, local, cadvisorflags.HousekeepingInterval)
+ for _, flag := range []string{
+ cadvisorflags.Containerd,
+ cadvisorflags.ContainerdNamespace,
+ } {
+ utilruntime.Must(local.MarkDeprecated(flag, "This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed."))
+ }
+
// finally, add cadvisor flags to the provided flagset
fs.AddFlagSet(local)
}
embedded-bins/kubernetes/riscv64.patch → embedded-bins/kubernetes/patches/riscv64.patch
View File
File renamed without changes.
go.mod
+59 -60
View File
@@ -70,24 +70,24 @@ require (
// Kubernetes
require (
k8s.io/api v0.37.0-alpha.2
k8s.io/apiextensions-apiserver v0.37.0-alpha.2
k8s.io/apimachinery v0.37.0-alpha.2
k8s.io/apiserver v0.37.0-alpha.2
k8s.io/cli-runtime v0.37.0-alpha.2
k8s.io/client-go v0.37.0-alpha.2
k8s.io/cloud-provider v0.37.0-alpha.2
k8s.io/cluster-bootstrap v0.37.0-alpha.2
k8s.io/component-base v0.37.0-alpha.2
k8s.io/component-helpers v0.37.0-alpha.2
k8s.io/cri-api v0.37.0-alpha.2
k8s.io/kube-aggregator v0.37.0-alpha.2
k8s.io/kube-proxy v0.37.0-alpha.2
k8s.io/kubectl v0.37.0-alpha.2
k8s.io/kubelet v0.37.0-alpha.2
k8s.io/kubernetes v1.37.0-alpha.2
k8s.io/mount-utils v0.37.0-alpha.2
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
k8s.io/api v0.37.0-alpha.3
k8s.io/apiextensions-apiserver v0.37.0-alpha.3
k8s.io/apimachinery v0.37.0-alpha.3
k8s.io/apiserver v0.37.0-alpha.3
k8s.io/cli-runtime v0.37.0-alpha.3
k8s.io/client-go v0.37.0-alpha.3
k8s.io/cloud-provider v0.37.0-alpha.3
k8s.io/cluster-bootstrap v0.37.0-alpha.3
k8s.io/component-base v0.37.0-alpha.3
k8s.io/component-helpers v0.37.0-alpha.3
k8s.io/cri-api v0.37.0-alpha.3
k8s.io/kube-aggregator v0.37.0-alpha.3
k8s.io/kube-proxy v0.37.0-alpha.3
k8s.io/kubectl v0.37.0-alpha.3
k8s.io/kubelet v0.37.0-alpha.3
k8s.io/kubernetes v1.37.0-alpha.3
k8s.io/mount-utils v0.37.0-alpha.3
k8s.io/utils v0.0.0-20260626114624-be93311217bd
)
require (
@@ -131,7 +131,6 @@ require (
github.com/docker/go-connections v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.19.0 // indirect
@@ -163,7 +162,7 @@ require (
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/cadvisor v0.57.0 // indirect
github.com/google/cadvisor/lib v0.60.3 // indirect
github.com/google/cel-go v0.27.0 // indirect
github.com/google/certificate-transparency-go v1.1.7 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
@@ -279,13 +278,13 @@ require (
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/controller-manager v0.37.0-alpha.2 // indirect
k8s.io/cri-client v0.37.0-alpha.2 // indirect
k8s.io/controller-manager v0.37.0-alpha.3 // indirect
k8s.io/cri-client v0.37.0-alpha.3 // indirect
k8s.io/klog/v2 v2.140.0 // indirect
k8s.io/kms v0.37.0-alpha.2 // indirect
k8s.io/kms v0.37.0-alpha.3 // indirect
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 // indirect
k8s.io/metrics v0.37.0-alpha.2 // indirect
k8s.io/streaming v0.37.0-alpha.2 // indirect
k8s.io/metrics v0.37.0-alpha.3 // indirect
k8s.io/streaming v0.37.0-alpha.3 // indirect
modernc.org/libc v1.74.1 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
@@ -295,46 +294,46 @@ require (
sigs.k8s.io/kustomize/kustomize/v5 v5.8.1 // indirect
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect
tags.cncf.io/container-device-interface v1.1.0 // indirect
tags.cncf.io/container-device-interface/specs-go v1.1.0 // indirect
)
// Replacements duplicated from upstream Kubernetes
replace (
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.2/go.mod#L229-L263
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.3/go.mod#L229-L263
// Keep in sync with renovate.json
k8s.io/api => k8s.io/api v0.37.0-alpha.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.37.0-alpha.2
k8s.io/apimachinery => k8s.io/apimachinery v0.37.0-alpha.2
k8s.io/apiserver => k8s.io/apiserver v0.37.0-alpha.2
k8s.io/cli-runtime => k8s.io/cli-runtime v0.37.0-alpha.2
k8s.io/client-go => k8s.io/client-go v0.37.0-alpha.2
k8s.io/cloud-provider => k8s.io/cloud-provider v0.37.0-alpha.2
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.37.0-alpha.2
k8s.io/code-generator => k8s.io/code-generator v0.37.0-alpha.2
k8s.io/component-base => k8s.io/component-base v0.37.0-alpha.2
k8s.io/component-helpers => k8s.io/component-helpers v0.37.0-alpha.2
k8s.io/controller-manager => k8s.io/controller-manager v0.37.0-alpha.2
k8s.io/cri-api => k8s.io/cri-api v0.37.0-alpha.2
k8s.io/cri-client => k8s.io/cri-client v0.37.0-alpha.2
k8s.io/cri-streaming => k8s.io/cri-streaming v0.37.0-alpha.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.37.0-alpha.2
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.37.0-alpha.2
k8s.io/endpointslice => k8s.io/endpointslice v0.37.0-alpha.2
k8s.io/externaljwt => k8s.io/externaljwt v0.37.0-alpha.2
k8s.io/kms => k8s.io/kms v0.37.0-alpha.2
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.37.0-alpha.2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.37.0-alpha.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.37.0-alpha.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.37.0-alpha.2
k8s.io/kubectl => k8s.io/kubectl v0.37.0-alpha.2
k8s.io/kubelet => k8s.io/kubelet v0.37.0-alpha.2
k8s.io/metrics => k8s.io/metrics v0.37.0-alpha.2
k8s.io/mount-utils => k8s.io/mount-utils v0.37.0-alpha.2
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.37.0-alpha.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.37.0-alpha.2
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.37.0-alpha.2
k8s.io/sample-controller => k8s.io/sample-controller v0.37.0-alpha.2
k8s.io/streaming => k8s.io/streaming v0.37.0-alpha.2
k8s.io/api => k8s.io/api v0.37.0-alpha.3
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.37.0-alpha.3
k8s.io/apimachinery => k8s.io/apimachinery v0.37.0-alpha.3
k8s.io/apiserver => k8s.io/apiserver v0.37.0-alpha.3
k8s.io/cli-runtime => k8s.io/cli-runtime v0.37.0-alpha.3
k8s.io/client-go => k8s.io/client-go v0.37.0-alpha.3
k8s.io/cloud-provider => k8s.io/cloud-provider v0.37.0-alpha.3
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.37.0-alpha.3
k8s.io/code-generator => k8s.io/code-generator v0.37.0-alpha.3
k8s.io/component-base => k8s.io/component-base v0.37.0-alpha.3
k8s.io/component-helpers => k8s.io/component-helpers v0.37.0-alpha.3
k8s.io/controller-manager => k8s.io/controller-manager v0.37.0-alpha.3
k8s.io/cri-api => k8s.io/cri-api v0.37.0-alpha.3
k8s.io/cri-client => k8s.io/cri-client v0.37.0-alpha.3
k8s.io/cri-streaming => k8s.io/cri-streaming v0.37.0-alpha.3
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.37.0-alpha.3
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.37.0-alpha.3
k8s.io/endpointslice => k8s.io/endpointslice v0.37.0-alpha.3
k8s.io/externaljwt => k8s.io/externaljwt v0.37.0-alpha.3
k8s.io/kms => k8s.io/kms v0.37.0-alpha.3
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.37.0-alpha.3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.37.0-alpha.3
k8s.io/kube-proxy => k8s.io/kube-proxy v0.37.0-alpha.3
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.37.0-alpha.3
k8s.io/kubectl => k8s.io/kubectl v0.37.0-alpha.3
k8s.io/kubelet => k8s.io/kubelet v0.37.0-alpha.3
k8s.io/metrics => k8s.io/metrics v0.37.0-alpha.3
k8s.io/mount-utils => k8s.io/mount-utils v0.37.0-alpha.3
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.37.0-alpha.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.37.0-alpha.3
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.37.0-alpha.3
k8s.io/sample-controller => k8s.io/sample-controller v0.37.0-alpha.3
k8s.io/streaming => k8s.io/streaming v0.37.0-alpha.3
)
go.sum
+56 -66
View File
@@ -150,8 +150,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/erofs/go-erofs v0.3.0 h1:o/W5ABAA3sHYl97WL93dacKEfeDpJhdFf3c2snAti7I=
github.com/erofs/go-erofs v0.3.0/go.mod h1:XkSeN9MHszGd4+3gcEjadJLYHCQpWzJ7/8yznzMuzJs=
github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY=
github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw=
github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8=
github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
@@ -260,8 +258,8 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
github.com/google/cadvisor v0.57.0 h1:2LoXUZIJPR3VQJC1bZmqAGdh09yPfpS7MEeC4fJy80k=
github.com/google/cadvisor v0.57.0/go.mod h1:z6bozbhp/EAWhJqF6KK78MESLoeAhi7pJ9g7fRYGPEc=
github.com/google/cadvisor/lib v0.60.3 h1:WTyANRHy5g0QZ9eMMf0jIqVBnLSX+HbNwifgO55hdCo=
github.com/google/cadvisor/lib v0.60.3/go.mod h1:MWLbvpPnJSMU6g34UT28CDbvcC/bgZBLYhGcfeZREhw=
github.com/google/cel-go v0.27.0 h1:e7ih85+4qVrBuqQWTW4FKSqZYokVuc3HnhH5keboFTo=
github.com/google/cel-go v0.27.0/go.mod h1:tTJ11FWqnhw5KKpnWpvW9CJC3Y9GK4EIS0WXnBbebzw=
github.com/google/certificate-transparency-go v1.1.7 h1:IASD+NtgSTJLPdzkthwvAG1ZVbF2WtFg4IvoA68XGSw=
@@ -383,8 +381,6 @@ github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnENvE+SE=
github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM=
github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk=
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1:aKW/4cBs+yK6gpqU3K/oIwk9Q/XICqd3zOX/UFuvqmk=
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
@@ -393,14 +389,8 @@ github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQ
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/moby/api v1.54.1 h1:TqVzuJkOLsgLDDwNLmYqACUuTehOHRGKiPhvH8V3Nn4=
github.com/moby/moby/api v1.54.1/go.mod h1:+RQ6wluLwtYaTd1WnPLykIDPekkuyD/ROWQClE83pzs=
github.com/moby/moby/client v0.4.0 h1:S+2XegzHQrrvTCvF6s5HFzcrywWQmuVnhOXe2kiWjIw=
github.com/moby/moby/client v0.4.0/go.mod h1:QWPbvWchQbxBNdaLSpoKpCdf5E+WxFAgNHogCWDoa7g=
github.com/moby/spdystream v0.5.1 h1:9sNYeYZUcci9R6/w7KDaFWEWeV4LStVG78Mpyq/Zm/Y=
github.com/moby/spdystream v0.5.1/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk=
@@ -814,62 +804,62 @@ helm.sh/helm/v3 v3.21.3 h1:wkamdwI3liEkW6wI1l9aGqQZGxcTKyt8kx0qJLPcmCg=
helm.sh/helm/v3 v3.21.3/go.mod h1:iaJ0iNsPoTZl++7h6vzQFyT0VEVtLYJiyRBDkPOOBTs=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.37.0-alpha.2 h1:QlFfNpLR8u4REgMKPJW6stZut+Ig694IAk9v5pmL+7c=
k8s.io/api v0.37.0-alpha.2/go.mod h1:QvG6GVNM/dqApHJv1BidtiWpviZA3QbztsHgTUmgmbk=
k8s.io/apiextensions-apiserver v0.37.0-alpha.2 h1:j4IOhGdRhW2XBpeCKOHxN0/0csxlv70L1poKWMA0SLo=
k8s.io/apiextensions-apiserver v0.37.0-alpha.2/go.mod h1:XtxXo+o6tJnoR119xhKrQUh5CJknWsh4DVI2bGPDvaY=
k8s.io/apimachinery v0.37.0-alpha.2 h1:nVMCXf4rfXUIuCkpTOnhcDzZ+p5QS98XTGvfHgTW/Bk=
k8s.io/apimachinery v0.37.0-alpha.2/go.mod h1:S4uhVCP6dikhTM/sZqN4bWD53ZJZKAKN+kTZ522D/rA=
k8s.io/apiserver v0.37.0-alpha.2 h1:HKKizRNPk1Ps/xWnugFfUtJAcI12VV/QEREiGIYf420=
k8s.io/apiserver v0.37.0-alpha.2/go.mod h1:++vxtzCI8+WBnu9jZ5ydMSgwcfI7u8DuVWOfJ5MMLU4=
k8s.io/cli-runtime v0.37.0-alpha.2 h1:SbFEKIIUBkHlPWAlK928lSjJYfhJDPirY0aDYMoSN/c=
k8s.io/cli-runtime v0.37.0-alpha.2/go.mod h1:HWJbXuEN+YLsBDLiy3ha2syEGbnTqIk1DD+YnwM5roQ=
k8s.io/client-go v0.37.0-alpha.2 h1:ZMmr5jkz7UMAkG6Ijqf02nv5Af87OvNwRW90spwCX1g=
k8s.io/client-go v0.37.0-alpha.2/go.mod h1:mgFdVARrQrpGGhmx1iGJ164QdyvxuQPZrg/iZtgOr9w=
k8s.io/cloud-provider v0.37.0-alpha.2 h1:lqnGAI01IWtP+BQ8/JFT8E65Q5XY+XhGCK8/ob/xjVg=
k8s.io/cloud-provider v0.37.0-alpha.2/go.mod h1:Cy0ZoViQJeAsnlXwj2Ms0gMAfmBI4azOQCLit2b6NvE=
k8s.io/cluster-bootstrap v0.37.0-alpha.2 h1:LkUvvcbLjg391brzldzuIb9TiUPokXMe3CJT07t6jN0=
k8s.io/cluster-bootstrap v0.37.0-alpha.2/go.mod h1:CXbNgBYztHMclbLs+2Q/96TyRgXqze8LyC1oBpTci80=
k8s.io/component-base v0.37.0-alpha.2 h1:6lI0CGJDdLkrmLZPU2rGtpdP8imrqYLORRliA02Am80=
k8s.io/component-base v0.37.0-alpha.2/go.mod h1:2pGPA4WCvwRESTBUIA9DFm9f9O8PYyP4V0xQUaoj54A=
k8s.io/component-helpers v0.37.0-alpha.2 h1:BlOmv2jzY5JQbID7yVIM9MwG7HcK1CnRYKOvrl/i6+c=
k8s.io/component-helpers v0.37.0-alpha.2/go.mod h1:sDkbqFgZ/v7rAhPRUVbUgdhBLRY/5IbuJNgMmEAukJY=
k8s.io/controller-manager v0.37.0-alpha.2 h1:ydaKF+/lAJznC+66MmGB/ZrPr6F0YIfs6qrVqW98rVQ=
k8s.io/controller-manager v0.37.0-alpha.2/go.mod h1:joDZ0e5pgjfYgX6q7E6m5/vf0Hj0Ki7cl1UD0Le8TSo=
k8s.io/cri-api v0.37.0-alpha.2 h1:62Fo2fIp1YtvbQghB7RCO+cG6DdfzGnMuAkDom3r20o=
k8s.io/cri-api v0.37.0-alpha.2/go.mod h1:wJFlBxxfVx0SXyVJ4YSne/GUo2uJuGXkq0IXsf2q4lA=
k8s.io/cri-client v0.37.0-alpha.2 h1:qvRhOUOUZOSl5DhKdqeGccCJZRVyOSFgf4J33oH8vDI=
k8s.io/cri-client v0.37.0-alpha.2/go.mod h1:LsZtuZ/i2iP/Dw+hNIBtwHavAtiEYyo4ifmpkb0DN4w=
k8s.io/csi-translation-lib v0.37.0-alpha.2 h1:pWMQB7n0gt7kpI7YgVTuysbtS7V6pwbyf2ELGJcxnzA=
k8s.io/csi-translation-lib v0.37.0-alpha.2/go.mod h1:74ei+OgxspycDawXYU103H3LqGWkEo+2YlB0S5y7i64=
k8s.io/dynamic-resource-allocation v0.37.0-alpha.2 h1:XFHiRdWXQEZNu1mEOKICr5hcHtynRttwpdb9yepEmd0=
k8s.io/dynamic-resource-allocation v0.37.0-alpha.2/go.mod h1:z+VhP1Aeahzpkp15qdXfkJZ22qU4HwjfQKUBmlXZ9E8=
k8s.io/api v0.37.0-alpha.3 h1:8RLadjrxX6Nqz8yF13ADHYolBZ4ynBeE3NfzWyiGnyQ=
k8s.io/api v0.37.0-alpha.3/go.mod h1:Pg8TFuiCNviZSgHzFT2II6ux8lbFQo02ObX9xOIuYrM=
k8s.io/apiextensions-apiserver v0.37.0-alpha.3 h1:BZM5iUxbTszd5oj+xt4LH3/sZVKORWJE1Ws3jm03dLk=
k8s.io/apiextensions-apiserver v0.37.0-alpha.3/go.mod h1:/vL2D5lHe/yN43jd8bQ7nypbN8QsVGI6A28GLB0ZnOA=
k8s.io/apimachinery v0.37.0-alpha.3 h1:zxta8QqejeD3A3rEYUC63wSp/kh7KNr35TsX1p3SYTE=
k8s.io/apimachinery v0.37.0-alpha.3/go.mod h1:Uh/MjLZyS9W1TeoRsrsZMf91DZn8Kwox2FEyjwJoy5Q=
k8s.io/apiserver v0.37.0-alpha.3 h1:qnxt+4JHVIVo390KVXsGyggYKbya05FHDZ3U3MLD8RA=
k8s.io/apiserver v0.37.0-alpha.3/go.mod h1:cAdtKXbCtWktatU8ugGNet8WPhlsEgc7xbDxULOUQY8=
k8s.io/cli-runtime v0.37.0-alpha.3 h1:vEH+f3BAXogQYU8/K/DSnC1lUjWqy3AYArdFyGQig7A=
k8s.io/cli-runtime v0.37.0-alpha.3/go.mod h1:ETgQ2piZT5URncqNCS4Z5S8xR/cMStJsFaTOve/z/Qg=
k8s.io/client-go v0.37.0-alpha.3 h1:4p6rVMrCMjs8QJSS/z4UhWOps46iB24F+6klnPHfRHI=
k8s.io/client-go v0.37.0-alpha.3/go.mod h1:fr3/4H2dyns23ZKNGP0SgtE2p9gvI6N5aOqMAXBOlPQ=
k8s.io/cloud-provider v0.37.0-alpha.3 h1:EU6S1SS0vhmSJ3cZIi+A5eH10aX4CWNFoWnavSQDhXE=
k8s.io/cloud-provider v0.37.0-alpha.3/go.mod h1:30QmCrziCDokKdtoqWWZJ/1JP7myCccHeTHiNWwYs+c=
k8s.io/cluster-bootstrap v0.37.0-alpha.3 h1:rY3ibYNsmpaJHUONkN8TYoR9AgAKd7CRtJjGMbW9//c=
k8s.io/cluster-bootstrap v0.37.0-alpha.3/go.mod h1:TVmn8ixLhS3Fw1ea5ym4gLaBH0x/5TTa161+lanBvWg=
k8s.io/component-base v0.37.0-alpha.3 h1:5g6BZuGPfxnu0Zn+13jsW+akc0wH/1pneChppl4nyu8=
k8s.io/component-base v0.37.0-alpha.3/go.mod h1:Ocb0GmFTg75YY2YQI1lX9VHixDUGL6iRy+5IWwCJR6s=
k8s.io/component-helpers v0.37.0-alpha.3 h1:pALM8++P2Oi8BnYPYUiqQa9zZ89tXSzkcGJNIQvrurc=
k8s.io/component-helpers v0.37.0-alpha.3/go.mod h1:6vLPOf90kABRmId/6GDWCaoNHMNqs3dhhCnDxbxF0Ko=
k8s.io/controller-manager v0.37.0-alpha.3 h1:YayKXLnEc6frcKdLIlDR2jxJL6Xtw67YFClyQL55mAc=
k8s.io/controller-manager v0.37.0-alpha.3/go.mod h1:/kL59mDjaq12QJ/80YCciEeDFPc0DBaFiqTxYgiLMcY=
k8s.io/cri-api v0.37.0-alpha.3 h1:Nh19L8V3zaGqhRoFri2ntRCGhGxuvLm5X+0f0tKfLIA=
k8s.io/cri-api v0.37.0-alpha.3/go.mod h1:wJFlBxxfVx0SXyVJ4YSne/GUo2uJuGXkq0IXsf2q4lA=
k8s.io/cri-client v0.37.0-alpha.3 h1:61o85futkCtO3ieQKmj8wcwIvhQMaGbH7PF+EKGj1do=
k8s.io/cri-client v0.37.0-alpha.3/go.mod h1:JJpdKxnmYOGpC/wsx6zvjZyLcwXuteEgTwO9jEIGj/U=
k8s.io/csi-translation-lib v0.37.0-alpha.3 h1:JYx4D9iD6QtyH1ki//btbCaWs+xyShHBlRV0Gkic9jQ=
k8s.io/csi-translation-lib v0.37.0-alpha.3/go.mod h1:g2cPkryBpdaMJ35vYT1NvrQJrQzzIPjsPVf/UZePS/U=
k8s.io/dynamic-resource-allocation v0.37.0-alpha.3 h1:LoBqDWQW8dB6sbjp1ZpEpMxp7nz+OSSlEsljuFFcMIk=
k8s.io/dynamic-resource-allocation v0.37.0-alpha.3/go.mod h1:KwZzAS/PRhj8ovgtL7nOT3vhrdLPvtcQKB1KHDHVM4o=
k8s.io/klog/v2 v2.140.0 h1:Tf+J3AH7xnUzZyVVXhTgGhEKnFqye14aadWv7bzXdzc=
k8s.io/klog/v2 v2.140.0/go.mod h1:o+/RWfJ6PwpnFn7OyAG3QnO47BFsymfEfrz6XyYSSp0=
k8s.io/kms v0.37.0-alpha.2 h1:EcKhQ1+WNIJ33OckrkDgejLrUKymlP0klW1vk+mI/Og=
k8s.io/kms v0.37.0-alpha.2/go.mod h1:ErLCNmzrfZcVkr00luMid4eeJvrJzE7bvtD51ITQr+8=
k8s.io/kube-aggregator v0.37.0-alpha.2 h1:Oq3HiH02eWA2MRrPc8V1XaNfHooHw3SYLL+gPnP+rfI=
k8s.io/kube-aggregator v0.37.0-alpha.2/go.mod h1:mZTwVzuMDPtehWxB0+iqcF/zRfRkR7Z/ypItADokxQs=
k8s.io/kms v0.37.0-alpha.3 h1:/x3TlkJSb7aN4JqtR3a81DSUbOjMpgIb4gd87RoFjOY=
k8s.io/kms v0.37.0-alpha.3/go.mod h1:ErLCNmzrfZcVkr00luMid4eeJvrJzE7bvtD51ITQr+8=
k8s.io/kube-aggregator v0.37.0-alpha.3 h1:A7tM1PrrhCXUa3IU+2pg/cErZv7A0CuZZzgiuXK/lEE=
k8s.io/kube-aggregator v0.37.0-alpha.3/go.mod h1:DYkY0Yht1DAoRIEkwfcmjw8b7xvjmd+q5aXObWBl4aI=
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974 h1:JVogoTvOj6gutlx8bUwGh0e8o8L4X8nDbTLyONmoVvk=
k8s.io/kube-openapi v0.0.0-20260618221249-bc653b64f974/go.mod h1:V/QaCUYDa+0QpcHhVVc5l99Uz56wEMEXBSj9oCDkNDY=
k8s.io/kube-proxy v0.37.0-alpha.2 h1:YVC19XK+GGOHx7SuiE9dZo40RnjF6+5zQD7VjBcHBKk=
k8s.io/kube-proxy v0.37.0-alpha.2/go.mod h1:ze9YyeLl0dBbmVCEvtmaPDUpWd9e1x+WvGaAb/Ze7tI=
k8s.io/kube-scheduler v0.37.0-alpha.2 h1:NONyTJzPdLK867XNsuZecEmrR6OBKgBX9lcn4HBSC9s=
k8s.io/kube-scheduler v0.37.0-alpha.2/go.mod h1:bny5oW+CrK9Eoj2zkh4nTq2tgFsZqPioVlJ6np6ktXU=
k8s.io/kubectl v0.37.0-alpha.2 h1:3mdBf4h2DyTydL+O4n0JSxbImPH0S8XO9+WSaTqJju8=
k8s.io/kubectl v0.37.0-alpha.2/go.mod h1:WY+bmNkD5mkJg+pL85wBpsLFZUMtcB9iw0Hhr95vylg=
k8s.io/kubelet v0.37.0-alpha.2 h1:6jsKY/uXyyzqchDiZc38aUWi641yNO/TITXMNRK2Kdg=
k8s.io/kubelet v0.37.0-alpha.2/go.mod h1:XrLLFS7WajBXeO5YgXGWb5Ww5ZZ8UoU1jxVtWoh9Z9c=
k8s.io/kubernetes v1.37.0-alpha.2 h1:VAKyebo6pIeTF4ODo01O6mpu7dEGvood/rNXeveZwTQ=
k8s.io/kubernetes v1.37.0-alpha.2/go.mod h1:Di/rgEDV4ZfL+vJLUEapW8QVnZx+H+0LB24kGCtkmwI=
k8s.io/metrics v0.37.0-alpha.2 h1:bRkBpetCN7yy+O6FgyjHATCFU0v/4jzmoh/FNhbKIXw=
k8s.io/metrics v0.37.0-alpha.2/go.mod h1:LGJM7DxAuvd0Ki1IhJC7iucS53BtStQORtR03MDQ04k=
k8s.io/mount-utils v0.37.0-alpha.2 h1:BUwYY2CD1e2DQ9A9CEvxTZq+7x0Oh5eBpqCw5kBTwd4=
k8s.io/mount-utils v0.37.0-alpha.2/go.mod h1:92r2hk1Z+a/NPQdvEQDP5vPbu0KugA3XDH2o8U0v+Ng=
k8s.io/streaming v0.37.0-alpha.2 h1:j1g81dEBrCTHq+hW5Q9D5/FcJJoGa/MaUmBSMHnE0ZY=
k8s.io/streaming v0.37.0-alpha.2/go.mod h1:QN1+yCAfxcSvo0908Z3rFKkA5Xlr3KgUZAGwKuR6qQk=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5 h1:kBawHLSnx/mYHmRnNUf9d4CpjREbeZuxoSGOX/J+aYM=
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
k8s.io/kube-proxy v0.37.0-alpha.3 h1:QK6k4wX4DNw8a/3SSeKqo/sY1OEO0LgR3ZrjKZ6ItME=
k8s.io/kube-proxy v0.37.0-alpha.3/go.mod h1:C6+1heahU1PC/FfsSycTE8USjRG22uMm/HCfnQQVBWs=
k8s.io/kube-scheduler v0.37.0-alpha.3 h1:SPsXqIRDwlL0rBEpkO7k96b+Ezgyjiv3/bKJy7Thnoo=
k8s.io/kube-scheduler v0.37.0-alpha.3/go.mod h1:laPGcjEqkQpNGhatQwNKMfxFB4u8aj1fugptHFFVWOY=
k8s.io/kubectl v0.37.0-alpha.3 h1:lFlClLUVHF5pFBggXwwVHDf2//68dKxI+pMZAEnxVcY=
k8s.io/kubectl v0.37.0-alpha.3/go.mod h1:/YAf3NWWxmEwoByDm1B5lL7RtCFvrp1KSpg0fYHLVsk=
k8s.io/kubelet v0.37.0-alpha.3 h1:hQ7YdAco9bufm8b/miYgQP49HHh/gMsYAz+mdiibmCE=
k8s.io/kubelet v0.37.0-alpha.3/go.mod h1:hnhHzuPYb655Nuzgwn79rfGbU6TKaBLZ9rT0LmgyAh4=
k8s.io/kubernetes v1.37.0-alpha.3 h1:BIbASyuEHW1AhL22EFZCxHmeZHONHhlWrn3KUerwkHQ=
k8s.io/kubernetes v1.37.0-alpha.3/go.mod h1:YL13DSFcJE2Nqow6jtOae9zpbIyse2s8vYcthP5pXQE=
k8s.io/metrics v0.37.0-alpha.3 h1:yWJFVowkafCpmqTH4vH7BwDkOilXcunjKuVYc0LpSfw=
k8s.io/metrics v0.37.0-alpha.3/go.mod h1:RUW0NCOKXOhIhbNjgFfVVJAJvCni6dASopzZblpzyAM=
k8s.io/mount-utils v0.37.0-alpha.3 h1:RAlQLqUIfUA+59hh4xFvqJT4a+VvsFpFhvYbCqsN+rw=
k8s.io/mount-utils v0.37.0-alpha.3/go.mod h1:X9BLNRZHXYcvSiRfdKIeEICjBzgaxMX87uxhRXhwyjw=
k8s.io/streaming v0.37.0-alpha.3 h1:6XwRAwOC3DEqgHQTsqHfqLtdJpYKHJ+HShPfEzs5cVM=
k8s.io/streaming v0.37.0-alpha.3/go.mod h1:jksMJuFO/NrJlKuDkIomVgAJnK+Yu9h8KTrkZ8ESiac=
k8s.io/utils v0.0.0-20260626114624-be93311217bd h1:Ea7fgQ5we8Y9T0OX5o0dAHzQOBRI07D/dEYRaB9ZZEs=
k8s.io/utils v0.0.0-20260626114624-be93311217bd/go.mod h1:xDxuJ0whA3d0I4mf/C4ppKHxXynQ+fxnkmQH0vTHnuk=
modernc.org/cc/v4 v4.29.0 h1:CXgwL8cvxmyzBQZzbSl/6xFtMCryb6u8IOqDci39cgc=
modernc.org/cc/v4 v4.29.0/go.mod h1:OnovgIhbbMXMu1aISnJ0wvVD1KnW+cAUJkIrAWh+kVI=
modernc.org/ccgo/v4 v4.34.6 h1:sBgfIwyN0TQ9C5hwIeuqyeAKyMWnbvj2fvpF4L11uzU=
@@ -914,8 +904,8 @@ sigs.k8s.io/kustomize/kyaml v0.21.1 h1:IVlbmhC076nf6foyL6Taw4BkrLuEsXUXNpsE+ScX7
sigs.k8s.io/kustomize/kyaml v0.21.1/go.mod h1:hmxADesM3yUN2vbA5z1/YTBnzLJ1dajdqpQonwBL1FQ=
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v6 v6.4.0 h1:qmp2e3ZfFi1/jJbDGpD4mt3wyp6PE1NfKHCYLqgNQJo=
sigs.k8s.io/structured-merge-diff/v6 v6.4.0/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/structured-merge-diff/v6 v6.4.2 h1:qdOxHwrl2Kaag1aQEarlYcOA9vSyGCp3CIki3aW8c4Q=
sigs.k8s.io/structured-merge-diff/v6 v6.4.2/go.mod h1:M3W8sfWvn2HhQDIbGWj3S099YozAsymCo/wrT5ohRUE=
sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs=
sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4=
tags.cncf.io/container-device-interface v1.1.0 h1:RnxNhxF1JOu6CJUVpetTYvrXHdxw9j9jFYgZpI+anSY=
pkg/apis/k0s/v1beta1/kubeproxy.go
+3 -3
View File
@@ -54,7 +54,7 @@ type KubeProxy struct {
}
// KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.2/config/v1alpha1/types.go#L27-L48
// @see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.3/config/v1alpha1/types.go#L27-L48
type KubeProxyIPTablesConfiguration struct {
MasqueradeBit *int32 `json:"masqueradeBit,omitempty"`
MasqueradeAll bool `json:"masqueradeAll,omitempty"`
@@ -66,7 +66,7 @@ type KubeProxyIPTablesConfiguration struct {
}
// KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.2/config/v1alpha1/types.go#L52-L78
// @see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.3/config/v1alpha1/types.go#L52-L78
type KubeProxyIPVSConfiguration struct {
// +optional
SyncPeriod metav1.Duration `json:"syncPeriod"`
@@ -84,7 +84,7 @@ type KubeProxyIPVSConfiguration struct {
}
// KubeProxyNFTablesConfiguration contains nftables-related kube-proxy configuration
// @see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.2/config/v1alpha1/types.go#L82-L97
// @see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.3/config/v1alpha1/types.go#L82-L97
type KubeProxyNFTablesConfiguration struct {
// +optional
SyncPeriod metav1.Duration `json:"syncPeriod"`
pkg/apis/k0s/v1beta1/network.go
+2 -2
View File
@@ -117,7 +117,7 @@ func (n *Network) Validate() []error {
}
// Validate IPv6 ServiceCIDR prefix length per Kubernetes requirements (<= /108).
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.2/cmd/kube-apiserver/app/options/validation.go#L52-L58
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.3/cmd/kube-apiserver/app/options/validation.go#L52-L58
if serviceNetIP.To4() == nil {
ones, bits := serviceNet.Mask.Size()
if bits == 128 && ones > 108 {
@@ -154,7 +154,7 @@ func (n *Network) Validate() []error {
} else {
ones, bits := ipv6SvcNet.Mask.Size()
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.2/cmd/kube-apiserver/app/options/validation.go#L39
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.3/cmd/kube-apiserver/app/options/validation.go#L39
maxCIDRBits := 20
if bits-ones > maxCIDRBits {
errors = append(errors, field.Invalid(field.NewPath("dualStack", "IPv6serviceCIDR"), n.DualStack.IPv6ServiceCIDR, "IPv6 service CIDR prefix must be <= 108"))
pkg/client/clientset/clientset.go
+2 -2
View File
@@ -19,7 +19,7 @@ import (
)
type Interface interface {
Discovery() discovery.DiscoveryInterface
Discovery() discovery.DiscoveryInterfaces
AutopilotV1beta2() autopilotv1beta2.AutopilotV1beta2Interface
EtcdV1beta1() etcdv1beta1.EtcdV1beta1Interface
HelmV1beta1() helmv1beta1.HelmV1beta1Interface
@@ -56,7 +56,7 @@ func (c *Clientset) K0sV1beta1() k0sv1beta1.K0sV1beta1Interface {
}
// Discovery retrieves the DiscoveryClient
func (c *Clientset) Discovery() discovery.DiscoveryInterface {
func (c *Clientset) Discovery() discovery.DiscoveryInterfaces {
if c == nil {
return nil
}
pkg/client/clientset/fake/clientset_generated.go
+1 -1
View File
@@ -64,7 +64,7 @@ type Clientset struct {
tracker testing.ObjectTracker
}
func (c *Clientset) Discovery() discovery.DiscoveryInterface {
func (c *Clientset) Discovery() discovery.DiscoveryInterfaces {
return c.discovery
}
pkg/component/worker/kubelet.go
+1 -1
View File
@@ -117,7 +117,7 @@ func (k *Kubelet) Start(ctx context.Context) error {
// Kubelet uses a DNS lookup of the node name to figure out the node IP,
// but will only pick one for a single family. Do something similar as
// kubelet, but for both IPv4 and IPv6.
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.2/pkg/kubelet/nodestatus/setters.go#L151-L179
// https://github.com/kubernetes/kubernetes/blob/v1.37.0-alpha.3/pkg/kubelet/nodestatus/setters.go#L151-L179
ipv4, ipv6, err := k.lookupNodeName(ctx)
if err == nil && (ipv4 == nil || ipv6 == nil) {
err = fmt.Errorf("node name IP address lookup didn't return addresses for both families: IPv4: %s, IPv6: %s", ipv4, ipv6)
pkg/constant/constant.go
+2 -2
View File
@@ -78,9 +78,9 @@ const (
KubePauseWindowsContainerImage = "registry.k8s.io/pause"
KubePauseWindowsContainerImageVersion = "3.10.1"
KubeProxyImage = "quay.io/k0sproject/kube-proxy"
KubeProxyImageVersion = "v1.37.0-alpha.2"
KubeProxyImageVersion = "v1.37.0-alpha.3"
KubeProxyWindowsImage = "docker.io/sigwindowstools/kube-proxy"
KubeProxyWindowsImageVersion = "v1.37.0-alpha.2-calico-hostprocess"
KubeProxyWindowsImageVersion = "v1.37.0-alpha.3-calico-hostprocess"
CoreDNSImage = "quay.io/k0sproject/coredns"
CoreDNSImageVersion = "1.14.6-k0s.0"
EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"
static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml
+3 -3
View File
@@ -968,7 +968,7 @@ spec:
iptables:
description: |-
KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.2/config/v1alpha1/types.go#L27-L48
@see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.3/config/v1alpha1/types.go#L27-L48
properties:
localhostNodePorts:
type: boolean
@@ -985,7 +985,7 @@ spec:
ipvs:
description: |-
KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.2/config/v1alpha1/types.go#L52-L78
@see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.3/config/v1alpha1/types.go#L52-L78
properties:
excludeCIDRs:
items:
@@ -1016,7 +1016,7 @@ spec:
nftables:
description: |-
KubeProxyNFTablesConfiguration contains nftables-related kube-proxy configuration
@see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.2/config/v1alpha1/types.go#L82-L97
@see https://github.com/kubernetes/kube-proxy/blob/v0.37.0-alpha.3/config/v1alpha1/types.go#L82-L97
properties:
masqueradeAll:
type: boolean