diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index 0965809aaf01..f784550db9d9 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.32.1+k0s.0")' + description: 'Version tag (e.g."v1.32.2+k0s.0")' required: true env: diff --git a/Makefile b/Makefile index 67ad7b30a5bd..7c647765340b 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ $(controller_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt ha # Usually register-gen should should be: # k8s.io/code-generator/cmd/register-gen@v$(kubernetes_version:1.%=0.%) # However, due to https://github.com/kubernetes/kubernetes/issues/129290 in 1.32.1 we -# need to hardcode it to 0.31.5 instead of the appropriate 0.32.1. +# need to hardcode it to 0.31.5 instead of the appropriate 0.32.2. register_gen_targets := $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/zz_generated.register.go) codegen_targets += $(register_gen_targets) $(register_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt embedded-bins/Makefile.variables diff --git a/cncf/GTR.md b/cncf/GTR.md index 53a322efd207..f04486a0e077 100644 --- a/cncf/GTR.md +++ b/cncf/GTR.md @@ -329,17 +329,17 @@ k0s project follows closely the upstream Kubernetes release cycle. The only diff The k0s version string consists of the Kubernetes version and the k0s version. For example: ```text -v1.32.1+k0s.0 +v1.32.2+k0s.0 ``` -The Kubernetes version (1.32.1) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version. +The Kubernetes version (1.32.2) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version. ## Installation Here’s an example of how to set a single node cluster: ```console -# export K0S_VERSION=v1.32.1+k0s.0 +# export K0S_VERSION=v1.32.2+k0s.0 # curl -sSfL https://github.com/k0sproject/k0s/releases/download/$K0S_VERSION/k0s-$K0S_VERSION-amd64 -o k0s # chmod u+x k0s # ./k0s install controller --single && ./k0s start diff --git a/cncf/security-self-assessment.md b/cncf/security-self-assessment.md index 6f592049d042..3c4b993b595c 100644 --- a/cncf/security-self-assessment.md +++ b/cncf/security-self-assessment.md @@ -9,7 +9,7 @@ This document serves as the k0s project [CNCF security self-assessment](https:// | Software | https://github.com/k0sproject/k0s | | Security Provider | No | | Languages | Golang | -| SBOM | [https://github.com/k0sproject/k0s/releases/download/v1.32.1%2Bk0s.0/spdx.json](https://github.com/k0sproject/k0s/releases/download/v1.32.1%2Bk0s.0/spdx.json) | +| SBOM | [https://github.com/k0sproject/k0s/releases/download/v1.32.2%2Bk0s.0/spdx.json](https://github.com/k0sproject/k0s/releases/download/v1.32.2%2Bk0s.0/spdx.json) | ## Security links diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index bcfc36a42d2f..665fef989463 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.32.1 +kubernetes_version = 1.32.2 helm_version = 3.11.1 kubernetes_buildimage = $(golang_buildimage) kubernetes_build_go_tags = "providerless" diff --git a/go.mod b/go.mod index 136773f4ffd4..4213ce6973fa 100644 --- a/go.mod +++ b/go.mod @@ -63,21 +63,21 @@ require ( // Kubernetes require ( - k8s.io/api v0.32.1 - k8s.io/apiextensions-apiserver v0.32.1 - k8s.io/apimachinery v0.32.1 - k8s.io/cli-runtime v0.32.1 - k8s.io/client-go v0.32.1 - k8s.io/cloud-provider v0.32.1 - k8s.io/cluster-bootstrap v0.32.1 - k8s.io/component-base v0.32.1 - k8s.io/component-helpers v0.32.1 - k8s.io/cri-api v0.32.1 - k8s.io/kube-aggregator v0.32.1 - k8s.io/kubectl v0.32.1 - k8s.io/kubelet v0.32.1 - k8s.io/kubernetes v1.32.1 - k8s.io/mount-utils v0.32.1 + k8s.io/api v0.32.2 + k8s.io/apiextensions-apiserver v0.32.2 + k8s.io/apimachinery v0.32.2 + k8s.io/cli-runtime v0.32.2 + k8s.io/client-go v0.32.2 + k8s.io/cloud-provider v0.32.2 + k8s.io/cluster-bootstrap v0.32.2 + k8s.io/component-base v0.32.2 + k8s.io/component-helpers v0.32.2 + k8s.io/cri-api v0.32.2 + k8s.io/kube-aggregator v0.32.2 + k8s.io/kubectl v0.32.2 + k8s.io/kubelet v0.32.2 + k8s.io/kubernetes v1.32.2 + k8s.io/mount-utils v0.32.2 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 sigs.k8s.io/controller-runtime v0.20.2 sigs.k8s.io/yaml v1.4.0 @@ -270,12 +270,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.32.1 // indirect - k8s.io/controller-manager v0.32.1 // indirect + k8s.io/apiserver v0.32.2 // indirect + k8s.io/controller-manager v0.32.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kms v0.32.1 // indirect + k8s.io/kms v0.32.2 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect - k8s.io/metrics v0.32.1 // indirect + k8s.io/metrics v0.32.2 // indirect oras.land/oras-go v1.2.5 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect @@ -287,35 +287,35 @@ require ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.32.1/go.mod#L225-L257 - k8s.io/api => k8s.io/api v0.32.1 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1 - k8s.io/apimachinery => k8s.io/apimachinery v0.32.1 - k8s.io/apiserver => k8s.io/apiserver v0.32.1 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1 - k8s.io/client-go => k8s.io/client-go v0.32.1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1 - k8s.io/code-generator => k8s.io/code-generator v0.32.1 - k8s.io/component-base => k8s.io/component-base v0.32.1 - k8s.io/component-helpers => k8s.io/component-helpers v0.32.1 - k8s.io/controller-manager => k8s.io/controller-manager v0.32.1 - k8s.io/cri-api => k8s.io/cri-api v0.32.1 - k8s.io/cri-client => k8s.io/cri-client v0.32.1 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.1 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.1 - k8s.io/endpointslice => k8s.io/endpointslice v0.32.1 - k8s.io/kms => k8s.io/kms v0.32.1 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.1 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.1 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.1 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.1 - k8s.io/kubectl => k8s.io/kubectl v0.32.1 - k8s.io/kubelet => k8s.io/kubelet v0.32.1 - k8s.io/metrics => k8s.io/metrics v0.32.1 - k8s.io/mount-utils => k8s.io/mount-utils v0.32.1 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.1 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.1 - k8s.io/sample-controller => k8s.io/sample-controller v0.32.1 + // https://github.com/kubernetes/kubernetes/blob/v1.32.2/go.mod#L225-L257 + k8s.io/api => k8s.io/api v0.32.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.32.2 + k8s.io/apiserver => k8s.io/apiserver v0.32.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2 + k8s.io/client-go => k8s.io/client-go v0.32.2 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.2 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.2 + k8s.io/code-generator => k8s.io/code-generator v0.32.2 + k8s.io/component-base => k8s.io/component-base v0.32.2 + k8s.io/component-helpers => k8s.io/component-helpers v0.32.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.32.2 + k8s.io/cri-api => k8s.io/cri-api v0.32.2 + k8s.io/cri-client => k8s.io/cri-client v0.32.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.32.2 + k8s.io/endpointslice => k8s.io/endpointslice v0.32.2 + k8s.io/kms => k8s.io/kms v0.32.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.2 + k8s.io/kubectl => k8s.io/kubectl v0.32.2 + k8s.io/kubelet => k8s.io/kubelet v0.32.2 + k8s.io/metrics => k8s.io/metrics v0.32.2 + k8s.io/mount-utils => k8s.io/mount-utils v0.32.2 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.2 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.2 + k8s.io/sample-controller => k8s.io/sample-controller v0.32.2 ) diff --git a/go.sum b/go.sum index 6e1cc0efb8ff..63726fa2446f 100644 --- a/go.sum +++ b/go.sum @@ -824,48 +824,48 @@ helm.sh/helm/v3 v3.17.1 h1:gzVoAD+qVuoJU6KDMSAeo0xRJ6N1znRxz3wyuXRmJDk= helm.sh/helm/v3 v3.17.1/go.mod h1:nvreuhuR+j78NkQcLC3TYoprCKStLyw5P4T7E5itv2w= 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.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= -k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= -k8s.io/apiextensions-apiserver v0.32.1 h1:hjkALhRUeCariC8DiVmb5jj0VjIc1N0DREP32+6UXZw= -k8s.io/apiextensions-apiserver v0.32.1/go.mod h1:sxWIGuGiYov7Io1fAS2X06NjMIk5CbRHc2StSmbaQto= -k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= -k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.1 h1:oo0OozRos66WFq87Zc5tclUX2r0mymoVHRq8JmR7Aak= -k8s.io/apiserver v0.32.1/go.mod h1:UcB9tWjBY7aryeI5zAgzVJB/6k7E97bkr1RgqDz0jPw= -k8s.io/cli-runtime v0.32.1 h1:19nwZPlYGJPUDbhAxDIS2/oydCikvKMHsxroKNGA2mM= -k8s.io/cli-runtime v0.32.1/go.mod h1:NJPbeadVFnV2E7B7vF+FvU09mpwYlZCu8PqjzfuOnkY= -k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU= -k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg= -k8s.io/cloud-provider v0.32.1 h1:74rRhnfca3o4CsjjnIp/C3ARVuSmyNsxgWPtH0yc9Z0= -k8s.io/cloud-provider v0.32.1/go.mod h1:GECSanFT+EeZ/ToX3xlasjETzMUI+VFu92zHUDUsGHw= -k8s.io/cluster-bootstrap v0.32.1 h1:sHOsbrfWn2EDZus/vwPX2IE1wCw2CuByrIFcaY3zDMo= -k8s.io/cluster-bootstrap v0.32.1/go.mod h1:AAoSp7mIY02P2QBRYoFglKobjD++rPzAdlQeUYObVkA= -k8s.io/component-base v0.32.1 h1:/5IfJ0dHIKBWysGV0yKTFfacZ5yNV1sulPh3ilJjRZk= -k8s.io/component-base v0.32.1/go.mod h1:j1iMMHi/sqAHeG5z+O9BFNCF698a1u0186zkjMZQ28w= -k8s.io/component-helpers v0.32.1 h1:TwdsSM1vW9GjnfX18lkrZbwE5G9psCIS2/rhenTDXd8= -k8s.io/component-helpers v0.32.1/go.mod h1:1JT1Ei3FD29yFQ18F3laj1WyvxYdHIhyxx6adKMFQXI= -k8s.io/controller-manager v0.32.1 h1:z3oQp1O5l0cSzM/MKf8V4olhJ9TmnELoJRPcV/v1s+Y= -k8s.io/controller-manager v0.32.1/go.mod h1:dVA1UZPbqHH4hEhrrnLvQ4d5qVQCklNB8GEzYV59v/4= -k8s.io/cri-api v0.32.1 h1:XWDw70IJV0GmExhQBYz7H+6iFEaKXcUOpnj5MHQ/JXY= -k8s.io/cri-api v0.32.1/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI= +k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= +k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= +k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4= +k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= +k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= +k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= +k8s.io/cli-runtime v0.32.2 h1:aKQR4foh9qeyckKRkNXUccP9moxzffyndZAvr+IXMks= +k8s.io/cli-runtime v0.32.2/go.mod h1:a/JpeMztz3xDa7GCyyShcwe55p8pbcCVQxvqZnIwXN8= +k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= +k8s.io/cloud-provider v0.32.2 h1:8EC+fCYo0r0REczSjOZcVuQPCMxXxCKlgxDbYMrzC30= +k8s.io/cloud-provider v0.32.2/go.mod h1:2s8TeAXhVezp5VISaTxM6vW3yDonOZXoN4Aryz1p1PQ= +k8s.io/cluster-bootstrap v0.32.2 h1:2M/VDIVeUuqdyUfZIMHl39Q6NDomLxny8s/yNQLs+18= +k8s.io/cluster-bootstrap v0.32.2/go.mod h1:jzzJvoOU5mjuNXLlORra1pANHtVLWKZWXc4XAjHjMPY= +k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= +k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= +k8s.io/component-helpers v0.32.2 h1:2usSAm3zNE5yu5DdAdrKBWLfSYNpU4OPjZywJY5ovP8= +k8s.io/component-helpers v0.32.2/go.mod h1:fvQAoiiOP7jUEUBc9qR0PXiBPuB0I56WTxTkkpcI8g8= +k8s.io/controller-manager v0.32.2 h1:/9XuHWEqofO2Aqa4l7KJGckJUcLVRWfx+qnVkdXoStI= +k8s.io/controller-manager v0.32.2/go.mod h1:o5uo2tLCQhuoMt0RfKcQd0eqaNmSKOKiT+0YELCqXOk= +k8s.io/cri-api v0.32.2 h1:7DuaOHpOcXweZeBUbRdK0iCroxctGp73VwgrA0u7kho= +k8s.io/cri-api v0.32.2/go.mod h1:DCzMuTh2padoinefWME0G678Mc3QFbLMF2vEweGzBAI= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.1 h1:TW6cswRI/fawoQRFGWLmEceO37rZXupdoRdmO019jCc= -k8s.io/kms v0.32.1/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= -k8s.io/kube-aggregator v0.32.1 h1:cztPyIHbo6tgrhYHDqmdmvxUufJKuxgAC/vog7yeWek= -k8s.io/kube-aggregator v0.32.1/go.mod h1:sXjL5T8FO/rlBzTbBhahw9V5Nnr1UtzZHKTj9WxQCOU= +k8s.io/kms v0.32.2 h1:7Ff23ht7W40gTcDwUC8G5WjX5W/nxD8WxbNhIYYNZCI= +k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= +k8s.io/kube-aggregator v0.32.2 h1:kg9pke+i2qRbJwX1UKwZV4fsCRvmbaCEFk38R4FqHmw= +k8s.io/kube-aggregator v0.32.2/go.mod h1:rRm+xY1yIFIt3zBc727nG5SBLYywywD87klfIAw+7+c= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= -k8s.io/kubectl v0.32.1 h1:/btLtXLQUU1rWx8AEvX9jrb9LaI6yeezt3sFALhB8M8= -k8s.io/kubectl v0.32.1/go.mod h1:sezNuyWi1STk4ZNPVRIFfgjqMI6XMf+oCVLjZen/pFQ= -k8s.io/kubelet v0.32.1 h1:bB91GvMsZb+LfzBxnjPEr1Fal/sdxZtYphlfwAaRJGw= -k8s.io/kubelet v0.32.1/go.mod h1:4sAEZ6PlewD0GroV3zscY7llym6kmNNTVmUI/Qshm6w= -k8s.io/kubernetes v1.32.1 h1:46YPpIBCT9dkmeglstZ2Gg4LGaAdro1/3IQ+1AfbF1s= -k8s.io/kubernetes v1.32.1/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I= -k8s.io/metrics v0.32.1 h1:Ou4nrEtZS2vFf7OJCf9z3+2kr0A00kQzfoSwxg0gXps= -k8s.io/metrics v0.32.1/go.mod h1:cLnai9XKYby1tNMX+xe8p9VLzTqrxYPcmqfCBoWObcM= -k8s.io/mount-utils v0.32.1 h1:RJOD6xXzEJT/OOJoG1KstfVa8ZXJJPlHb+t2MoulPHM= -k8s.io/mount-utils v0.32.1/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= +k8s.io/kubectl v0.32.2 h1:TAkag6+XfSBgkqK9I7ZvwtF0WVtUAvK8ZqTt+5zi1Us= +k8s.io/kubectl v0.32.2/go.mod h1:+h/NQFSPxiDZYX/WZaWw9fwYezGLISP0ud8nQKg+3g8= +k8s.io/kubelet v0.32.2 h1:WFTSYdt3BB1aTApDuKNI16x/4MYqqX8WBBBBh3KupDg= +k8s.io/kubelet v0.32.2/go.mod h1:cC1ms5RS+lu0ckVr6AviCQXHLSPKEBC3D5oaCBdTGkI= +k8s.io/kubernetes v1.32.2 h1:mShetlA102UpjRVSGzB+5vjJwy8oPy8FMWrkTH5f37o= +k8s.io/kubernetes v1.32.2/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I= +k8s.io/metrics v0.32.2 h1:7t/rZzTHFrGa9f94XcgLlm3ToAuJtdlHANcJEHlYl9g= +k8s.io/metrics v0.32.2/go.mod h1:VL3nJpzcgB6L5nSljkkzoE0nilZhVgcjCfNRgoylaIQ= +k8s.io/mount-utils v0.32.2 h1:aDwp+ucWiVnDr/LpRg88/dsXf/vm6gI1VZkYH3+3+Vw= +k8s.io/mount-utils v0.32.2/go.mod h1:Kun5c2svjAPx0nnvJKYQWhfeNW+O0EpzHgRhDcYoSY0= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= diff --git a/hack/tool/go.mod b/hack/tool/go.mod index 494036b8182c..2ea74e5b2d5d 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -89,8 +89,8 @@ require ( golang.org/x/time v0.7.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.32.1 // indirect - k8s.io/client-go v0.32.1 // indirect + k8s.io/apimachinery v0.32.2 // indirect + k8s.io/client-go v0.32.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index fe395e3f25d1..1e2f37cbb128 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -335,8 +335,10 @@ k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU= k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg= +k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index e3d66623c100..de09b184a610 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.32.1+k0s.0" + version: "1.32.2+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.32.1+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.32.1+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.32.1+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.32.2+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.32.2+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.32.2+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.32.1+k0s.0 is now installed +INFO k0s cluster version v1.32.2+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.32.1 + --kubernetes-version=v1.32.2 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 ae6fb3d970fe..046551a11a9b 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.32.1+k0s.0 +version: v1.32.2+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 d301a9d9efd7..75f01856a3b6 100644 --- a/pkg/apis/k0s/v1beta1/kubeproxy.go +++ b/pkg/apis/k0s/v1beta1/kubeproxy.go @@ -49,7 +49,7 @@ type KubeProxy struct { } // KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.32.1/config/v1alpha1/types.go#L27-L48 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.32.2/config/v1alpha1/types.go#L27-L48 type KubeProxyIPTablesConfiguration struct { MasqueradeBit *int32 `json:"masqueradeBit,omitempty"` MasqueradeAll bool `json:"masqueradeAll,omitempty"` @@ -59,7 +59,7 @@ type KubeProxyIPTablesConfiguration struct { } // KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.32.1/config/v1alpha1/types.go#L52-L78 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.32.2/config/v1alpha1/types.go#L52-L78 type KubeProxyIPVSConfiguration struct { SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"` MinSyncPeriod metav1.Duration `json:"minSyncPeriod,omitempty"` @@ -72,7 +72,7 @@ type KubeProxyIPVSConfiguration struct { } // KubeProxyNFTablesConfiguration contains nftables-related kube-proxy configuration -// @see https://github.com/kubernetes/kube-proxy/blob/v0.32.1/config/v1alpha1/types.go#L82-L97 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.32.2/config/v1alpha1/types.go#L82-L97 type KubeProxyNFTablesConfiguration struct { SyncPeriod metav1.Duration `json:"syncPeriod,omitempty"` MasqueradeBit *int32 `json:"masqueradeBit,omitempty"` diff --git a/pkg/component/worker/kubelet.go b/pkg/component/worker/kubelet.go index 8957e787a68d..c2830e5b259c 100644 --- a/pkg/component/worker/kubelet.go +++ b/pkg/component/worker/kubelet.go @@ -147,7 +147,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.32.1/pkg/kubelet/nodestatus/setters.go#L202-L230 + // https://github.com/kubernetes/kubernetes/blob/v1.32.2/pkg/kubelet/nodestatus/setters.go#L202-L230 ipv4, ipv6, err := lookupNodeName(ctx, k.NodeName) if err != nil { logrus.WithError(err).Errorf("failed to lookup %q", k.NodeName) diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go index 168b20ac0676..47bb4f2fdd18 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.32.1" + KubeProxyImageVersion = "v1.32.2" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.12.0" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless" diff --git a/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml b/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml index 53defaa0b565..a29a31eea944 100644 --- a/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/_crds/k0s/k0s.k0sproject.io_clusterconfigs.yaml @@ -688,7 +688,7 @@ spec: iptables: description: |- KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.32.1/config/v1alpha1/types.go#L27-L48 + @see https://github.com/kubernetes/kube-proxy/blob/v0.32.2/config/v1alpha1/types.go#L27-L48 properties: localhostNodePorts: type: boolean @@ -705,7 +705,7 @@ spec: ipvs: description: |- KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.32.1/config/v1alpha1/types.go#L52-L78 + @see https://github.com/kubernetes/kube-proxy/blob/v0.32.2/config/v1alpha1/types.go#L52-L78 properties: excludeCIDRs: items: @@ -736,7 +736,7 @@ spec: nftables: description: |- KubeProxyNFTablesConfiguration contains nftables-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.32.1/config/v1alpha1/types.go#L82-L97 + @see https://github.com/kubernetes/kube-proxy/blob/v0.32.2/config/v1alpha1/types.go#L82-L97 properties: masqueradeAll: type: boolean