Bump latest k0s version to v1.23.6+k0s.2

https://github.com/k0sproject/k0s/releases/tag/v1.23.6%2Bk0s.2 Signed-off-by: Tom Wieczorek <[email protected]>
wizpresso-steve-cy-fan · May 31, 2022 · f4d68c2 · f4d68c2
1 parent f7c7ab9
commit f4d68c2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 18 deletions.
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.23.6+k0s.1
+    Version: v1.23.6+k0s.2
     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.23.6+k0s.1
+    k0s    Ready    <none>   4m6s   v1.23.6+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.23.6+k0s.1` is tagged as `docker.io/k0sproject/k0s:v1.23.6-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.23.6+k0s.2` is tagged as `docker.io/k0sproject/k0s:v1.23.6-k0s.0`.
 
 ## Start k0s
 

diff --git a/docs/k0s-multi-node.md b/docs/k0s-multi-node.md
@@ -24,13 +24,13 @@ The download script accepts the following environment variables:
 
 | Variable                   | Purpose                                           |
 |:---------------------------|:--------------------------------------------------|
-| `K0S_VERSION=v1.23.6+k0s.1 | Select the version of k0s to be installed         |
+| `K0S_VERSION=v1.23.6+k0s.2 | 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.23.6+k0s.1 sh
+curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v1.23.6+k0s.2 sh
 ```
 
 ### 2. Bootstrap a controller node
@@ -126,7 +126,7 @@ To get general information about your k0s instance's status:
 ```
 
 ```shell
-Version: v1.23.6+k0s.1
+Version: v1.23.6+k0s.2
 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.23.6+k0s.1
+k0s    Ready    <none>   4m6s   v1.23.6+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
@@ -100,7 +100,7 @@ In addition, add each of these modules to your `/etc/modules-load.d/modules.conf
 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.23.6%2Bk0s.1/k0s-v1.23.6+k0s.1-arm64 # replace version number!
+wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v1.23.6%2Bk0s.1/k0s-v1.23.6+k0s.2-arm64 # replace version number!
 sudo install /tmp/k0s /usr/local/bin/k0s
 ```
 
@@ -120,7 +120,7 @@ k0s version
 ```
 
 ```shell
-v1.23.6+k0s.1
+v1.23.6+k0s.2
 ```
 
 ### Deploy Kubernetes
@@ -202,9 +202,9 @@ kubectl get nodes,deployments,pods -A
 
 ```shell
 NAME         STATUS   ROLES    AGE     VERSION
-node/k8s-4   Ready    <none>   5m9s    v1.23.6+k0s.1
-node/k8s-5   Ready    <none>   5m      v1.23.6+k0s.1
-node/k8s-6   Ready    <none>   4m45s   v1.23.6+k0s.1
+node/k8s-4   Ready    <none>   5m9s    v1.23.6+k0s
+node/k8s-5   Ready    <none>   5m      v1.23.6+k0s
+node/k8s-6   Ready    <none>   4m45s   v1.23.6+k0s
 
 NAMESPACE     NAME                                      READY   UP-TO-DATE   AVAILABLE   AGE
 kube-system   deployment.apps/calico-kube-controllers   1/1     1            1           12m

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.23.6+k0s.1
+- v1.23.6+k0s.2
 
 The Kubernetes version (1.23.6) 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/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.23.6+k0s.1  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.23.6+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.23.6+k0s.1  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.23.6+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/inttest/conformance/README.md b/inttest/conformance/README.md
@@ -35,15 +35,15 @@ In order to run the conformance test, you will need to set the tested k0s versio
 In the same directory as your `main.tf` file, create an additional file `terraform.tfvars` with the following input:
 
 ```terraform
-k0s_version=v1.23.6+k0s.1
+k0s_version=v1.23.6+k0s.2
 k8s_version=v1.23.6
 sonobuoy_version=0.53.2
 ```
 
 ### 2. Environment variables
 
 ```shell
-TF_VAR_k0s_version=v1.23.6+k0s.1 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.23.6 terraform apply
+TF_VAR_k0s_version=v1.23.6+k0s.2 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.23.6 terraform apply
 ```
 
 **NOTE:** By default, terraform will fetch sonobuoy version **0.53.2**. If you want to use a different version you can override this with one of the above methods.

diff --git a/inttest/upgrade/upgrade_test.go b/inttest/upgrade/upgrade_test.go
@@ -32,7 +32,7 @@ type UpgradeSuite struct {
 	common.FootlooseSuite
 }
 
-const previousVersion = "v1.23.6+k0s.1"
+const previousVersion = "v1.23.6+k0s.2"
 
 func (s *UpgradeSuite) TestK0sGetsUp() {
 	dlCommand := fmt.Sprintf("curl -sSfL https://get.k0s.sh | K0S_VERSION=%s sh", previousVersion)