diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index 36079158c5ec..247062c0b3ae 100644 --- a/.github/workflows/publish-docs-manual.yml +++ b/.github/workflows/publish-docs-manual.yml @@ -3,7 +3,7 @@ on: workflow_dispatch: inputs: version: - description: 'Version tag (e.g."v1.29.9+k0s.0")' + description: 'Version tag (e.g."v1.29.10+k0s.0")' required: true env: diff --git a/docs/nllb.md b/docs/nllb.md index fe00482aa31a..d61e9fe4a696 100644 --- a/docs/nllb.md +++ b/docs/nllb.md @@ -251,7 +251,7 @@ listed, too: ```console $ kubectl get nodes -owide -NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME +NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME k0s-worker-0 Ready 2m16s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.22 k0s-worker-1 Ready 2m15s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.22 ``` @@ -297,7 +297,7 @@ k0s-controller-1 $ sed -i s#https://10\\.81\\.146\\.254:6443#https://10.81.146.184:6443#g k0s-kubeconfig $ kubectl get nodes -owide -NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME +NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME k0s-worker-0 Ready 3m35s v{{{ extra.k8s_version }}}+k0s 10.81.146.198 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.22 k0s-worker-1 Ready 3m34s v{{{ extra.k8s_version }}}+k0s 10.81.146.51 Alpine Linux v3.17 5.15.83-0-virt containerd://1.7.22 diff --git a/docs/raspberry-pi4.md b/docs/raspberry-pi4.md index 9081fe30986c..9a44b60786bf 100644 --- a/docs/raspberry-pi4.md +++ b/docs/raspberry-pi4.md @@ -293,7 +293,7 @@ When the cluster is up, try to have a look: ```console ubuntu@ubuntu:~$ sudo k0s kc get nodes -owide -NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME +NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME ubuntu Ready control-plane 4m41s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.22 ubuntu@ubuntu:~$ sudo k0s kc get pod -owide -A NAMESPACE NAME READY STATUS RESTARTS AGE IP NODE NOMINATED NODE READINESS GATES @@ -502,7 +502,7 @@ Using the above kubeconfig, you can now access and use the cluster: ```console ubuntu@ubuntu:~$ KUBECONFIG=/path/to/kubeconfig kubectl get nodes,deployments,pods -owide -A -NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME +NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME node/ubuntu Ready 5m1s v{{{ extra.k8s_version }}}+k0s 10.152.56.54 Ubuntu 22.04.1 LTS 5.15.0-1013-raspi containerd://1.7.22 NAMESPACE NAME READY UP-TO-DATE AVAILABLE AGE CONTAINERS IMAGES SELECTOR diff --git a/docs/runtime.md b/docs/runtime.md index db0c2a89c9dd..788768bd4d93 100644 --- a/docs/runtime.md +++ b/docs/runtime.md @@ -269,7 +269,7 @@ The successful configuration can be verified by executing the following command: ```console $ kubectl get nodes -o wide -NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME +NAME STATUS ROLES AGE VERSION INTERNAL-IP EXTERNAL-IP OS-IMAGE KERNEL-VERSION CONTAINER-RUNTIME docker-worker-0 Ready 15m v{{{ extra.k8s_version }}}+k0s 172.27.77.155 Ubuntu 22.04.3 LTS 5.15.0-82-generic docker://24.0.7 ``` diff --git a/docs/worker-node-config.md b/docs/worker-node-config.md index b1a0416ec6e4..ec78d985f94a 100644 --- a/docs/worker-node-config.md +++ b/docs/worker-node-config.md @@ -14,7 +14,7 @@ kubectl get node --show-labels ```shell NAME STATUS ROLES AGE VERSION LABELS -worker0 NotReady 10s v{{{ extra.k8s_version }}}+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,k0sproject.io/foo=bar,k0sproject.io/other=xyz,kubernetes.io/arch=amd64,kubernetes.io/hostname=worker0,kubernetes.io/os=linux +worker0 NotReady 10s v{{{ extra.k8s_version }}}+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,k0sproject.io/foo=bar,k0sproject.io/other=xyz,kubernetes.io/arch=amd64,kubernetes.io/hostname=worker0,kubernetes.io/os=linux ``` Controller worker nodes are assigned `node.k0sproject.io/role=control-plane` and `node-role.kubernetes.io/control-plane=true` labels: @@ -25,7 +25,7 @@ kubectl get node --show-labels ```shell NAME STATUS ROLES AGE VERSION LABELS -controller0 NotReady control-plane 10s v{{{ extra.k8s_version }}}+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,kubernetes.io/hostname=worker0,kubernetes.io/os=linux,node.k0sproject.io/role=control-plane,node-role.kubernetes.io/control-plane=true +controller0 NotReady control-plane 10s v{{{ extra.k8s_version }}}+k0s beta.kubernetes.io/arch=amd64,beta.kubernetes.io/os=linux,kubernetes.io/hostname=worker0,kubernetes.io/os=linux,node.k0sproject.io/role=control-plane,node-role.kubernetes.io/control-plane=true ``` **Note:** Setting the labels is only effective on the first registration of the node. Changing the labels thereafter has no effect. diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 5c87dabfa346..d88f1dfe6921 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.29.9 +kubernetes_version = 1.29.10 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 d1d5d7ad0669..1d3b6c657ed4 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.29.9/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.10/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 8047fcbd93e3..2e78c13641f9 100644 --- a/go.mod +++ b/go.mod @@ -66,20 +66,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.29.9 - k8s.io/apiextensions-apiserver v0.29.9 - k8s.io/apimachinery v0.29.9 - k8s.io/cli-runtime v0.29.9 - k8s.io/client-go v0.29.9 - k8s.io/cloud-provider v0.29.9 - k8s.io/component-base v0.29.9 - k8s.io/component-helpers v0.29.9 - k8s.io/cri-api v0.29.9 - k8s.io/kube-aggregator v0.29.9 - k8s.io/kubectl v0.29.9 - k8s.io/kubelet v0.29.9 - k8s.io/kubernetes v1.29.9 - k8s.io/mount-utils v0.29.9 + k8s.io/api v0.29.10 + k8s.io/apiextensions-apiserver v0.29.10 + k8s.io/apimachinery v0.29.10 + k8s.io/cli-runtime v0.29.10 + k8s.io/client-go v0.29.10 + k8s.io/cloud-provider v0.29.10 + k8s.io/component-base v0.29.10 + k8s.io/component-helpers v0.29.10 + k8s.io/cri-api v0.29.10 + k8s.io/kube-aggregator v0.29.10 + k8s.io/kubectl v0.29.10 + k8s.io/kubelet v0.29.10 + k8s.io/kubernetes v1.29.10 + k8s.io/mount-utils v0.29.10 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/controller-runtime v0.17.0 sigs.k8s.io/yaml v1.4.0 @@ -276,12 +276,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.29.9 // indirect - k8s.io/controller-manager v0.29.9 // indirect + k8s.io/apiserver v0.29.10 // indirect + k8s.io/controller-manager v0.29.10 // indirect k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kms v0.29.9 // indirect + k8s.io/kms v0.29.10 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/metrics v0.29.9 // indirect + k8s.io/metrics v0.29.10 // indirect oras.land/oras-go v1.2.4 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -293,35 +293,35 @@ require ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.29.9/go.mod#L251-L282 - k8s.io/api => k8s.io/api v0.29.9 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.9 - k8s.io/apimachinery => k8s.io/apimachinery v0.29.9 - k8s.io/apiserver => k8s.io/apiserver v0.29.9 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.9 - k8s.io/client-go => k8s.io/client-go v0.29.9 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.9 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.9 - k8s.io/code-generator => k8s.io/code-generator v0.29.9 - k8s.io/component-base => k8s.io/component-base v0.29.9 - k8s.io/component-helpers => k8s.io/component-helpers v0.29.9 - k8s.io/controller-manager => k8s.io/controller-manager v0.29.9 - k8s.io/cri-api => k8s.io/cri-api v0.29.9 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.9 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.9 - k8s.io/endpointslice => k8s.io/endpointslice v0.29.9 - k8s.io/kms => k8s.io/kms v0.29.9 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.9 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.9 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.9 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.9 - k8s.io/kubectl => k8s.io/kubectl v0.29.9 - k8s.io/kubelet => k8s.io/kubelet v0.29.9 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.9 - k8s.io/metrics => k8s.io/metrics v0.29.9 - k8s.io/mount-utils => k8s.io/mount-utils v0.29.9 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.9 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.9 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.9 - k8s.io/sample-controller => k8s.io/sample-controller v0.29.9 + // https://github.com/kubernetes/kubernetes/blob/v1.29.10/go.mod#L251-L282 + k8s.io/api => k8s.io/api v0.29.10 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.10 + k8s.io/apimachinery => k8s.io/apimachinery v0.29.10 + k8s.io/apiserver => k8s.io/apiserver v0.29.10 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.10 + k8s.io/client-go => k8s.io/client-go v0.29.10 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.10 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.10 + k8s.io/code-generator => k8s.io/code-generator v0.29.10 + k8s.io/component-base => k8s.io/component-base v0.29.10 + k8s.io/component-helpers => k8s.io/component-helpers v0.29.10 + k8s.io/controller-manager => k8s.io/controller-manager v0.29.10 + k8s.io/cri-api => k8s.io/cri-api v0.29.10 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.10 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.10 + k8s.io/endpointslice => k8s.io/endpointslice v0.29.10 + k8s.io/kms => k8s.io/kms v0.29.10 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.10 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.10 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.10 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.10 + k8s.io/kubectl => k8s.io/kubectl v0.29.10 + k8s.io/kubelet => k8s.io/kubelet v0.29.10 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.10 + k8s.io/metrics => k8s.io/metrics v0.29.10 + k8s.io/mount-utils => k8s.io/mount-utils v0.29.10 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.10 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.10 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.10 + k8s.io/sample-controller => k8s.io/sample-controller v0.29.10 ) diff --git a/go.sum b/go.sum index 58caefcb4839..177ba06e1d80 100644 --- a/go.sum +++ b/go.sum @@ -922,46 +922,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.29.9 h1:FwdflpNsfMUYUOblMZNWJ4K/q0OSL5A4jGa0iOgcJco= -k8s.io/api v0.29.9/go.mod h1:fNhmzRfKaSEHCmczA/jRx6CiDKhYOnFLJBERMJAXEk8= -k8s.io/apiextensions-apiserver v0.29.9 h1:EB6RK06kFJjbzBwU1YiVznxrcgBE0hhDWt6EQQIcOy4= -k8s.io/apiextensions-apiserver v0.29.9/go.mod h1:jcaHG6R/bB1iU6XzC1DMhB1x2ktTJLt2KKpg6B65Z2c= -k8s.io/apimachinery v0.29.9 h1:YZ8HUid1TzQVz94cnNlsQjLdH0VoAhWSqz7t0q6B12A= -k8s.io/apimachinery v0.29.9/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= -k8s.io/apiserver v0.29.9 h1:BiHTZbAYcNYHTE9RlWMBe5AX2XoZbRujy6oo5krU4V8= -k8s.io/apiserver v0.29.9/go.mod h1:3zmBeYworciVZHs8jSfzt/naTpDQb3AM++aYJ5Pkqqo= -k8s.io/cli-runtime v0.29.9 h1:rryHH2SZtZePv0gj9RM5ftXYcK8v2jbMLOzbORnzzw4= -k8s.io/cli-runtime v0.29.9/go.mod h1:IHgU0jdyAOcrfkpvaDXZRqPe+RJYlUgbufl88Z6EUyo= -k8s.io/client-go v0.29.9 h1:4f/Wz6li3rEyIPFj32XAQMtOGMM1tg7KQi1oeS6ibPg= -k8s.io/client-go v0.29.9/go.mod h1:2N1drQEZ5yiYrWVaE2Un8JiISUhl47D8pyZlYLszke4= -k8s.io/cloud-provider v0.29.9 h1:sbu1is+Hq6/l7SlgBdy6Vc9fEtQysLBPTu3qgmPXU44= -k8s.io/cloud-provider v0.29.9/go.mod h1:fTOTtMu+SMa9oTeAsPtkliICKp2t/4a0DEXeOwrrhnc= -k8s.io/component-base v0.29.9 h1:lPENvp3CCwdeMEWGjiTfn5b287qQYuK7gX32OBOovmA= -k8s.io/component-base v0.29.9/go.mod h1:NGDa6Ih0EdcLA2G4K2ZYySoiB+2Tn+rmSqPyudCPgDY= -k8s.io/component-helpers v0.29.9 h1:+3dLb8nHWPeNwrL6whkpvKv46o90EW5O6Aju/hLQW70= -k8s.io/component-helpers v0.29.9/go.mod h1:sUtoToDUdZDku0Kj4i3dRWyb1jmZLxXO2cvWvD27A40= -k8s.io/controller-manager v0.29.9 h1:hKGqtTf7IDmN5csLVgf6VUXPJqosajAnMsqw2jCDh6s= -k8s.io/controller-manager v0.29.9/go.mod h1:OZVIb2E9QFoSaiaVt4DFOsH/kZpCaEgFSYr/mCF9zuk= -k8s.io/cri-api v0.29.9 h1:U1YH8RepiYgrbMGMuiopEaEbILdfxO6L92A6b19ZdOc= -k8s.io/cri-api v0.29.9/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE= +k8s.io/api v0.29.10 h1:Fao3HOxccbGRC1HZtXD+Y41xJhP0tEToVo5W7EEUBm0= +k8s.io/api v0.29.10/go.mod h1:rF0sRh64w1hMNAVGh4YYniSxODyHye3GLmymAbWBDvY= +k8s.io/apiextensions-apiserver v0.29.10 h1:2k2AHrWgs4S+07HrOjEdcyrQ/UqYlvBi6uon1fox1KE= +k8s.io/apiextensions-apiserver v0.29.10/go.mod h1:3rrJC52bW5frHf10N3JvaDpl++hgrzD9Gs6IZpKWMoc= +k8s.io/apimachinery v0.29.10 h1:57OLNqOJUgp5KlRRY3JOBFOTTa5Rt/LVkmKiiN2cvaQ= +k8s.io/apimachinery v0.29.10/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/apiserver v0.29.10 h1:dQwLNBG0qcNVbw72poZ3R+mvdi3RdtEX9x1nZX3RxGs= +k8s.io/apiserver v0.29.10/go.mod h1:UkJz90cVDZF/iZ19FEUEMWHI04EgoQiakMGD0x9urDY= +k8s.io/cli-runtime v0.29.10 h1:iX8bo6jmxvmoq046YX/Ry+s3Vc21sfxmYzjKLfEaP6M= +k8s.io/cli-runtime v0.29.10/go.mod h1:sGE4CX6FM600SEX8h/tPS0WGFYkTH+W5oU9eyp5Xtpc= +k8s.io/client-go v0.29.10 h1:hPmG1pmKslRhmCIzVd90sA58B0sJwNwduNgXFWsFqhI= +k8s.io/client-go v0.29.10/go.mod h1:gnMCQiRXGL9K0VtlW8gTkhzptGrHm2BJ4qBbujNemc4= +k8s.io/cloud-provider v0.29.10 h1:rAXSf6uaHWGiMle1eNL35uM/h4eLqzseUvn81rW47FI= +k8s.io/cloud-provider v0.29.10/go.mod h1:vbYmPvv+uBLEWaMdfdE1k3KFbGNKHvPFa+CZlfzKBHI= +k8s.io/component-base v0.29.10 h1:YQrQ/bpzGPGqIPEPaBzxjH0/1DJOI+yZPZNbbz7ZCBY= +k8s.io/component-base v0.29.10/go.mod h1:IbwsBob2DnYiAONsSHIuYenchqcDycbHSLHrXshuLgM= +k8s.io/component-helpers v0.29.10 h1:ND2o9OElB42N4bt77REMiiOdNQ1P6RJc/jIXgyPjfJw= +k8s.io/component-helpers v0.29.10/go.mod h1:erz34qUpzyNInTRehZaNqxYStgDcEh2ojpQcV+pLX9c= +k8s.io/controller-manager v0.29.10 h1:jTnEWQy+hGhBEVKZwzkz0hU9siELxrJqqtlQZ6fNJrg= +k8s.io/controller-manager v0.29.10/go.mod h1:GqaaXz9gOCs2etFklP9CNHsWDw6/UvyKqduFEQq8cRk= +k8s.io/cri-api v0.29.10 h1:V4j8CqdHDF8/ygFIswJd3c/13fKQxKVyGGkSc6Rpe1c= +k8s.io/cri-api v0.29.10/go.mod h1:A6pdbjzML2xi9B0Clqn5qt1HJ3Ik12x2j+jv/TkqjRE= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kms v0.29.9 h1:7B9VGhFAzNfBmfXeQ0Xi+OzIcNPw/xazPnLm/J3vNT4= -k8s.io/kms v0.29.9/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk= -k8s.io/kube-aggregator v0.29.9 h1:HM1dSymp1Io9d9hNdr3skGJvZnRPQqEU7sRpxOqmBuc= -k8s.io/kube-aggregator v0.29.9/go.mod h1:6g6HoCqjGk7F7fgjmkkHiByz3wm2G6Voyxo5B13377c= +k8s.io/kms v0.29.10 h1:LAck4rZrOIjLrSE1yhMLJM8H91QkfpWzCQyeTxdHKSk= +k8s.io/kms v0.29.10/go.mod h1:vWVImKkJd+1BQY4tBwdfSwjQBiLrnbNtHADcDEDQFtk= +k8s.io/kube-aggregator v0.29.10 h1:BP0i2k+QkXDq+MJXOjAQ7UoFErElN64indkJdZ2M8xg= +k8s.io/kube-aggregator v0.29.10/go.mod h1:2/fpQ2Ro5bLlx0SGvNEMXxb6DwP+h43mhtY8zQkrPxs= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubectl v0.29.9 h1:8DJIPkRk5a6WonxRAbicJIn0DNwacOxaLxO4EDwf/hc= -k8s.io/kubectl v0.29.9/go.mod h1:ylJbHUuPTYiwxAKx97nAyU3TKh3vHlEW+Pp44Usolvw= -k8s.io/kubelet v0.29.9 h1:Qbnz4otarQi5E8Z80Y3Y8AY5wfyc6WQjUQ6hU302gPQ= -k8s.io/kubelet v0.29.9/go.mod h1:jOTCkSUkzTu6t5SvxcSDAg3n4bZy3+mCOe87WJ3NS58= -k8s.io/kubernetes v1.29.9 h1:RF5IQgliwV4fLNMH2ca9CPXGcmbLPq3olc3OBrbf7/M= -k8s.io/kubernetes v1.29.9/go.mod h1:28sDhcb87LX5z3GWAKYmLrhrifxi4W9bEWua4DRTIvk= -k8s.io/metrics v0.29.9 h1:0Rglc03f5u4/wHliG8cfhLOtSbTwL03WQ37CMn9c4OI= -k8s.io/metrics v0.29.9/go.mod h1:1DixHaqPn7puV31YlEKT/kAEP+31cpOShIPiRtro5no= -k8s.io/mount-utils v0.29.9 h1:q3lNnDO98L7PW6d2X/YtXTGV2iaMiQyEVR8JzuRknfk= -k8s.io/mount-utils v0.29.9/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0= +k8s.io/kubectl v0.29.10 h1:9LLAI52kRG98Kicn+JUPY3ZVg8MPcJVsHPoaMM//9cA= +k8s.io/kubectl v0.29.10/go.mod h1:HxsflBafbaRcMyQjiD6elLHr+erlGmnQgLzSDYjEth0= +k8s.io/kubelet v0.29.10 h1:QXtGDKUcpyYaBUUzrS+SahRcDE6J1U9JOxFhWbghP0w= +k8s.io/kubelet v0.29.10/go.mod h1:m2N6EtD5QmVCUmFIOL0l8LYOlcH+iZkQglmulqYg1dk= +k8s.io/kubernetes v1.29.10 h1:vlze77k0CbdevTbgliyxpSjfI3bvOUhPEJVSJAEUl5Q= +k8s.io/kubernetes v1.29.10/go.mod h1:L6/pfKQZ6Tv2O8gyT4OxhGZp+nNsjV54xtNodRoup9k= +k8s.io/metrics v0.29.10 h1:1HrqU+FzD2PaVpgDOmrEqX31t7KtZB5TAlPrsJLgH6I= +k8s.io/metrics v0.29.10/go.mod h1:N+6qNL56EeuhyuTj29iClimxtaFDg1wAMcCte1nVFL4= +k8s.io/mount-utils v0.29.10 h1:zzFHsi6//I6kmFNng6E2fXOW/TFdyoBVFO8IEgpsdb8= +k8s.io/mount-utils v0.29.10/go.mod h1:SHUMR9n3b6tLgEmlyT36cL6fV6Sjwa5CJhc0guCXvb0= 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 80962eec845c..db5998d05326 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -92,8 +92,8 @@ require ( google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.29.9 // indirect - k8s.io/client-go v0.29.9 // indirect + k8s.io/apimachinery v0.29.10 // indirect + k8s.io/client-go v0.29.10 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index d4827f45e3df..b1f60f1e47df 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -338,12 +338,12 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0/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.29.8 h1:ZBKg9clWnIGtQ5yGhNwMw2zyyrsIAQaXhZACcYNflQE= -k8s.io/api v0.29.8/go.mod h1:XlGIpmpzKGrtVca7GlgNryZJ19SvQdI808NN7fy1SgQ= -k8s.io/apimachinery v0.29.8 h1:uBHc9WuKiTHClIspJqtR84WNpG0aOGn45HWqxgXkk8Y= -k8s.io/apimachinery v0.29.8/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= -k8s.io/client-go v0.29.8 h1:QMRKcIzqE/qawknXcsi51GdIAYN8UP39S/M5KnFu/J0= -k8s.io/client-go v0.29.8/go.mod h1:ZzrAAVrqO2jVXMb8My/jTke8n0a/mIynnA3y/1y1UB0= +k8s.io/api v0.29.10 h1:Fao3HOxccbGRC1HZtXD+Y41xJhP0tEToVo5W7EEUBm0= +k8s.io/api v0.29.10/go.mod h1:rF0sRh64w1hMNAVGh4YYniSxODyHye3GLmymAbWBDvY= +k8s.io/apimachinery v0.29.10 h1:57OLNqOJUgp5KlRRY3JOBFOTTa5Rt/LVkmKiiN2cvaQ= +k8s.io/apimachinery v0.29.10/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y= +k8s.io/client-go v0.29.10 h1:hPmG1pmKslRhmCIzVd90sA58B0sJwNwduNgXFWsFqhI= +k8s.io/client-go v0.29.10/go.mod h1:gnMCQiRXGL9K0VtlW8gTkhzptGrHm2BJ4qBbujNemc4= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index d4f6c6d60bf8..7441f1f4619e 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.29.9+k0s.0" + version: "1.29.10+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.29.9+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.9+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.9+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.10+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.10+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.10+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.29.9+k0s.0 is now installed +INFO k0s cluster version v1.29.10+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.29.9 + --kubernetes-version=v1.29.10 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 9608e608bb68..fef82d7cc8fa 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.29.9+k0s.0 +version: v1.29.10+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 d316e80c2f0a..e0203b37777e 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.29.9/config/v1alpha1/types.go#L27-L48 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/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.29.9/config/v1alpha1/types.go#L52-L78 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/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_shared.go b/pkg/constant/constant_shared.go index 6634e773a4a1..278f196b54a7 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -78,7 +78,7 @@ const ( MetricsImage = "registry.k8s.io/metrics-server/metrics-server" MetricsImageVersion = "v0.7.2" KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.29.9" + KubeProxyImageVersion = "v1.29.10" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.11.3" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless" diff --git a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml index 32e83c9f4e87..3f3589e5d16a 100644 --- a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml @@ -398,7 +398,7 @@ spec: iptables: description: |- KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.29.9/config/v1alpha1/types.go#L27-L48 + @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/config/v1alpha1/types.go#L27-L48 properties: localhostNodePorts: type: boolean @@ -415,7 +415,7 @@ spec: ipvs: description: |- KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.29.9/config/v1alpha1/types.go#L52-L78 + @see https://github.com/kubernetes/kube-proxy/blob/v0.29.10/config/v1alpha1/types.go#L52-L78 properties: excludeCIDRs: items: