From 1f2c24ea16d6fa0a62e039ee9dd826092152df1f Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Wed, 23 Oct 2024 14:16:07 +0200 Subject: [PATCH] Bump Kubernetes to v1.30.6 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.30.md#changelog-since-v1305 Signed-off-by: Tom Wieczorek --- embedded-bins/Makefile.variables | 2 +- examples/bootloose-ha-controllers/Dockerfile | 2 +- go.mod | 98 +++++++++---------- go.sum | 72 +++++++------- hack/tool/go.mod | 4 +- hack/tool/go.sum | 12 +-- inttest/sonobuoy/README.md | 12 +-- .../update-server/html/unstable/index.yaml | 2 +- pkg/apis/k0s/v1beta1/kubeproxy.go | 4 +- pkg/constant/constant.go | 2 +- .../k0s.k0sproject.io_clusterconfigs.yaml | 4 +- 11 files changed, 107 insertions(+), 107 deletions(-) diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index aaf674a5e903..d5b441c84e74 100644 --- a/embedded-bins/Makefile.variables +++ b/embedded-bins/Makefile.variables @@ -22,7 +22,7 @@ containerd_build_shim_go_cgo_enabled = 0 #containerd_build_go_ldflags = containerd_build_go_ldflags_extra = "-w -s -extldflags=-static" -kubernetes_version = 1.30.5 +kubernetes_version = 1.30.6 helm_version = 3.11.1 kubernetes_buildimage = $(golang_buildimage) kubernetes_build_go_tags = "providerless" diff --git a/examples/bootloose-ha-controllers/Dockerfile b/examples/bootloose-ha-controllers/Dockerfile index 02a2fe5aa12d..3c8b7b097cda 100644 --- a/examples/bootloose-ha-controllers/Dockerfile +++ b/examples/bootloose-ha-controllers/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/k0sproject/bootloose-ubuntu18.04 ADD k0s.service /etc/systemd/system/k0s.service -RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.30.5/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.30.6/bin/linux/amd64/kubectl && \ chmod +x /usr/local/bin/kubectl ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf diff --git a/go.mod b/go.mod index 3324b6ca5ed1..0e09af24df1d 100644 --- a/go.mod +++ b/go.mod @@ -64,20 +64,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.30.5 - k8s.io/apiextensions-apiserver v0.30.5 - k8s.io/apimachinery v0.30.5 - k8s.io/cli-runtime v0.30.5 - k8s.io/client-go v0.30.5 - k8s.io/cloud-provider v0.30.5 - k8s.io/component-base v0.30.5 - k8s.io/component-helpers v0.30.5 - k8s.io/cri-api v0.30.5 - k8s.io/kube-aggregator v0.30.5 - k8s.io/kubectl v0.30.5 - k8s.io/kubelet v0.30.5 - k8s.io/kubernetes v1.30.5 - k8s.io/mount-utils v0.30.5 + k8s.io/api v0.30.6 + k8s.io/apiextensions-apiserver v0.30.6 + k8s.io/apimachinery v0.30.6 + k8s.io/cli-runtime v0.30.6 + k8s.io/client-go v0.30.6 + k8s.io/cloud-provider v0.30.6 + k8s.io/component-base v0.30.6 + k8s.io/component-helpers v0.30.6 + k8s.io/cri-api v0.30.6 + k8s.io/kube-aggregator v0.30.6 + k8s.io/kubectl v0.30.6 + k8s.io/kubelet v0.30.6 + k8s.io/kubernetes v1.30.6 + k8s.io/mount-utils v0.30.6 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/controller-runtime v0.18.2 sigs.k8s.io/yaml v1.4.0 @@ -275,12 +275,12 @@ 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/apiserver v0.30.5 // indirect - k8s.io/controller-manager v0.30.5 // indirect + k8s.io/apiserver v0.30.6 // indirect + k8s.io/controller-manager v0.30.6 // indirect k8s.io/klog/v2 v2.120.1 // indirect - k8s.io/kms v0.30.5 // indirect + k8s.io/kms v0.30.6 // indirect k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect - k8s.io/metrics v0.30.5 // indirect + k8s.io/metrics v0.30.6 // indirect oras.land/oras-go v1.2.4 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -292,35 +292,35 @@ require ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.30.5/go.mod#L239-L270 - k8s.io/api => k8s.io/api v0.30.5 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.5 - k8s.io/apimachinery => k8s.io/apimachinery v0.30.5 - k8s.io/apiserver => k8s.io/apiserver v0.30.5 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.5 - k8s.io/client-go => k8s.io/client-go v0.30.5 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.5 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.5 - k8s.io/code-generator => k8s.io/code-generator v0.30.5 - k8s.io/component-base => k8s.io/component-base v0.30.5 - k8s.io/component-helpers => k8s.io/component-helpers v0.30.5 - k8s.io/controller-manager => k8s.io/controller-manager v0.30.5 - k8s.io/cri-api => k8s.io/cri-api v0.30.5 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.5 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.5 - k8s.io/endpointslice => k8s.io/endpointslice v0.30.5 - k8s.io/kms => k8s.io/kms v0.30.5 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.5 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.5 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.5 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.5 - k8s.io/kubectl => k8s.io/kubectl v0.30.5 - k8s.io/kubelet => k8s.io/kubelet v0.30.5 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.5 - k8s.io/metrics => k8s.io/metrics v0.30.5 - k8s.io/mount-utils => k8s.io/mount-utils v0.30.5 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.5 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.5 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.5 - k8s.io/sample-controller => k8s.io/sample-controller v0.30.5 + // https://github.com/kubernetes/kubernetes/blob/v1.30.6/go.mod#L239-L270 + k8s.io/api => k8s.io/api v0.30.6 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.6 + k8s.io/apimachinery => k8s.io/apimachinery v0.30.6 + k8s.io/apiserver => k8s.io/apiserver v0.30.6 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.6 + k8s.io/client-go => k8s.io/client-go v0.30.6 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.6 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.6 + k8s.io/code-generator => k8s.io/code-generator v0.30.6 + k8s.io/component-base => k8s.io/component-base v0.30.6 + k8s.io/component-helpers => k8s.io/component-helpers v0.30.6 + k8s.io/controller-manager => k8s.io/controller-manager v0.30.6 + k8s.io/cri-api => k8s.io/cri-api v0.30.6 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.6 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.6 + k8s.io/endpointslice => k8s.io/endpointslice v0.30.6 + k8s.io/kms => k8s.io/kms v0.30.6 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.6 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.6 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.6 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.6 + k8s.io/kubectl => k8s.io/kubectl v0.30.6 + k8s.io/kubelet => k8s.io/kubelet v0.30.6 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.6 + k8s.io/metrics => k8s.io/metrics v0.30.6 + k8s.io/mount-utils => k8s.io/mount-utils v0.30.6 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.6 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.6 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.6 + k8s.io/sample-controller => k8s.io/sample-controller v0.30.6 ) diff --git a/go.sum b/go.sum index 37295c8bd151..6f829360a22f 100644 --- a/go.sum +++ b/go.sum @@ -920,46 +920,46 @@ helm.sh/helm/v3 v3.14.4 h1:6FSpEfqyDalHq3kUr4gOMThhgY55kXUEjdQoyODYnrM= helm.sh/helm/v3 v3.14.4/go.mod h1:Tje7LL4gprZpuBNTbG34d1Xn5NmRT3OWfBRwpOSer9I= 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.30.5 h1:Coz05sfEVywzGcA96AJPUfs2B8LBMnh+IIsM+HCfaz8= -k8s.io/api v0.30.5/go.mod h1:HfNBGFvq9iNK8dmTKjYIdAtMxu8BXTb9c1SJyO6QjKs= -k8s.io/apiextensions-apiserver v0.30.5 h1:JfXTIyzXf5+ryncbp7T/uaVjLdvkwtqoNG2vo7S2a6M= -k8s.io/apiextensions-apiserver v0.30.5/go.mod h1:uVLEME2UPA6UN22i+jTu66B9/0CnsjlHkId+Awo0lvs= -k8s.io/apimachinery v0.30.5 h1:CQZO19GFgw4zcOjY2H+mJ3k1u1o7zFACTNCB7nu4O18= -k8s.io/apimachinery v0.30.5/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/apiserver v0.30.5 h1:roo3cfvUS7zvI6u+bY35Xv3rSDXbY9dwl1gN+rxx0S4= -k8s.io/apiserver v0.30.5/go.mod h1:p5UqIn1WPdOFo7uO/ZUdX464hHZy1DP384znr7FOIXA= -k8s.io/cli-runtime v0.30.5 h1:MWY6efoBVH3h0O6p2DgaQszabV5ZntHZwTHBkiz+PSI= -k8s.io/cli-runtime v0.30.5/go.mod h1:AKMWLDIJQUA5a7yEh5gmzkhpZqYpuDEVovanugfSnQk= -k8s.io/client-go v0.30.5 h1:vEDSzfTz0F8TXcWVdXl+aqV7NAV8M3UvC2qnGTTCoKw= -k8s.io/client-go v0.30.5/go.mod h1:/q5fHHBmhAUesOOFJACpD7VJ4e57rVtTPDOsvXrPpMk= -k8s.io/cloud-provider v0.30.5 h1:rkJvDNMZUNoRoRQNQ9iaW7AqayXQT2Fa65JRBjfQBf8= -k8s.io/cloud-provider v0.30.5/go.mod h1:bKNgnDb9iSw2ymV/wFAgTG9jgpvRiF/2LM/KqmmWycQ= -k8s.io/component-base v0.30.5 h1:O6W8GfdBuyctVy7lu7I0yo8kB6bYgzGzjCyaagb2BR0= -k8s.io/component-base v0.30.5/go.mod h1:eliJtfE7RG18UHMWrqPQWodf1GnQVFGA6McNOHYi11g= -k8s.io/component-helpers v0.30.5 h1:jXrCpym8Ed+FyhqO/djlC0YHmiiV+ZlLcQhl1GXprD0= -k8s.io/component-helpers v0.30.5/go.mod h1:zNV3WR4ZUfFFDRpv5Gs2a+Ey3LtZ8ilFiKqxF90dLG4= -k8s.io/controller-manager v0.30.5 h1:aBgRd2hDJ25x6W86FFj/DI27uQQD757OZUgdFjrzzqM= -k8s.io/controller-manager v0.30.5/go.mod h1:CoCm8RhJrZCue2pYHhc/eZ72ogPPZEhDHJV/FWxOaU4= -k8s.io/cri-api v0.30.5 h1:FRwv3mhbSy3t/kF1FAvDTK/fm8cRTxdnkFLIOx6rx/s= -k8s.io/cri-api v0.30.5/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg= +k8s.io/api v0.30.6 h1:uqRDLnFkmPLorI9D0x1dGXdYeRQMhQHlrHDgZ3/45RE= +k8s.io/api v0.30.6/go.mod h1:6x759Hj7155pXRKStxzM7TMN9hW0x7WrBr51kuDMSHo= +k8s.io/apiextensions-apiserver v0.30.6 h1:eXmd0cki9xjpUguN7zaWI8I6wo1utHQj6RWqeBaVmew= +k8s.io/apiextensions-apiserver v0.30.6/go.mod h1:va7pN44YJJDHrShKhPSL9S5CyTJ8idAmqIARt5wY4j8= +k8s.io/apimachinery v0.30.6 h1:dlplzGrUL/DiPOVVVjDcT9ZoQBOwYeB6hcFy90veggs= +k8s.io/apimachinery v0.30.6/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/apiserver v0.30.6 h1:kMkE/pln4hJpc1OJGa/u8CzpLtr4URbmgkdfw37lzMA= +k8s.io/apiserver v0.30.6/go.mod h1:kloaQDI0pBfhnHM0vfsgzOkWpTW7Z69rjPWEsMlIUzg= +k8s.io/cli-runtime v0.30.6 h1:vH7E+QSwR6Q/jHC0Etoal6tDGECWQDm5nw3YdzZZuVs= +k8s.io/cli-runtime v0.30.6/go.mod h1:aWY1dJ9IB5pysp4tU2x70zpHlckMbCMVcHYopjVPSWw= +k8s.io/client-go v0.30.6 h1:hMo7AUkHy/UqnwPMH+oJvFR9gpvXVfQnsiO+G2fdE30= +k8s.io/client-go v0.30.6/go.mod h1:DDN89/30A1DfatO+c3ksYMM12kL7a/CZvsBaVjwh33g= +k8s.io/cloud-provider v0.30.6 h1:6MOnKBXwMihQldcPqxutAzT/0mnIQ7UaDwIeZbjVG+4= +k8s.io/cloud-provider v0.30.6/go.mod h1:biTWwTVHB0Ktx3UbT3bISKNzIhUqkCLbXSpZIMEdmUw= +k8s.io/component-base v0.30.6 h1:t94cw6cQ7bplaS3Y5C/txkUXpaxG+wbgspTmudGUpNs= +k8s.io/component-base v0.30.6/go.mod h1:GAemfIPE9Zc3bxOmeLPpHKKHzfuMlmTwsAjx/bWaJvQ= +k8s.io/component-helpers v0.30.6 h1:l+DJ3hGcAWELcuEJwwdhqcphpJL8Huo+L6NDq537rgM= +k8s.io/component-helpers v0.30.6/go.mod h1:HqICFUjRQYqdfl+Ttqrhumw1NmG9jEfINJ/nxEj9hOY= +k8s.io/controller-manager v0.30.6 h1:ryqNMyX7O0l/G1G+hfJoGbuc8Wm5fDUDBCZgjyd8SR8= +k8s.io/controller-manager v0.30.6/go.mod h1:FOkXQsnChtGb0Xj0a3Xj0v3BTMDBULKlkm8+MqRhGbY= +k8s.io/cri-api v0.30.6 h1:V0ooutncgzkML7HHVbM3UX+d6mmouGZTl6548brp/bk= +k8s.io/cri-api v0.30.6/go.mod h1://4/umPJSW1ISNSNng4OwjpkvswJOQwU8rnkvO8P+xg= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.30.5 h1:hv7tnGDrxbgpedBhBfGhSu9+v5aW5uhG6w36fBIK1K8= -k8s.io/kms v0.30.5/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4= -k8s.io/kube-aggregator v0.30.5 h1:i0Wgw+0KtfwGgZ+8pzquenmv7S4RA0yxBd/ZR06T+pM= -k8s.io/kube-aggregator v0.30.5/go.mod h1:S7d6r8CsX6I/O5A4Dr4lahgt0mCwHMP3eqnZIkHcO/k= +k8s.io/kms v0.30.6 h1:54j1mvj/DnCTkZOIdxFk9MHKoTcsnZ45CBnhRimpGGE= +k8s.io/kms v0.30.6/go.mod h1:GrMurD0qk3G4yNgGcsCEmepqf9KyyIrTXYR2lyUOJC4= +k8s.io/kube-aggregator v0.30.6 h1:B+0dOzQ+nKbFrhqPdilr4nsIlpSReGmo4JYPOXuSld4= +k8s.io/kube-aggregator v0.30.6/go.mod h1:XengKxlgTCWd6B+bJc2m2KnbxZCOEjk2O9wdMTmAfUc= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= -k8s.io/kubectl v0.30.5 h1:UHIdbLWHjL/+CaFc9ZESwpwdvpp9EDPLdgGolhMv8tQ= -k8s.io/kubectl v0.30.5/go.mod h1:Pr+NYcX5Lx8eG04B/0t1rzjWcXsvvbda8swiZV9plQw= -k8s.io/kubelet v0.30.5 h1:7jsJo1MkmGC3VEE0cf1tHiFKzi8DMBVNih3/OttSBaw= -k8s.io/kubelet v0.30.5/go.mod h1:vzllyQKrbFpTq0WOHV6yX0gUs6KqTwCBAO13cAearMc= -k8s.io/kubernetes v1.30.5 h1:uay5j9vFQnjuXRfooZ+wPzbDHPHLk4nRGKYr6tq+QvQ= -k8s.io/kubernetes v1.30.5/go.mod h1:eWEwBuUIgunE32nhS0xM5hiN4BIp3ISrAIlGTyNN2JY= -k8s.io/metrics v0.30.5 h1:pVmT8z/qhRUEOf+OpYtXANxn3GhDQZpqNCU4QMyAwkA= -k8s.io/metrics v0.30.5/go.mod h1:MLJhKnSEZwn1qnHtErvDnbXYobLr020YIzknFeTFaLA= -k8s.io/mount-utils v0.30.5 h1:kUdMKbpUCVRN4wdgusilsmhSIGQ8NHN4df7zPnGkDQU= -k8s.io/mount-utils v0.30.5/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo= +k8s.io/kubectl v0.30.6 h1:yPBMSJJxJk3ZHbiSAZreptXp0CiDVFLeLDXDGH7TyM0= +k8s.io/kubectl v0.30.6/go.mod h1:MHos6OafyfyoFaoSawxQh1uPVc3xXs+v98FGF8Mz0/0= +k8s.io/kubelet v0.30.6 h1:jae6hlfOeSA8YCgaPAJRqrWdmGUAtRmbMuatey5e/NA= +k8s.io/kubelet v0.30.6/go.mod h1:blswm8XUMWUXmS3hduLjButEksPbla9mkGXrjTWyX9U= +k8s.io/kubernetes v1.30.6 h1:cB/R87sSwwEDbWmzaldb29JYwaorqe+mMdsp68RZyaQ= +k8s.io/kubernetes v1.30.6/go.mod h1:hV3c+sqOEO0eVqgSo0KW5dOJ6UjGJ2l3Pd9+Qvft8UI= +k8s.io/metrics v0.30.6 h1:oRMnf1X547Zo3gjJNCP0F9Xb+FxAH/KAvZLOeOCKdrw= +k8s.io/metrics v0.30.6/go.mod h1:lYRgo9LbZfw3Uk6bB2Vulk1e9Jqq4uXoQAhaxs8UUaU= +k8s.io/mount-utils v0.30.6 h1:vq6MvNgYmFsXVeiBbeZEQa5O3CEh6thkYzxPB5Ub6K0= +k8s.io/mount-utils v0.30.6/go.mod h1:9sCVmwGLcV1MPvbZ+rToMDnl1QcGozy+jBPd0MsQLIo= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= diff --git a/hack/tool/go.mod b/hack/tool/go.mod index b01276d05ad0..7ad7f940cba4 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -90,8 +90,8 @@ require ( golang.org/x/tools v0.20.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.30.4 // indirect - k8s.io/client-go v0.30.4 // indirect + k8s.io/apimachinery v0.30.6 // indirect + k8s.io/client-go v0.30.6 // indirect k8s.io/klog/v2 v2.120.1 // indirect k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index 02a180736084..e98fc7770b51 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -330,12 +330,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.30.4 h1:XASIELmW8w8q0i1Y4124LqPoWMycLjyQti/fdYHYjCs= -k8s.io/api v0.30.4/go.mod h1:ZqniWRKu7WIeLijbbzetF4U9qZ03cg5IRwl8YVs8mX0= -k8s.io/apimachinery v0.30.4 h1:5QHQI2tInzr8LsT4kU/2+fSeibH1eIHswNx480cqIoY= -k8s.io/apimachinery v0.30.4/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/client-go v0.30.4 h1:eculUe+HPQoPbixfwmaSZGsKcOf7D288tH6hDAdd+wY= -k8s.io/client-go v0.30.4/go.mod h1:IBS0R/Mt0LHkNHF4E6n+SUDPG7+m2po6RZU7YHeOpzc= +k8s.io/api v0.30.6 h1:uqRDLnFkmPLorI9D0x1dGXdYeRQMhQHlrHDgZ3/45RE= +k8s.io/api v0.30.6/go.mod h1:6x759Hj7155pXRKStxzM7TMN9hW0x7WrBr51kuDMSHo= +k8s.io/apimachinery v0.30.6 h1:dlplzGrUL/DiPOVVVjDcT9ZoQBOwYeB6hcFy90veggs= +k8s.io/apimachinery v0.30.6/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/client-go v0.30.6 h1:hMo7AUkHy/UqnwPMH+oJvFR9gpvXVfQnsiO+G2fdE30= +k8s.io/client-go v0.30.6/go.mod h1:DDN89/30A1DfatO+c3ksYMM12kL7a/CZvsBaVjwh33g= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index 086cc518154f..1a96e91213ac 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.30.5+k0s.0" + version: "1.30.6+k0s.0" ``` To deploy a k0s cluster on the AWS machine, run: @@ -98,9 +98,9 @@ INFO ==> Running phase: Gather host facts . . . -INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.5+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.5+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.5+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.6+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.6+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.30.6+k0s.0 INFO ==> Running phase: Configure k0s WARN [ssh] 63.32.21.232:22: generating default configuration INFO [ssh] 63.32.21.232:22: validating configuration @@ -124,7 +124,7 @@ INFO [ssh] 3.250.52.147:22: waiting for node to become ready INFO ==> Running phase: Release exclusive host lock INFO ==> Running phase: Disconnect from hosts INFO ==> Finished in 1m42s -INFO k0s cluster version v1.30.5+k0s.0 is now installed +INFO k0s cluster version v1.30.6+k0s.0 is now installed INFO Tip: To access the cluster you can now fetch the admin kubeconfig using: INFO k0sctl kubeconfig ``` @@ -152,7 +152,7 @@ Example Output: /home/ubuntu/k0s/inttest/bin/sonobuoy run --wait=1200 \ --mode=certified-conformance \ --plugin-env=e2e.E2E_EXTRA_ARGS="--ginkgo.v" \ - --kubernetes-version=v1.30.5 + --kubernetes-version=v1.30.6 INFO[0000] create request issued name=sonobuoy namespace= resource=namespaces INFO[0000] create request issued name=sonobuoy-serviceaccount namespace=sonobuoy resource=serviceaccounts INFO[0000] create request issued name=sonobuoy-serviceaccount-sonobuoy namespace= resource=clusterrolebindings diff --git a/inttest/update-server/html/unstable/index.yaml b/inttest/update-server/html/unstable/index.yaml index 9df1b9df66b7..05cb362a26a1 100644 --- a/inttest/update-server/html/unstable/index.yaml +++ b/inttest/update-server/html/unstable/index.yaml @@ -1,5 +1,5 @@ name: unstable -version: v1.30.5+k0s.0 +version: v1.30.6+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 diff --git a/pkg/apis/k0s/v1beta1/kubeproxy.go b/pkg/apis/k0s/v1beta1/kubeproxy.go index ddc4b98b6c48..87a15e843680 100644 --- a/pkg/apis/k0s/v1beta1/kubeproxy.go +++ b/pkg/apis/k0s/v1beta1/kubeproxy.go @@ -41,7 +41,7 @@ type KubeProxy struct { } // KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.4/config/v1alpha1/types.go#L27-L48 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.6/config/v1alpha1/types.go#L27-L48 type KubeProxyIPTablesConfiguration struct { MasqueradeBit *int32 `json:"masqueradeBit,omitempty"` MasqueradeAll bool `json:"masqueradeAll,omitempty"` @@ -51,7 +51,7 @@ type KubeProxyIPTablesConfiguration struct { } // KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.4/config/v1alpha1/types.go#L52-L78 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.30.6/config/v1alpha1/types.go#L52-L78 type KubeProxyIPVSConfiguration struct { SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"` MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"` diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go index e4011893ea69..ecd83f179817 100644 --- a/pkg/constant/constant.go +++ b/pkg/constant/constant.go @@ -86,7 +86,7 @@ const ( KubePauseContainerImage = "registry.k8s.io/pause" KubePauseContainerImageVersion = "3.9" KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.30.5" + KubeProxyImageVersion = "v1.30.6" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.11.3" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless" diff --git a/static/_crds/v1beta1/k0s.k0sproject.io_clusterconfigs.yaml b/static/_crds/v1beta1/k0s.k0sproject.io_clusterconfigs.yaml index c81765a2f728..a04b75c90251 100644 --- a/static/_crds/v1beta1/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/_crds/v1beta1/k0s.k0sproject.io_clusterconfigs.yaml @@ -547,7 +547,7 @@ spec: iptables: description: |- KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.30.4/config/v1alpha1/types.go#L27-L48 + @see https://github.com/kubernetes/kube-proxy/blob/v0.30.6/config/v1alpha1/types.go#L27-L48 properties: localhostNodePorts: type: boolean @@ -564,7 +564,7 @@ spec: ipvs: description: |- KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.30.4/config/v1alpha1/types.go#L52-L78 + @see https://github.com/kubernetes/kube-proxy/blob/v0.30.6/config/v1alpha1/types.go#L52-L78 properties: excludeCIDRs: items: