Merge pull request #4011 from twz123/prepare-1.26.13-1

twz123 · web-flow · commit b5d2e5045c5f · 2024-02-03T00:33:00.000+01:00
Prepare v1.26.13+k0s.1
diff --git 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.26.13+k0s.0")'
+        description: 'Version tag (e.g."v1.26.13+k0s.1")'
         required: true
 
 env:
diff --git a/docs/airgap-install.md b/docs/airgap-install.md
@@ -66,7 +66,7 @@ metadata:
   name: k0s-cluster
 spec:
   k0s:
-    version: 1.26.13+k0s.0
+    version: 1.26.13+k0s.1
   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.26.13+k0s.0
+ 9:        version: v1.26.13+k0s.1
 10:        platforms:
 11:          linux-amd64:
-12:            url: https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.0/k0s-airgap-bundle-v1.26.13+k0s.0-amd64
+12:            url: https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.1/k0s-airgap-bundle-v1.26.13+k0s.1-amd64
 13:        workers:
 14:          discovery:
 15:            static:
 16:              nodes:
 17:              - worker0
 18:    - k0supdate:
-19:        version: v1.26.13+k0s.0
+19:        version: v1.26.13+k0s.1
 20:        platforms:
 21:          linux-amd64:
-22:            url: https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.0/k0s-v1.26.13+k0s.0-amd64
+22:            url: https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.1/k0s-v1.26.13+k0s.1-amd64
 23:        targets:
 24:          controllers:
 25:            discovery:
diff --git a/docs/autopilot.md b/docs/autopilot.md
@@ -96,10 +96,10 @@ spec:
 
   commands:
     - k0supdate:
-        version: v1.26.13+k0s.0
+        version: v1.26.13+k0s.1
         platforms:
           linux-amd64:
-            url: https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.0/k0s-v1.26.13+k0s.0-amd64
+            url: https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.1/k0s-v1.26.13+k0s.1-amd64
             sha256: '0000000000000000000000000000000000000000000000000000000000000000'
         targets:
           controllers:
diff --git a/docs/examples/ambassador-ingress.md b/docs/examples/ambassador-ingress.md
@@ -13,7 +13,7 @@ As you need to create a custom configuration file to install Ambassador Gateway,
 1. Run k0s under Docker:
 
     ```shell
-    docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v1.26.13-k0s.0
+    docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v1.26.13-k0s.1
     ```
 
 2. Export the default k0s configuration file:
@@ -77,7 +77,7 @@ As you need to create a custom configuration file to install Ambassador Gateway,
 3. Retart your k0s container, this time with additional ports and the above config file mapped into it:
 
     ```shell
-    docker run --name k0s --hostname k0s --privileged -v /var/lib/k0s -v "$PWD"/k0s.yaml:/k0s.yaml -p 6443:6443 -p 80:80 -p 443:443 -p 8080:8080 docker.io/k0sproject/k0s:v1.26.13-k0s.0
+    docker run --name k0s --hostname k0s --privileged -v /var/lib/k0s -v "$PWD"/k0s.yaml:/k0s.yaml -p 6443:6443 -p 80:80 -p 443:443 -p 8080:8080 docker.io/k0sproject/k0s:v1.26.13-k0s.1
     ```
 
     After some time, you will be able to list the Ambassador Services:
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.26.13+k0s.0
+    Version: v1.26.13+k0s.1
     Process ID: 436
     Role: controller
     Workloads: true
diff --git a/docs/k0s-in-docker.md b/docs/k0s-in-docker.md
@@ -10,10 +10,10 @@ You will require a [Docker environment](https://docs.docker.com/get-docker/) run
 
 The k0s containers are published both on Docker Hub and GitHub. For reasons of simplicity, the examples given here use Docker Hub (GitHub requires a separate authentication that is not covered). Alternative links include:
 
-- docker.io/k0sproject/k0s:v1.26.13-k0s.0
-- ghcr.io/k0sproject/k0s:v1.26.13-k0s.0
+- docker.io/k0sproject/k0s:v1.26.13-k0s.1
+- ghcr.io/k0sproject/k0s:v1.26.13-k0s.1
 
-**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.26.13+k0s.0` is tagged as `docker.io/k0sproject/k0s:v1.26.13-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.26.13+k0s.1` is tagged as `docker.io/k0sproject/k0s:v1.26.13-k0s.1`.
 
 ## Start k0s
 
@@ -22,7 +22,7 @@ The k0s containers are published both on Docker Hub and GitHub. For reasons of s
 You can run your own k0s in Docker:
 
 ```sh
-docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v1.26.13-k0s.0
+docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v1.26.13-k0s.1
 ```
 
 **Note:** If you are using Docker Desktop as the runtime, starting from 4.3.0 version it's using cgroups v2 in the VM that runs the engine. This means you have to add some extra flags to the above command to get kubelet and containerd to properly work with cgroups v2:
@@ -46,7 +46,7 @@ For each required worker:
 2. Run the container to create and join the new worker:
 
     ```sh
-    docker run -d --name k0s-worker1 --hostname k0s-worker1 --privileged -v /var/lib/k0s docker.io/k0sproject/k0s:v1.26.13-k0s.0 k0s worker $token
+    docker run -d --name k0s-worker1 --hostname k0s-worker1 --privileged -v /var/lib/k0s docker.io/k0sproject/k0s:v1.26.13-k0s.1 k0s worker $token
     ```
 
 ### 3. Access your cluster
@@ -68,7 +68,7 @@ version: "3.9"
 services:
   k0s:
     container_name: k0s
-    image: docker.io/k0sproject/k0s:v1.26.13-k0s.0
+    image: docker.io/k0sproject/k0s:v1.26.13-k0s.1
     command: k0s controller --config=/etc/k0s/config.yaml --enable-worker
     hostname: k0s
     privileged: true
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.26.13+k0s.0` | Select the version of k0s to be installed         |
+| `K0S_VERSION=v1.26.13+k0s.1` | 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.26.13+k0s.0 sh
+curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v1.26.13+k0s.1 sh
 ```
 
 ### 2. Bootstrap a controller node
@@ -126,7 +126,7 @@ To get general information about your k0s instance's status:
 ```
 
 ```shell
-Version: v1.26.13+k0s.0
+Version: v1.26.13+k0s.1
 Process ID: 2769
 Parent Process ID: 1
 Role: controller
diff --git a/docs/nllb.md b/docs/nllb.md
@@ -88,7 +88,7 @@ metadata:
   name: k0s-cluster
 spec:
   k0s:
-    version: v1.26.13+k0s.0
+    version: v1.26.13+k0s.1
     config:
       spec:
         network:
@@ -176,11 +176,11 @@ level=info msg="==> Running phase: Validate hosts"
 level=info msg="==> Running phase: Gather k0s facts"
 level=info msg="==> Running phase: Validate facts"
 level=info msg="==> Running phase: Upload k0s binaries to hosts"
-level=info msg="[ssh] 10.81.146.254:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0"
-level=info msg="[ssh] 10.81.146.113:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0"
-level=info msg="[ssh] 10.81.146.51:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0"
-level=info msg="[ssh] 10.81.146.198:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0"
-level=info msg="[ssh] 10.81.146.184:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0"
+level=info msg="[ssh] 10.81.146.254:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1"
+level=info msg="[ssh] 10.81.146.113:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1"
+level=info msg="[ssh] 10.81.146.51:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1"
+level=info msg="[ssh] 10.81.146.198:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1"
+level=info msg="[ssh] 10.81.146.184:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1"
 level=info msg="==> Running phase: Configure k0s"
 level=info msg="[ssh] 10.81.146.254:22: validating configuration"
 level=info msg="[ssh] 10.81.146.184:22: validating configuration"
@@ -220,7 +220,7 @@ level=info msg="[ssh] 10.81.146.51:22: waiting for node to become ready"
 level=info msg="==> Running phase: Release exclusive host lock"
 level=info msg="==> Running phase: Disconnect from hosts"
 level=info msg="==> Finished in 3m30s"
-level=info msg="k0s cluster version v1.26.13+k0s.0 is now installed"
+level=info msg="k0s cluster version v1.26.13+k0s.1 is now installed"
 level=info msg="Tip: To access the cluster you can now fetch the admin kubeconfig using:"
 level=info msg="     k0sctl kubeconfig"
 ```
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.26.13+k0s.0/k0s-v1.26.13+k0s.0-arm64 # replace version number!
+wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v1.26.13+k0s.1/k0s-v1.26.13+k0s.1-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.26.13+k0s.0
+v1.26.13+k0s.1
 ```
 
 To check if k0s's [system requirements](system-requirements.md) and [external
@@ -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.26.13+k0s.0
+Version: v1.26.13+k0s.1
 Process ID: 1631
 Role: worker
 Workloads: true
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.26.13+k0s.0
+- v1.26.13+k0s.1
 
-The Kubernetes version (1.26.13) 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.26.13) is the first part, and the last part (k0s.1) 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.26.13+k0s.0
-    INFO [ssh] 13.53.218.149:22: is running k0s worker version 1.26.13+k0s.0
+    INFO [ssh] 13.53.43.63:22: is running k0s controller version 1.26.13+k0s.1
+    INFO [ssh] 13.53.218.149:22: is running k0s worker version 1.26.13+k0s.1
     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.26.13+k0s.0
+    version: 1.26.13+k0s.1
 ```
 
 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.26.13+k0s.0 is now installed
+INFO[0027] k0s cluster version 1.26.13+k0s.1 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/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.26.13+k0s.0
+k0s_version=v1.26.13+k0s.1
 k8s_version=v1.26.13
 sonobuoy_version=0.53.2
 ```
 
 ### 2. Environment variables
 
 ```shell
-TF_VAR_k0s_version=v1.26.13+k0s.0 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.26.13 terraform apply
+TF_VAR_k0s_version=v1.26.13+k0s.1 TF_VAR_sonobuoy_version=0.20.0 TF_VAR_k8s_version=v1.26.13 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/sonobuoy/README.md b/inttest/sonobuoy/README.md
@@ -61,7 +61,7 @@ spec:
       user: "ubuntu"
     uploadBinary: true
   k0s:
-    version: "1.26.13+k0s.0"
+    version: "1.26.13+k0s.1"
 ```
 
 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.26.13+k0s.0
-INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0
-INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.0
+INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1
+INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1
+INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.26.13+k0s.1
 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.26.13+k0s.0 is now installed
+INFO k0s cluster version v1.26.13+k0s.1 is now installed
 INFO Tip: To access the cluster you can now fetch the admin kubeconfig using:
 INFO      k0sctl kubeconfig
 ```
diff --git a/inttest/update-server/html/unstable/index.yaml b/inttest/update-server/html/unstable/index.yaml
@@ -1,5 +1,5 @@
 name: unstable
-version: v1.26.13+k0s.0
+version: v1.26.13+k0s.1
 downloadURLs:
   k0s:
     linux-amd64: ..../k0s-amd64
