diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index b839e323fd9e..4d15f6cc1221 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.28.12+k0s.0")' + description: 'Version tag (e.g."v1.28.13+k0s.0")' required: true env: diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index d8efaa56d931..e8bee790b392 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.28.12 +kubernetes_version = 1.28.13 helm_version = 3.11.1 kubernetes_buildimage = $(golang_buildimage) kubernetes_build_go_tags = "providerless" diff --git a/examples/footloose-ha-controllers/Dockerfile b/examples/footloose-ha-controllers/Dockerfile index 4f843c21499e..93b46419f3a9 100644 --- a/examples/footloose-ha-controllers/Dockerfile +++ b/examples/footloose-ha-controllers/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/footloose/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.28.12/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.28.13/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 00de5cea2b6c..9fda5ea92621 100644 --- a/go.mod +++ b/go.mod @@ -65,20 +65,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.28.12 - k8s.io/apiextensions-apiserver v0.28.12 - k8s.io/apimachinery v0.28.12 - k8s.io/cli-runtime v0.28.12 - k8s.io/client-go v0.28.12 - k8s.io/cloud-provider v0.28.12 - k8s.io/component-base v0.28.12 - k8s.io/component-helpers v0.28.12 - k8s.io/cri-api v0.28.12 - k8s.io/kube-aggregator v0.28.12 - k8s.io/kubectl v0.28.12 - k8s.io/kubelet v0.28.12 - k8s.io/kubernetes v1.28.12 - k8s.io/mount-utils v0.28.12 + k8s.io/api v0.28.13 + k8s.io/apiextensions-apiserver v0.28.13 + k8s.io/apimachinery v0.28.13 + k8s.io/cli-runtime v0.28.13 + k8s.io/client-go v0.28.13 + k8s.io/cloud-provider v0.28.13 + k8s.io/component-base v0.28.13 + k8s.io/component-helpers v0.28.13 + k8s.io/cri-api v0.28.13 + k8s.io/kube-aggregator v0.28.13 + k8s.io/kubectl v0.28.13 + k8s.io/kubelet v0.28.13 + k8s.io/kubernetes v1.28.13 + k8s.io/mount-utils v0.28.13 k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 sigs.k8s.io/controller-runtime v0.16.2 sigs.k8s.io/yaml v1.3.0 @@ -273,12 +273,12 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.28.12 // indirect - k8s.io/controller-manager v0.28.12 // indirect + k8s.io/apiserver v0.28.13 // indirect + k8s.io/controller-manager v0.28.13 // indirect k8s.io/klog/v2 v2.100.1 // indirect - k8s.io/kms v0.28.12 // indirect + k8s.io/kms v0.28.13 // indirect k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect - k8s.io/metrics v0.28.12 // indirect + k8s.io/metrics v0.28.13 // indirect oras.land/oras-go v1.2.4 // indirect oras.land/oras-go/v2 v2.1.0 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect @@ -306,35 +306,35 @@ replace ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.28.12/go.mod#L250-L281 - k8s.io/api => k8s.io/api v0.28.12 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.12 - k8s.io/apimachinery => k8s.io/apimachinery v0.28.12 - k8s.io/apiserver => k8s.io/apiserver v0.28.12 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.12 - k8s.io/client-go => k8s.io/client-go v0.28.12 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.12 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.12 - k8s.io/code-generator => k8s.io/code-generator v0.28.12 - k8s.io/component-base => k8s.io/component-base v0.28.12 - k8s.io/component-helpers => k8s.io/component-helpers v0.28.12 - k8s.io/controller-manager => k8s.io/controller-manager v0.28.12 - k8s.io/cri-api => k8s.io/cri-api v0.28.12 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.12 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.12 - k8s.io/endpointslice => k8s.io/endpointslice v0.28.12 - k8s.io/kms => k8s.io/kms v0.28.12 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.12 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.12 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.12 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.12 - k8s.io/kubectl => k8s.io/kubectl v0.28.12 - k8s.io/kubelet => k8s.io/kubelet v0.28.12 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.12 - k8s.io/metrics => k8s.io/metrics v0.28.12 - k8s.io/mount-utils => k8s.io/mount-utils v0.28.12 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.12 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.12 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.12 - k8s.io/sample-controller => k8s.io/sample-controller v0.28.12 + // https://github.com/kubernetes/kubernetes/blob/v1.28.13/go.mod#L250-L281 + k8s.io/api => k8s.io/api v0.28.13 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.13 + k8s.io/apimachinery => k8s.io/apimachinery v0.28.13 + k8s.io/apiserver => k8s.io/apiserver v0.28.13 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.13 + k8s.io/client-go => k8s.io/client-go v0.28.13 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.13 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.13 + k8s.io/code-generator => k8s.io/code-generator v0.28.13 + k8s.io/component-base => k8s.io/component-base v0.28.13 + k8s.io/component-helpers => k8s.io/component-helpers v0.28.13 + k8s.io/controller-manager => k8s.io/controller-manager v0.28.13 + k8s.io/cri-api => k8s.io/cri-api v0.28.13 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.13 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.13 + k8s.io/endpointslice => k8s.io/endpointslice v0.28.13 + k8s.io/kms => k8s.io/kms v0.28.13 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.13 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.13 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.13 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.13 + k8s.io/kubectl => k8s.io/kubectl v0.28.13 + k8s.io/kubelet => k8s.io/kubelet v0.28.13 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.13 + k8s.io/metrics => k8s.io/metrics v0.28.13 + k8s.io/mount-utils => k8s.io/mount-utils v0.28.13 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.13 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.13 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.13 + k8s.io/sample-controller => k8s.io/sample-controller v0.28.13 ) diff --git a/go.sum b/go.sum index 8d1aeb96b8c8..eeaaece96170 100644 --- a/go.sum +++ b/go.sum @@ -1447,46 +1447,46 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ= -k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ= -k8s.io/apiextensions-apiserver v0.28.12 h1:6GA64rylk5q0mbXfHHFVgfL1jx/4p6RU+Y+ni2DUuZc= -k8s.io/apiextensions-apiserver v0.28.12/go.mod h1:Len29ySvb/fnrXvioTxg2l6iFi97B53Bm3/jBMBllCE= -k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0= -k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/apiserver v0.28.12 h1:fvZItMw20ySP/QAU5//Ov1pJFyvrr8abeUsh3ZyF8FI= -k8s.io/apiserver v0.28.12/go.mod h1:46S3UWu620UhP5skPJ+WQWC3iWCrl1AiYJPyHxVueE4= -k8s.io/cli-runtime v0.28.12 h1:Skn6b49B+khoscC85o+aVIT9u8uDW2/3KNP4ZLCg7jA= -k8s.io/cli-runtime v0.28.12/go.mod h1:BUnm03LagRdLl+YeOa9BEspaqNq0oy5aWlku8yLY5/s= -k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec= -k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE= -k8s.io/cloud-provider v0.28.12 h1:AJd4BgDjagX6WSm5fMRA/V0rH9rteIkx7j6Jg2z9yNQ= -k8s.io/cloud-provider v0.28.12/go.mod h1:SFM1GGNoLGXROMWyuU+ovUzqVUmUk0Y8Y7O4yYnhf/M= -k8s.io/component-base v0.28.12 h1:ZNq6QFFGCPjaAzWqYHaQRoAY5seoK3vP0pZOjgxOzNc= -k8s.io/component-base v0.28.12/go.mod h1:8zI5TmGuHX6R5Lay61Ox7wb+dsEENl0NBmVSiHMQu1c= -k8s.io/component-helpers v0.28.12 h1:tHF4FcM/CxviA684futgMXhQeC2NOFPvHVKseixc7Cs= -k8s.io/component-helpers v0.28.12/go.mod h1:VbQ5E9qnr8alyAS3b3pqXKvkEOJKoj6z6PA8S+6Wlws= -k8s.io/controller-manager v0.28.12 h1:A/A14ErMuTuBW8myUCSfDr2QG5qS90ZV2DohyueAN8A= -k8s.io/controller-manager v0.28.12/go.mod h1:SEIMkdUzB4saf4sdTU2wzST6PU9zHGsTDwhoM/pVoko= -k8s.io/cri-api v0.28.12 h1:ut2imsEaoTl+AVfiUUOk9SiKpfs6hrUlusBFaDpK4ek= -k8s.io/cri-api v0.28.12/go.mod h1:8/bPK3T4irPoj3LjriQc1TAIheeN2yWXR3mz+8jNZ8U= +k8s.io/api v0.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4= +k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q= +k8s.io/apiextensions-apiserver v0.28.13 h1:+Q3jtMXBxvURuW0tzW1UsZMPud3T4OvgVPuI/uQUEQ8= +k8s.io/apiextensions-apiserver v0.28.13/go.mod h1:yThTxyuc0ba1rXKZNK2aQNIbFxmGcU+CPc8YB40IGj0= +k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g= +k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/apiserver v0.28.13 h1:bg9FxMeutIk1IGzYd7H7cGyhCaQfvGatZAG0WxlxjmQ= +k8s.io/apiserver v0.28.13/go.mod h1:C6BVNnosWylxNbMINPQyAp5BK/X97q+7QvtfrJOTjyk= +k8s.io/cli-runtime v0.28.13 h1:WttCI/xgKmji8H32mFSremv2SXWEsZ7Zd171DJFTB/8= +k8s.io/cli-runtime v0.28.13/go.mod h1:Vn5/q7bC1TqG8UdWN9boQNubTNKES7t02WlHSbxTJwc= +k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk= +k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g= +k8s.io/cloud-provider v0.28.13 h1:BzaZw630XCfEdoFYRcS40UeIe0Z5CXq9kb7ruVv5MXE= +k8s.io/cloud-provider v0.28.13/go.mod h1:IhmEuNXdFTDnHwZY7YYCt81QxYNKRWIkCIVgodCEij8= +k8s.io/component-base v0.28.13 h1:hNgX2QcMt7Z5vy/9MB2rodbvBJj6H4Jq1JZDqGvVuf8= +k8s.io/component-base v0.28.13/go.mod h1:G37g+bIAcjV2cAMEpFG2SEN7NgRFMizqSksOLpPN2bM= +k8s.io/component-helpers v0.28.13 h1:bWMpTLkp0zC1mcsntTg/HMVU8tDLBGwio7fFtuSY0ck= +k8s.io/component-helpers v0.28.13/go.mod h1:WcNp6qcUhQLT0Cr9JppRFJfaGsejie55nUCVsTOFShg= +k8s.io/controller-manager v0.28.13 h1:9rIV4oZ6FvTumc9AV+wpYcSYs694nNCfABLlw1NGAwU= +k8s.io/controller-manager v0.28.13/go.mod h1:sEmmmCrqjDCgNs+ErhqYwHUNerIDEKyNTjRtFpgdFGM= +k8s.io/cri-api v0.28.13 h1:4dB6r1DIJXbiOE2J41PBJ1tKJEgKybDqzqdQsxeKc24= +k8s.io/cri-api v0.28.13/go.mod h1:8/bPK3T4irPoj3LjriQc1TAIheeN2yWXR3mz+8jNZ8U= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kms v0.28.12 h1:YEcJWelR7ChLI7le/slHpeIkx7v6MoPkITo3JyL8s1M= -k8s.io/kms v0.28.12/go.mod h1:EZtSJo9PoqEe/aB/X5sXPRl5LHukSuXlDrDnY76lJjY= -k8s.io/kube-aggregator v0.28.12 h1:P2ykxwoJDBgvaBzLSMnfFY7352YUX1oB7qgTx+LXwPk= -k8s.io/kube-aggregator v0.28.12/go.mod h1:+bG2AZI09KZhAcdJ8unfNblsqxkfCKwu/DwNFQqwajM= +k8s.io/kms v0.28.13 h1:YzursXqV7tZShM/ViKox6a7CpuVRnlW/VeQGQNtURd0= +k8s.io/kms v0.28.13/go.mod h1:Gx6kKsfPaLKAIB6tV/Ee4BHMaq58Si9xtdPgIWxxQEw= +k8s.io/kube-aggregator v0.28.13 h1:05qFvSnztQLFVc93hFBYZhAVz9ZwyjEJShHRZr38UYM= +k8s.io/kube-aggregator v0.28.13/go.mod h1:RsEpstIOyJkPfVfSW/F0rZcCKgQqd6S4EfU0LoT3L+4= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/kubectl v0.28.12 h1:CyGVOUO83jYxwLI5XtBFNoerAQj47fnEDrCPKWxlAi8= -k8s.io/kubectl v0.28.12/go.mod h1:KzG7ROxXnUqfS6S+xJIIbd6WMpFYNByyxqNkIhxS6Qs= -k8s.io/kubelet v0.28.12 h1:ACRS1b6XxIxAJoOJ95bsy0qm0DoxD6h/Dwi4U6Pot74= -k8s.io/kubelet v0.28.12/go.mod h1:DYlF/KqAA4WoiBElCjeDKGv2K37FLTUmTWyxMDv9s8A= -k8s.io/kubernetes v1.28.12 h1:DtWB8ZjoYiN/PXD4qDXFppf9IouVUavn6r3S+3NMUkU= -k8s.io/kubernetes v1.28.12/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk= -k8s.io/metrics v0.28.12 h1:cG6ddOzhgshUDgTwcaW0p4K7TCdM3TWVZZsqTgiMIWE= -k8s.io/metrics v0.28.12/go.mod h1:wYZ2sTx4GqxoPzg4QhUeauRrcgul0UsVn337lpuwR2I= -k8s.io/mount-utils v0.28.12 h1:AUHMf700dF+Oes67uVTPU60Z4mtqtyIRNEJl08fWiQU= -k8s.io/mount-utils v0.28.12/go.mod h1:ZxAFXgKzcAyi3VTd2pKFlZFswl9Q/cveJ5aptdjQOuc= +k8s.io/kubectl v0.28.13 h1:Qi+9XOClfWCPa1rJq4/gFFhm86bgXlBZARQavspZeHw= +k8s.io/kubectl v0.28.13/go.mod h1:2rNqsxBOrLV6KSA8LGb3mpblvV9FNnUYukBspFbmH8M= +k8s.io/kubelet v0.28.13 h1:9KuvX0V6HiC9WBeEQtXIVvP5Lfm7At9oeyxsrsfYx8o= +k8s.io/kubelet v0.28.13/go.mod h1:qy6k3+nV0LKbbY2tix22FaOP9EG9OZVS+YZQ5h4Y5yM= +k8s.io/kubernetes v1.28.13 h1:oLWFXzWrirwQCzNACh5NBCRLackjzMaxCX1dlB9U1xg= +k8s.io/kubernetes v1.28.13/go.mod h1:chlmcCDBnOA/y+572cw8dO0Rci1wiA8bm5+zhPdFLCk= +k8s.io/metrics v0.28.13 h1:q3SbR/2b+drO1pFhQvNMWo9+VVzNkXx9zjn40RuQbXc= +k8s.io/metrics v0.28.13/go.mod h1:UKcfHy+KvTkjrUL4mz0NS7Hb872Q/ponmJw3hQoGNa8= +k8s.io/mount-utils v0.28.13 h1:y1h7hsLLMg7iyU2654ldTUPpmW1j2Wb0GXalUilTUV4= +k8s.io/mount-utils v0.28.13/go.mod h1:ZxAFXgKzcAyi3VTd2pKFlZFswl9Q/cveJ5aptdjQOuc= k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk= k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/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 f4b01991b6fa..a9e89d5aa18b 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -92,8 +92,8 @@ require ( gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.28.12 // indirect - k8s.io/client-go v0.28.12 // indirect + k8s.io/apimachinery v0.28.13 // indirect + k8s.io/client-go v0.28.13 // indirect k8s.io/klog/v2 v2.100.1 // indirect k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index b9948cbde613..5ca08f398a8b 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -354,12 +354,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.28.12 h1:C2hpsaso18pqn0Dmkfnbv/YCctozTC3KGGuZ6bF7zhQ= -k8s.io/api v0.28.12/go.mod h1:qjswI+whxvf9LAKD4sEYHfy+WgHGWeH+H5sCRQMwZAQ= -k8s.io/apimachinery v0.28.12 h1:VepMEVOi9o7L/4wMAXJq+3BK9tqBIeerTB+HSOTKeo0= -k8s.io/apimachinery v0.28.12/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= -k8s.io/client-go v0.28.12 h1:li7iRPRQF3vDki6gTxT/kXWJvw3BkJSdjVPVhDTZQec= -k8s.io/client-go v0.28.12/go.mod h1:yEzH2Z+nEGlrnKyHJWcJsbOr5tGdIj04dj1TVQOg0wE= +k8s.io/api v0.28.13 h1:0Sw8MjdkmrJAF/uVv09HXSZ3cQauVyZHQWKt8hiiKo4= +k8s.io/api v0.28.13/go.mod h1:7hlRF5wArzXf0qbRRT2TMtHRa5SHBEVJhA02JpTxj9Q= +k8s.io/apimachinery v0.28.13 h1:0O2mk2i0Yi+xkron0lK//biI21F1eGXb4eXECLU5v7g= +k8s.io/apimachinery v0.28.13/go.mod h1:zUG757HaKs6Dc3iGtKjzIpBfqTM4yiRsEe3/E7NX15o= +k8s.io/client-go v0.28.13 h1:kHgFOxWwAsa8VxL6Oylo10V6euobub9Jo0wyEWrhrWk= +k8s.io/client-go v0.28.13/go.mod h1:IudvInbWfd+6WLreEVnBnZJCGFaSROCFbny9jFTkk7g= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index 39df0877d66c..7bbc316023ab 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.28.12+k0s.0" + version: "1.28.13+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.28.12+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.12+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.12+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.13+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.13+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.13+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.28.12+k0s.0 is now installed +INFO k0s cluster version v1.28.13+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.28.12 + --kubernetes-version=v1.28.13 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 f08a53211680..baf5d3749343 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.28.12+k0s.0 +version: v1.28.13+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 2b12d5120629..2441260a0618 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.28.12/config/v1alpha1/types.go#L27-L42 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.28.13/config/v1alpha1/types.go#L27-L42 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.28.12/config/v1alpha1/types.go#L46-L70 +// @see https://github.com/kubernetes/kube-proxy/blob/v0.28.13/config/v1alpha1/types.go#L46-L70 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 f696680f1e4c..aa051c80304a 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -78,7 +78,7 @@ const ( MetricsImage = "quay.io/k0sproject/metrics-server" MetricsImageVersion = "v0.7.1-0" KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.28.12" + KubeProxyImageVersion = "v1.28.13" 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 2ed84eba647b..2f5bd1501263 100644 --- a/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml +++ b/static/manifests/v1beta1/CustomResourceDefinition/k0s.k0sproject.io_clusterconfigs.yaml @@ -393,7 +393,7 @@ spec: iptables: description: |- KubeProxyIPTablesConfiguration contains iptables-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.28.12/config/v1alpha1/types.go#L27-L42 + @see https://github.com/kubernetes/kube-proxy/blob/v0.28.13/config/v1alpha1/types.go#L27-L42 properties: localhostNodePorts: type: boolean @@ -410,7 +410,7 @@ spec: ipvs: description: |- KubeProxyIPVSConfiguration contains ipvs-related kube-proxy configuration - @see https://github.com/kubernetes/kube-proxy/blob/v0.28.12/config/v1alpha1/types.go#L46-L70 + @see https://github.com/kubernetes/kube-proxy/blob/v0.28.13/config/v1alpha1/types.go#L46-L70 properties: excludeCIDRs: items: