From 9daacd80534400b0a44ee66c716c832e63787501 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Fri, 2 Feb 2024 18:29:59 +0100 Subject: [PATCH] Prepare v1.28.6+k0s.1 Signed-off-by: Tom Wieczorek --- .github/workflows/publish-docs-manual.yml | 2 +- docs/airgap-install.md | 2 +- docs/autopilot-multicommand.md | 8 ++++---- docs/autopilot.md | 4 ++-- docs/examples/ambassador-ingress.md | 4 ++-- docs/install.md | 2 +- docs/k0s-in-docker.md | 12 ++++++------ docs/k0s-multi-node.md | 6 +++--- docs/nllb.md | 14 +++++++------- docs/raspberry-pi4.md | 6 +++--- docs/releases.md | 2 +- docs/reset.md | 4 ++-- docs/upgrade.md | 4 ++-- inttest/sonobuoy/README.md | 10 +++++----- inttest/update-server/html/unstable/index.yaml | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index cb1d3df2aa29..e3c376a8d1b8 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.6+k0s.0")' + description: 'Version tag (e.g."v1.28.6+k0s.1")' required: true env: diff --git a/docs/airgap-install.md b/docs/airgap-install.md index 85d93741e85a..17b6b9d52f81 100644 --- a/docs/airgap-install.md +++ b/docs/airgap-install.md @@ -66,7 +66,7 @@ metadata: name: k0s-cluster spec: k0s: - version: {{{ extra.k8s_version }}}+k0s.0 + version: {{{ extra.k8s_version }}}+k0s.1 hosts: - role: controller ssh: diff --git a/docs/autopilot-multicommand.md b/docs/autopilot-multicommand.md index 601456609f8a..fef50c10130f 100644 --- 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: v{{{ extra.k8s_version }}}+k0s.0 + 9: version: v{{{ extra.k8s_version }}}+k0s.1 10: platforms: 11: linux-amd64: -12: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-airgap-bundle-v{{{ extra.k8s_version }}}+k0s.0-amd64 +12: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-airgap-bundle-v{{{ extra.k8s_version }}}+k0s.1-amd64 13: workers: 14: discovery: 15: static: 16: nodes: 17: - worker0 18: - k0supdate: -19: version: v{{{ extra.k8s_version }}}+k0s.0 +19: version: v{{{ extra.k8s_version }}}+k0s.1 20: platforms: 21: linux-amd64: -22: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64 +22: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-v{{{ extra.k8s_version }}}+k0s.1-amd64 23: targets: 24: controllers: 25: discovery: diff --git a/docs/autopilot.md b/docs/autopilot.md index 5849fa08951d..340c7306a60c 100644 --- a/docs/autopilot.md +++ b/docs/autopilot.md @@ -103,10 +103,10 @@ spec: commands: - k0supdate: - version: v{{{ extra.k8s_version }}}+k0s.0 + version: v{{{ extra.k8s_version }}}+k0s.1 platforms: linux-amd64: - url: https://github.com/k0sproject/k0s/releases/download/v1.28.6+k0s.0/k0s-v1.28.6+k0s.0-amd64 + url: https://github.com/k0sproject/k0s/releases/download/v1.28.6+k0s.1/k0s-v1.28.6+k0s.1-amd64 sha256: '0000000000000000000000000000000000000000000000000000000000000000' targets: controllers: diff --git a/docs/examples/ambassador-ingress.md b/docs/examples/ambassador-ingress.md index 656a36925b43..a323a2c75d8d 100644 --- 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:v{{{ extra.k8s_version }}}-k0s.0 + docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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:v{{{ extra.k8s_version }}}-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:v{{{ extra.k8s_version }}}-k0s.1 ``` After some time, you will be able to list the Ambassador Services: diff --git a/docs/install.md b/docs/install.md index 983c8f004d29..3b71c5678439 100644 --- 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: v{{{ extra.k8s_version }}}+k0s.0 + Version: v{{{ extra.k8s_version }}}+k0s.1 Process ID: 436 Role: controller Workloads: true diff --git a/docs/k0s-in-docker.md b/docs/k0s-in-docker.md index 619b75d8d924..c467348c0489 100644 --- 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:v{{{ extra.k8s_version }}}-k0s.0 -- ghcr.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0 +- docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1 +- ghcr.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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 `v{{{ extra.k8s_version }}}+k0s.0` is tagged as `docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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 `v{{{ extra.k8s_version }}}+k0s.1` is tagged as `docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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:v{{{ extra.k8s_version }}}-k0s.0 +docker run -d --name k0s --hostname k0s --privileged -v /var/lib/k0s -p 6443:6443 docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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:v{{{ extra.k8s_version }}}-k0s.0 k0s worker $token + docker run -d --name k0s-worker1 --hostname k0s-worker1 --privileged -v /var/lib/k0s docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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:v{{{ extra.k8s_version }}}-k0s.0 + image: docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-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 index 62988945c34d..d675de9e609b 100644 --- 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=v{{{ extra.k8s_version }}}+k0s.0` | Select the version of k0s to be installed | +| `K0S_VERSION=v{{{ extra.k8s_version }}}+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=v{{{ extra.k8s_version }}}+k0s.0 sh +curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v{{{ extra.k8s_version }}}+k0s.1 sh ``` ### 2. Bootstrap a controller node @@ -126,7 +126,7 @@ To get general information about your k0s instance's status: ``` ```shell -Version: v{{{ extra.k8s_version }}}+k0s.0 +Version: v{{{ extra.k8s_version }}}+k0s.1 Process ID: 2769 Parent Process ID: 1 Role: controller diff --git a/docs/nllb.md b/docs/nllb.md index 74846492704c..dfbc9f48dfbc 100644 --- a/docs/nllb.md +++ b/docs/nllb.md @@ -85,7 +85,7 @@ metadata: name: k0s-cluster spec: k0s: - version: v{{{ extra.k8s_version }}}+k0s.0 + version: v{{{ extra.k8s_version }}}+k0s.1 config: spec: network: @@ -173,11 +173,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-v{{{ extra.k8s_version }}}+k0s.0" -level=info msg="[ssh] 10.81.146.113:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0" -level=info msg="[ssh] 10.81.146.51:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0" -level=info msg="[ssh] 10.81.146.198:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0" -level=info msg="[ssh] 10.81.146.184:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.0" +level=info msg="[ssh] 10.81.146.254:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1" +level=info msg="[ssh] 10.81.146.113:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1" +level=info msg="[ssh] 10.81.146.51:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1" +level=info msg="[ssh] 10.81.146.198:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+k0s.1" +level=info msg="[ssh] 10.81.146.184:22: uploading k0s binary from /home/k0sctl/.cache/k0sctl/k0s/linux/amd64/k0s-v{{{ extra.k8s_version }}}+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" @@ -217,7 +217,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 v{{{ extra.k8s_version }}}+k0s.0 is now installed" +level=info msg="k0s cluster version v{{{ extra.k8s_version }}}+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 index b82de3f758ae..895ed05dc89c 100644 --- 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/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-arm64 # replace version number! +wget -O /tmp/k0s https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-v{{{ extra.k8s_version }}}+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 -v{{{ extra.k8s_version }}}+k0s.0 +v{{{ extra.k8s_version }}}+k0s.1 ``` To check if k0s's [system requirements](system-requirements.md) and [external @@ -451,7 +451,7 @@ As this is a worker node, we cannot access the Kubernetes API via the builtin ```console ubuntu@ubuntu:~$ sudo k0s status -Version: v{{{ extra.k8s_version }}}+k0s.0 +Version: v{{{ extra.k8s_version }}}+k0s.1 Process ID: 1631 Role: worker Workloads: true diff --git a/docs/releases.md b/docs/releases.md index c3b338d44f7a..4b0aa706bb66 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -30,6 +30,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: -- v{{{ extra.k8s_version }}}+k0s.0 +- v{{{ extra.k8s_version }}}+k0s.1 The Kubernetes version ({{{ extra.k8s_version }}}) 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 index 8d6a56dc6640..c3a9f153b37e 100644 --- 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 {{{ extra.k8s_version }}}+k0s.0 - INFO [ssh] 13.53.218.149:22: is running k0s worker version {{{ extra.k8s_version }}}+k0s.0 + INFO [ssh] 13.53.43.63:22: is running k0s controller version {{{ extra.k8s_version }}}+k0s.1 + INFO [ssh] 13.53.218.149:22: is running k0s worker version {{{ extra.k8s_version }}}+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 index 146eb3bc09b8..e5acd710e252 100644 --- 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: {{{ extra.k8s_version }}}+k0s.0 + version: {{{ extra.k8s_version }}}+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 {{{ extra.k8s_version }}}+k0s.0 is now installed +INFO[0027] k0s cluster version {{{ extra.k8s_version }}}+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/sonobuoy/README.md b/inttest/sonobuoy/README.md index 5339b459c68b..3c0682c4e4e9 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.28.6+k0s.0" + version: "1.28.6+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.28.6+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.1 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+k0s.1 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.28.6+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.28.6+k0s.0 is now installed +INFO k0s cluster version v1.28.6+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 index 9db3af535641..7778467887f7 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.6+k0s.0 +version: v1.28.6+k0s.1 downloadURLs: k0s: linux-amd64: ..../k0s-amd64