Bump Kubernetes to v1.25.11

https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.25.md#changelog-since-v12510 Fixes CVE-2023-2728. Signed-off-by: Tom Wieczorek <[email protected]>
k0sproject · Jun 15, 2023 · 0ce7b83 · 0ce7b83
1 parent 529a675
commit 0ce7b83
Show file tree

Hide file tree

Showing 21 changed files with 139 additions and 139 deletions.
diff --git a/docs/airgap-install.md b/docs/airgap-install.md
@@ -66,7 +66,7 @@ metadata:
   name: k0s-cluster
 spec:
   k0s:
-    version: 1.25.10+k0s.0
+    version: 1.25.11+k0s.0
   hosts:
     - role: controller
       ssh:

diff --git a/docs/autopilot-multicommand.md b/docs/autopilot-multicommand.md
@@ -62,20 +62,20 @@ processed by **autopilot**.
  6:  spec:
  7:    commands:
  8:    - airgapupdate:
- 9:        version: v1.25.10+k0s.0
+ 9:        version: v1.25.11+k0s.0
 10:        platforms:
 11:          linux-amd64:
-12:            url: https://github.com/k0sproject/k0s/releases/download/v1.25.10+k0s.0/k0s-airgap-bundle-v1.25.10+k0s.0-amd64
+12:            url: https://github.com/k0sproject/k0s/releases/download/v1.25.11+k0s.0/k0s-airgap-bundle-v1.25.11+k0s.0-amd64
 13:        workers:
 14:          discovery:
 15:            static:
 16:              nodes:
 17:              - worker0
 18:    - k0supdate:
-19:        version: v1.25.10+k0s.0
+19:        version: v1.25.11+k0s.0
 20:        platforms:
 21:          linux-amd64:
-22:            url: https://github.com/k0sproject/k0s/releases/download/v1.25.10+k0s.0/k0s-v1.25.10+k0s.0-amd64
+22:            url: https://github.com/k0sproject/k0s/releases/download/v1.25.11+k0s.0/k0s-v1.25.11+k0s.0-amd64
 23:        targets:
 24:          controllers:
 25:            discovery:

diff --git a/docs/autopilot.md b/docs/autopilot.md
@@ -104,10 +104,10 @@ spec:
 
   commands:
     - k0supdate:
-        version: v1.25.10+k0s.0
+        version: v1.25.11+k0s.0
         platforms:
           linux-amd64:
-            url: https://github.com/k0sproject/k0s/releases/download/v1.25.10+k0s.0/k0s-v1.25.10+k0s.0-amd64
+            url: https://github.com/k0sproject/k0s/releases/download/v1.25.11+k0s.0/k0s-v1.25.11+k0s.0-amd64
             sha256: '0000000000000000000000000000000000000000000000000000000000000000'
         targets:
           controllers:

diff --git a/docs/configuration.md b/docs/configuration.md
@@ -91,7 +91,7 @@ spec:
       version: v0.6.1
     kubeproxy:
       image: registry.k8s.io/kube-proxy
-      version: v1.25.10
+      version: v1.25.11
     coredns:
       image: docker.io/coredns/coredns
       version: 1.9.4

diff --git a/docs/docker-shim.md b/docs/docker-shim.md
@@ -31,9 +31,9 @@ Get a list of all nodes (k0s is still version 1.23, which already includes the d
 ```sh
 sudo k0s kubectl get nodes -o wide
 
-NAME                                        STATUS   ROLES           AGE   VERSION       INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
-ip-10-0-49-188.eu-west-1.compute.internal   Ready    control-plane   52m   v1.25.10+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
-ip-10-0-62-250.eu-west-1.compute.internal   Ready    <none>          12s   v1.25.10+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
+NAME                                        STATUS   ROLES           AGE   VERSION        INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
+ip-10-0-49-188.eu-west-1.compute.internal   Ready    control-plane   52m   v1.25.11+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
+ip-10-0-62-250.eu-west-1.compute.internal   Ready    <none>          12s   v1.25.11+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
 ```
 
 cordon and drain the nodes (migrate one by one):
@@ -46,9 +46,9 @@ sudo k0s kubectl drain ip-10-0-62-250.eu-west-1.compute.internal --ignore-daemon
 ```sh
 sudo k0s kubectl get nodes -o wide
 
-NAME                                        STATUS                     ROLES           AGE     VERSION       INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
-ip-10-0-49-188.eu-west-1.compute.internal   Ready                      control-plane   56m     v1.25.10+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
-ip-10-0-62-250.eu-west-1.compute.internal   Ready,SchedulingDisabled   <none>          3m40s   v1.25.10+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
+NAME                                        STATUS                     ROLES           AGE     VERSION        INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
+ip-10-0-49-188.eu-west-1.compute.internal   Ready                      control-plane   56m     v1.25.11+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
+ip-10-0-62-250.eu-west-1.compute.internal   Ready,SchedulingDisabled   <none>          3m40s   v1.25.11+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
 ```
 
 Stop k0s on the node:
@@ -142,9 +142,9 @@ On the controller, you'll be able to see the worker started with the new docker
 ```sh
 sudo k0s kubectl get nodes -o wide
 
-NAME                                        STATUS                     ROLES           AGE    VERSION       INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
-ip-10-0-49-188.eu-west-1.compute.internal   Ready                      control-plane   117m   v1.25.10+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
-ip-10-0-62-250.eu-west-1.compute.internal   Ready,SchedulingDisabled   <none>          64m    v1.25.10+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
+NAME                                        STATUS                     ROLES           AGE    VERSION        INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
+ip-10-0-49-188.eu-west-1.compute.internal   Ready                      control-plane   117m   v1.25.11+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
+ip-10-0-62-250.eu-west-1.compute.internal   Ready,SchedulingDisabled   <none>          64m    v1.25.11+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
 ```
 
 ### Uncordon the Node
@@ -160,7 +160,7 @@ You should now see the node Ready for scheduling with the docker Runtime:
 ```sh
 sudo k0s kubectl get nodes -o wide
 
-NAME                                        STATUS   ROLES           AGE    VERSION       INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
-ip-10-0-49-188.eu-west-1.compute.internal   Ready    control-plane   119m   v1.25.10+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
-ip-10-0-62-250.eu-west-1.compute.internal   Ready    <none>          66m    v1.25.10+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
+NAME                                        STATUS   ROLES           AGE    VERSION        INTERNAL-IP   EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION    CONTAINER-RUNTIME
+ip-10-0-49-188.eu-west-1.compute.internal   Ready    control-plane   119m   v1.25.11+k0s   10.0.49.188   <none>        Ubuntu 20.04.4 LTS   5.13.0-1022-aws   docker://20.10.16
+ip-10-0-62-250.eu-west-1.compute.internal   Ready    <none>          66m    v1.25.11+k0s   10.0.62.250   <none>        Ubuntu 20.04.4 LTS   5.13.0-1017-aws   docker://20.10.16
 ```
diff --git a/docs/install.md b/docs/install.md
@@ -61,7 +61,7 @@ Though the Quick Start material is written for Debian/Ubuntu, you can use it for
 
     ```shell
     $ sudo k0s status
-    Version: v1.25.10+k0s.0
+    Version: v1.25.11+k0s.0
     Process ID: 436
     Role: controller
     Workloads: true
@@ -77,7 +77,7 @@ Though the Quick Start material is written for Debian/Ubuntu, you can use it for
     ```shell
     $ sudo k0s kubectl get nodes
     NAME   STATUS   ROLES    AGE    VERSION
-    k0s    Ready    <none>   4m6s   v1.25.10+k0s
+    k0s    Ready    <none>   4m6s   v1.25.11+k0s
     ```
 
 ## Uninstall k0s

diff --git a/docs/k0s-in-docker.md b/docs/k0s-in-docker.md
@@ -13,7 +13,7 @@ The k0s containers are published both on Docker Hub and GitHub. For reasons of s
 - docker.io/k0sproject/k0s:latest
 - docker.pkg.github.com/k0sproject/k0s/k0s:"version"
 
-**Note:** Due to Docker Hub tag validation scheme, we have to use `-` as the k0s version separator instead of the usual `+`. So for example k0s version `v1.25.10+k0s.0` is tagged as `docker.io/k0sproject/k0s:v1.25.10-k0s.0`.
+**Note:** Due to Docker Hub tag validation scheme, we have to use `-` as the k0s version separator instead of the usual `+`. So for example k0s version `v1.25.11+k0s.0` is tagged as `docker.io/k0sproject/k0s:v1.25.11-k0s.0`.
 
 ## Start k0s
 

diff --git a/docs/k0s-multi-node.md b/docs/k0s-multi-node.md
@@ -22,15 +22,15 @@ curl -sSLf https://get.k0s.sh | sudo sh
 
 The download script accepts the following environment variables:
 
-| Variable                    | Purpose                                           |
-|:----------------------------|:--------------------------------------------------|
-| `K0S_VERSION=v1.25.10+k0s.0` | Select the version of k0s to be installed         |
-| `DEBUG=true`                | Output commands and their arguments at execution. |
+| Variable                     | Purpose                                           |
+|:-----------------------------|:--------------------------------------------------|
+| `K0S_VERSION=v1.25.11+k0s.0` | Select the version of k0s to be installed         |
+| `DEBUG=true`                 | Output commands and their arguments at execution. |
 
 **Note**: If you require environment variables and use sudo, you can do:
 
 ```shell
-curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v1.25.10+k0s.0 sh
+curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v1.25.11+k0s.0 sh
 ```
 
 ### 2. Bootstrap a controller node
@@ -126,7 +126,7 @@ To get general information about your k0s instance's status:
 ```
 
 ```shell
-Version: v1.25.10+k0s.0
+Version: v1.25.11+k0s.0
 Process ID: 2769
 Parent Process ID: 1
 Role: controller
@@ -144,7 +144,7 @@ sudo k0s kubectl get nodes
 
 ```shell
 NAME   STATUS   ROLES    AGE    VERSION
-k0s    Ready    <none>   4m6s   v1.25.10+k0s
+k0s    Ready    <none>   4m6s   v1.25.11+k0s
 ```
 
 You can also access your cluster easily with [Lens](https://k8slens.dev/), simply by copying the kubeconfig and pasting it to Lens:

diff --git a/docs/raspberry-pi4.md b/docs/raspberry-pi4.md
@@ -125,7 +125,7 @@ Download a [k0s release](https://github.com/k0sproject/k0s/releases/latest). For
 example:
 
 ```shell
-wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v1.25.10+k0s.0/k0s-v1.25.10+k0s.0-arm64 # replace version number!
+wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v1.25.11+k0s.0/k0s-v1.25.11+k0s.0-arm64 # replace version number!
 sudo install /tmp/k0s /usr/local/bin/k0s
 ```
 
@@ -142,7 +142,7 @@ At this point you can run `k0s`:
 
 ```console
 ubuntu@ubuntu:~$ k0s version
-v1.25.10+k0s.0
+v1.25.11+k0s.0
 ```
 
 To check if k0s's [system requirements](system-requirements.md) and [external
@@ -287,8 +287,8 @@ 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
-ubuntu   Ready    control-plane   4m41s   v1.25.10+k0s   10.152.56.54   <none>        Ubuntu 22.04.1 LTS   5.15.0-1013-raspi   containerd://1.6.10
+NAME     STATUS   ROLES           AGE     VERSION        INTERNAL-IP    EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION      CONTAINER-RUNTIME
+ubuntu   Ready    control-plane   4m41s   v1.25.11+k0s   10.152.56.54   <none>        Ubuntu 22.04.1 LTS   5.15.0-1013-raspi   containerd://1.6.10
 ubuntu@ubuntu:~$ sudo k0s kc get pod -owide -A
 NAMESPACE     NAME                              READY   STATUS    RESTARTS   AGE     IP             NODE     NOMINATED NODE   READINESS GATES
 kube-system   kube-proxy-kkv2l                  1/1     Running   0          4m44s   10.152.56.54   ubuntu   <none>           <none>
@@ -445,7 +445,7 @@ As this is a worker node, we cannot access the Kubernetes API via the builtin
 
 ```console
 ubuntu@ubuntu:~$ sudo k0s status
-Version: v1.25.10+k0s.0
+Version: v1.25.11+k0s.0
 Process ID: 1631
 Role: worker
 Workloads: true
@@ -496,8 +496,8 @@ 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
-node/ubuntu   Ready    <none>   5m1s   v1.25.10+k0s   10.152.56.54   <none>        Ubuntu 22.04.1 LTS   5.15.0-1013-raspi   containerd://1.6.10
+NAME          STATUS   ROLES    AGE    VERSION        INTERNAL-IP    EXTERNAL-IP   OS-IMAGE             KERNEL-VERSION      CONTAINER-RUNTIME
+node/ubuntu   Ready    <none>   5m1s   v1.25.11+k0s   10.152.56.54   <none>        Ubuntu 22.04.1 LTS   5.15.0-1013-raspi   containerd://1.6.10
 
 NAMESPACE     NAME                             READY   UP-TO-DATE   AVAILABLE   AGE   CONTAINERS       IMAGES                                                 SELECTOR
 kube-system   deployment.apps/coredns          1/1     1            1           33m   coredns          registry.k8s.io/coredns/coredns:v1.7.0                 k8s-app=kube-dns

diff --git a/docs/releases.md b/docs/releases.md
@@ -12,6 +12,6 @@ The biggest new k0s features will typically only be delivered on top of the late
 
 The k0s version string consists of the Kubernetes version and the k0s version. For example:
 
-- v1.25.10+k0s.0
+- v1.25.11+k0s.0
 
-The Kubernetes version (1.25.10) 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.25.11) is the first part, and the last part (k0s.0) reflects the k0s version, which is built on top of the certain Kubernetes version.
diff --git a/docs/reset.md b/docs/reset.md
@@ -50,8 +50,8 @@ k0sctl can be used to connect each node and remove all k0s-related files and pro
     INFO ==> Running phase: Prepare hosts    
     INFO ==> Running phase: Gather k0s facts 
     INFO [ssh] 13.53.43.63:22: found existing configuration 
-    INFO [ssh] 13.53.43.63:22: is running k0s controller version 1.25.10+k0s.0
-    INFO [ssh] 13.53.218.149:22: is running k0s worker version 1.25.10+k0s.0
+    INFO [ssh] 13.53.43.63:22: is running k0s controller version 1.25.11+k0s.0
+    INFO [ssh] 13.53.218.149:22: is running k0s worker version 1.25.11+k0s.0
     INFO [ssh] 13.53.43.63:22: checking if worker  has joined 
     INFO ==> Running phase: Reset hosts      
     INFO [ssh] 13.53.43.63:22: stopping k0s           

diff --git a/docs/upgrade.md b/docs/upgrade.md
@@ -52,7 +52,7 @@ You can configure the desired cluster version in the k0sctl configuration by set
 ```yaml
 spec:
   k0s:
-    version: 1.25.10+k0s.0
+    version: 1.25.11+k0s.0
 ```
 
 If you do not specify a version, k0sctl checks online for the latest version and defaults to it.
@@ -75,7 +75,7 @@ INFO[0027] [ssh] 10.0.0.17:22: waiting for node to become ready again
 INFO[0027] [ssh] 10.0.0.17:22: upgrade successful
 INFO[0027] ==> Running phase: Disconnect from hosts
 INFO[0027] ==> Finished in 27s
-INFO[0027] k0s cluster version 1.25.10+k0s.0 is now installed
+INFO[0027] k0s cluster version 1.25.11+k0s.0 is now installed
 INFO[0027] Tip: To access the cluster you can now fetch the admin kubeconfig using:
 INFO[0027]      k0sctl kubeconfig
 ```
diff --git 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   <none>   10s   v1.25.10+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   <none>   10s   v1.25.11+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   v1.25.10+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   v1.25.11+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
@@ -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.25.10
+kubernetes_version = 1.25.11
 kubernetes_buildimage = golang:$(go_version)-alpine3.16
 kubernetes_build_go_tags = "providerless"
 #kubernetes_build_go_cgo_enabled =

diff --git 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.25.10/bin/linux/amd64/kubectl && \
+RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.25.11/bin/linux/amd64/kubectl && \
     chmod +x /usr/local/bin/kubectl
 
 ENV KUBECONFIG=/var/lib/k0s/pki/admin.conf