From 3fb49a02ec6030baa4d39dbcd8761ad7717646df Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Mon, 19 Feb 2024 13:08:08 +0100 Subject: [PATCH 1/2] Revert "Prepare v1.29.1+k0s.1" This reverts commit c4c4cb2b233fa8e6f7704afeb31a1e8ff71dacb3. The next release will be a regular one, so change k0s.1 to k0s.0 again. 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 ++-- docs/verifying-signs.md | 4 ++-- inttest/sonobuoy/README.md | 10 +++++----- inttest/update-server/html/unstable/index.yaml | 2 +- 16 files changed, 43 insertions(+), 43 deletions(-) diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index 7ad39b1d189b..f67acd694a1d 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.29.1+k0s.1")' + description: 'Version tag (e.g."v1.29.1+k0s.0")' required: true env: diff --git a/docs/airgap-install.md b/docs/airgap-install.md index 17b6b9d52f81..85d93741e85a 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.1 + version: {{{ extra.k8s_version }}}+k0s.0 hosts: - role: controller ssh: diff --git a/docs/autopilot-multicommand.md b/docs/autopilot-multicommand.md index fef50c10130f..601456609f8a 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.1 + 9: version: v{{{ extra.k8s_version }}}+k0s.0 10: platforms: 11: linux-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 +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 13: workers: 14: discovery: 15: static: 16: nodes: 17: - worker0 18: - k0supdate: -19: version: v{{{ extra.k8s_version }}}+k0s.1 +19: version: v{{{ extra.k8s_version }}}+k0s.0 20: platforms: 21: linux-amd64: -22: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-v{{{ extra.k8s_version }}}+k0s.1-amd64 +22: url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64 23: targets: 24: controllers: 25: discovery: diff --git a/docs/autopilot.md b/docs/autopilot.md index 5f3585505e27..56689c025021 100644 --- a/docs/autopilot.md +++ b/docs/autopilot.md @@ -103,10 +103,10 @@ spec: commands: - k0supdate: - version: v{{{ extra.k8s_version }}}+k0s.1 + version: v{{{ extra.k8s_version }}}+k0s.0 platforms: linux-amd64: - url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.1/k0s-v{{{ extra.k8s_version }}}+k0s.1-amd64 + url: https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}+k0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64 sha256: '0000000000000000000000000000000000000000000000000000000000000000' targets: controllers: diff --git a/docs/examples/ambassador-ingress.md b/docs/examples/ambassador-ingress.md index a323a2c75d8d..656a36925b43 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.1 + 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 ``` 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.1 + 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 ``` After some time, you will be able to list the Ambassador Services: diff --git a/docs/install.md b/docs/install.md index 3b71c5678439..983c8f004d29 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.1 + Version: v{{{ extra.k8s_version }}}+k0s.0 Process ID: 436 Role: controller Workloads: true diff --git a/docs/k0s-in-docker.md b/docs/k0s-in-docker.md index d30453911472..a2b71e12ab0a 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.1 -- ghcr.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.1 +- docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0 +- ghcr.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`. +**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`. ## 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.1 +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 ``` **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.1 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.0 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.1 + image: docker.io/k0sproject/k0s:v{{{ extra.k8s_version }}}-k0s.0 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 d675de9e609b..62988945c34d 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.1` | Select the version of k0s to be installed | +| `K0S_VERSION=v{{{ extra.k8s_version }}}+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=v{{{ extra.k8s_version }}}+k0s.1 sh +curl -sSLf https://get.k0s.sh | sudo K0S_VERSION=v{{{ extra.k8s_version }}}+k0s.0 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.1 +Version: v{{{ extra.k8s_version }}}+k0s.0 Process ID: 2769 Parent Process ID: 1 Role: controller diff --git a/docs/nllb.md b/docs/nllb.md index 6489a4633c50..bdcc10c748bc 100644 --- a/docs/nllb.md +++ b/docs/nllb.md @@ -82,7 +82,7 @@ metadata: name: k0s-cluster spec: k0s: - version: v{{{ extra.k8s_version }}}+k0s.1 + version: v{{{ extra.k8s_version }}}+k0s.0 config: spec: network: @@ -170,11 +170,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.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="[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="==> 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" @@ -214,7 +214,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.1 is now installed" +level=info msg="k0s cluster version v{{{ extra.k8s_version }}}+k0s.0 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 993cc3256a98..067e4bb5b493 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.1/k0s-v{{{ extra.k8s_version }}}+k0s.1-arm64 # replace version number! +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! 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.1 +v{{{ extra.k8s_version }}}+k0s.0 ``` 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.1 +Version: v{{{ extra.k8s_version }}}+k0s.0 Process ID: 1631 Role: worker Workloads: true diff --git a/docs/releases.md b/docs/releases.md index 4b0aa706bb66..c3b338d44f7a 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.1 +- v{{{ extra.k8s_version }}}+k0s.0 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 c3a9f153b37e..8d6a56dc6640 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.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: 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: 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 e5acd710e252..146eb3bc09b8 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.1 + version: {{{ extra.k8s_version }}}+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 {{{ extra.k8s_version }}}+k0s.1 is now installed +INFO[0027] k0s cluster version {{{ extra.k8s_version }}}+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/verifying-signs.md b/docs/verifying-signs.md index 90727bcbd0ba..495ff73869d5 100644 --- a/docs/verifying-signs.md +++ b/docs/verifying-signs.md @@ -7,6 +7,6 @@ Binaries can be verified using the `cosign` tool, for example: ```shell cosign verify-blob \ --key https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}%2Bk0s.0/cosign.pub \ - --signature https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}%2Bk0s.0/k0s-v1.29.1+k0s.1-amd64.sig \ - --payload k0s-v{{{ extra.k8s_version }}}+k0s.1-amd64 + --signature https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}%2Bk0s.0/k0s-v1.29.1+k0s.0-amd64.sig \ + --payload k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64 ``` diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index ec8c19a3f791..0ce84392902b 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.29.1+k0s.1" + version: "1.29.1+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.29.1+k0s.1 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+k0s.1 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+k0s.1 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+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.29.1+k0s.1 is now installed +INFO k0s cluster version v1.29.1+k0s.0 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 56303a904d52..b5311c04a48d 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.29.1+k0s.1 +version: v1.29.1+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 From 001f42eb055ccd14a12802402cf2ba453ca715e2 Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Mon, 19 Feb 2024 10:05:26 +0100 Subject: [PATCH 2/2] Bump Kubernetes to v1.29.2 https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#changelog-since-v1291 Signed-off-by: Tom Wieczorek (cherry picked from commit 94e4c06c4d25d6ffebc3c82b8a39ae9eb4d8345c) --- .github/workflows/publish-docs-manual.yml | 2 +- docs/verifying-signs.md | 2 +- embedded-bins/Makefile.variables | 2 +- examples/bootloose-ha-controllers/Dockerfile | 2 +- go.mod | 98 +++++++++---------- go.sum | 72 +++++++------- hack/tool/go.mod | 4 +- hack/tool/go.sum | 12 +-- inttest/sonobuoy/README.md | 12 +-- .../update-server/html/unstable/index.yaml | 2 +- pkg/constant/constant_shared.go | 2 +- 11 files changed, 105 insertions(+), 105 deletions(-) diff --git a/.github/workflows/publish-docs-manual.yml b/.github/workflows/publish-docs-manual.yml index f67acd694a1d..2989cd2bd10d 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.29.1+k0s.0")' + description: 'Version tag (e.g."v1.29.2+k0s.0")' required: true env: diff --git a/docs/verifying-signs.md b/docs/verifying-signs.md index 495ff73869d5..b85b6dcefd51 100644 --- a/docs/verifying-signs.md +++ b/docs/verifying-signs.md @@ -7,6 +7,6 @@ Binaries can be verified using the `cosign` tool, for example: ```shell cosign verify-blob \ --key https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}%2Bk0s.0/cosign.pub \ - --signature https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}%2Bk0s.0/k0s-v1.29.1+k0s.0-amd64.sig \ + --signature https://github.com/k0sproject/k0s/releases/download/v{{{ extra.k8s_version }}}%2Bk0s.0/k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64.sig \ --payload k0s-v{{{ extra.k8s_version }}}+k0s.0-amd64 ``` diff --git a/embedded-bins/Makefile.variables b/embedded-bins/Makefile.variables index 96161e154eea..52c602d9dfd5 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.29.1 +kubernetes_version = 1.29.2 helm_version = 3.11.1 kubernetes_buildimage = $(golang_buildimage) kubernetes_build_go_tags = "providerless" diff --git a/examples/bootloose-ha-controllers/Dockerfile b/examples/bootloose-ha-controllers/Dockerfile index be55ca75ef0e..32cca204d7da 100644 --- a/examples/bootloose-ha-controllers/Dockerfile +++ b/examples/bootloose-ha-controllers/Dockerfile @@ -2,7 +2,7 @@ FROM quay.io/k0sproject/bootloose-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.29.1/bin/linux/amd64/kubectl && \ +RUN curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.29.2/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 5a779ec728d2..b867ab63aabe 100644 --- a/go.mod +++ b/go.mod @@ -68,20 +68,20 @@ require ( // Kubernetes require ( - k8s.io/api v0.29.1 - k8s.io/apiextensions-apiserver v0.29.1 - k8s.io/apimachinery v0.29.1 - k8s.io/cli-runtime v0.29.1 - k8s.io/client-go v0.29.1 - k8s.io/cloud-provider v0.29.1 - k8s.io/component-base v0.29.1 - k8s.io/component-helpers v0.29.1 - k8s.io/cri-api v0.29.1 - k8s.io/kube-aggregator v0.29.1 - k8s.io/kubectl v0.29.1 - k8s.io/kubelet v0.29.1 - k8s.io/kubernetes v1.29.1 - k8s.io/mount-utils v0.29.1 + k8s.io/api v0.29.2 + k8s.io/apiextensions-apiserver v0.29.2 + k8s.io/apimachinery v0.29.2 + k8s.io/cli-runtime v0.29.2 + k8s.io/client-go v0.29.2 + k8s.io/cloud-provider v0.29.2 + k8s.io/component-base v0.29.2 + k8s.io/component-helpers v0.29.2 + k8s.io/cri-api v0.29.2 + k8s.io/kube-aggregator v0.29.2 + k8s.io/kubectl v0.29.2 + k8s.io/kubelet v0.29.2 + k8s.io/kubernetes v1.29.2 + k8s.io/mount-utils v0.29.2 k8s.io/utils v0.0.0-20230726121419-3b25d923346b sigs.k8s.io/controller-runtime v0.17.0 sigs.k8s.io/yaml v1.4.0 @@ -274,12 +274,12 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiserver v0.29.1 // indirect - k8s.io/controller-manager v0.29.1 // indirect + k8s.io/apiserver v0.29.2 // indirect + k8s.io/controller-manager v0.29.2 // indirect k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kms v0.29.1 // indirect + k8s.io/kms v0.29.2 // indirect k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/metrics v0.29.1 // indirect + k8s.io/metrics v0.29.2 // indirect oras.land/oras-go v1.2.4 // indirect sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect @@ -291,35 +291,35 @@ require ( // Replacements duplicated from upstream Kubernetes replace ( - // https://github.com/kubernetes/kubernetes/blob/v1.29.1/go.mod#L251-L282 - k8s.io/api => k8s.io/api v0.29.1 - k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.1 - k8s.io/apimachinery => k8s.io/apimachinery v0.29.1 - k8s.io/apiserver => k8s.io/apiserver v0.29.1 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.1 - k8s.io/client-go => k8s.io/client-go v0.29.1 - k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.1 - k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.1 - k8s.io/code-generator => k8s.io/code-generator v0.29.1 - k8s.io/component-base => k8s.io/component-base v0.29.1 - k8s.io/component-helpers => k8s.io/component-helpers v0.29.1 - k8s.io/controller-manager => k8s.io/controller-manager v0.29.1 - k8s.io/cri-api => k8s.io/cri-api v0.29.1 - k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.1 - k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.1 - k8s.io/endpointslice => k8s.io/endpointslice v0.29.1 - k8s.io/kms => k8s.io/kms v0.29.1 - k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.1 - k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.1 - k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.1 - k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.1 - k8s.io/kubectl => k8s.io/kubectl v0.29.1 - k8s.io/kubelet => k8s.io/kubelet v0.29.1 - k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.1 - k8s.io/metrics => k8s.io/metrics v0.29.1 - k8s.io/mount-utils => k8s.io/mount-utils v0.29.1 - k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.1 - k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.1 - k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.1 - k8s.io/sample-controller => k8s.io/sample-controller v0.29.1 + // https://github.com/kubernetes/kubernetes/blob/v1.29.2/go.mod#L251-L282 + k8s.io/api => k8s.io/api v0.29.2 + k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2 + k8s.io/apimachinery => k8s.io/apimachinery v0.29.2 + k8s.io/apiserver => k8s.io/apiserver v0.29.2 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2 + k8s.io/client-go => k8s.io/client-go v0.29.2 + k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2 + k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.2 + k8s.io/code-generator => k8s.io/code-generator v0.29.2 + k8s.io/component-base => k8s.io/component-base v0.29.2 + k8s.io/component-helpers => k8s.io/component-helpers v0.29.2 + k8s.io/controller-manager => k8s.io/controller-manager v0.29.2 + k8s.io/cri-api => k8s.io/cri-api v0.29.2 + k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.2 + k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.2 + k8s.io/endpointslice => k8s.io/endpointslice v0.29.2 + k8s.io/kms => k8s.io/kms v0.29.2 + k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.2 + k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.2 + k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.2 + k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.2 + k8s.io/kubectl => k8s.io/kubectl v0.29.2 + k8s.io/kubelet => k8s.io/kubelet v0.29.2 + k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.2 + k8s.io/metrics => k8s.io/metrics v0.29.2 + k8s.io/mount-utils => k8s.io/mount-utils v0.29.2 + k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.2 + k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.2 + k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.2 + k8s.io/sample-controller => k8s.io/sample-controller v0.29.2 ) diff --git a/go.sum b/go.sum index da536353242d..3b883d523522 100644 --- a/go.sum +++ b/go.sum @@ -920,46 +920,46 @@ helm.sh/helm/v3 v3.14.0 h1:TaZIH6uOchn7L27ptwnnuHJiFrT/BsD4dFdp/HLT2nM= helm.sh/helm/v3 v3.14.0/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= -k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ= -k8s.io/apiextensions-apiserver v0.29.1 h1:S9xOtyk9M3Sk1tIpQMu9wXHm5O2MX6Y1kIpPMimZBZw= -k8s.io/apiextensions-apiserver v0.29.1/go.mod h1:zZECpujY5yTW58co8V2EQR4BD6A9pktVgHhvc0uLfeU= -k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc= -k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/apiserver v0.29.1 h1:e2wwHUfEmMsa8+cuft8MT56+16EONIEK8A/gpBSco+g= -k8s.io/apiserver v0.29.1/go.mod h1:V0EpkTRrJymyVT3M49we8uh2RvXf7fWC5XLB0P3SwRw= -k8s.io/cli-runtime v0.29.1 h1:By3WVOlEWYfyxhGko0f/IuAOLQcbBSMzwSaDren2JUs= -k8s.io/cli-runtime v0.29.1/go.mod h1:vjEY9slFp8j8UoMhV5AlO8uulX9xk6ogfIesHobyBDU= -k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A= -k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks= -k8s.io/cloud-provider v0.29.1 h1:bDLpOSpysWrtU2PCkvyP2sUTwRBa6MGCmxt68CRRW/8= -k8s.io/cloud-provider v0.29.1/go.mod h1:u50Drm6AbuoKpsVbAstNiFHGgbSVHuJV4TWN5imdM2w= -k8s.io/component-base v0.29.1 h1:MUimqJPCRnnHsskTTjKD+IC1EHBbRCVyi37IoFBrkYw= -k8s.io/component-base v0.29.1/go.mod h1:fP9GFjxYrLERq1GcWWZAE3bqbNcDKDytn2srWuHTtKc= -k8s.io/component-helpers v0.29.1 h1:54MMEDu6xeJmMtAKztsPwu0kJKr4+jCUzaEIn2UXRoc= -k8s.io/component-helpers v0.29.1/go.mod h1:+I7xz4kfUgxWAPJIVKrqe4ml4rb9UGpazlOmhXYo+cY= -k8s.io/controller-manager v0.29.1 h1:bTnJFF/OWooRVeJ4QLA1ApuPH+fjHSmcVMMeL7qvI2E= -k8s.io/controller-manager v0.29.1/go.mod h1:fVhGGuBiB0B2yT2+OHXZaA88owVn5zkv18A+G9E9Qlw= -k8s.io/cri-api v0.29.1 h1:pQwYDahnAX9K8KtdV8PD1eeNexMJojEj1t/5kAMX61E= -k8s.io/cri-api v0.29.1/go.mod h1:9fQTFm+wi4FLyqrkVUoMJiUB3mE74XrVvHz8uFY/sSw= +k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= +k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg= +k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8= +k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= +k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/apiserver v0.29.2 h1:+Z9S0dSNr+CjnVXQePG8TcBWHr3Q7BmAr7NraHvsMiQ= +k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ= +k8s.io/cli-runtime v0.29.2 h1:smfsOcT4QujeghsNjECKN3lwyX9AwcFU0nvJ7sFN3ro= +k8s.io/cli-runtime v0.29.2/go.mod h1:KLisYYfoqeNfO+MkTWvpqIyb1wpJmmFJhioA0xd4MW8= +k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= +k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= +k8s.io/cloud-provider v0.29.2 h1:ghKNXoQmeP8Fj/YTJNR6xQOzNrKXt6YZyy6mOEEa3yg= +k8s.io/cloud-provider v0.29.2/go.mod h1:KAp+07AUGmxcLnoLY5FndU4hj6158KMbiviNgctNRUk= +k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= +k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= +k8s.io/component-helpers v0.29.2 h1:1kTIanIdqUVG2nW3e2ENVEaYbZKphqPgEdCmJvk71aw= +k8s.io/component-helpers v0.29.2/go.mod h1:gFc/p60rYtpD8UCcNfPCmbokHT2uy0yDpmr/KKUMNAw= +k8s.io/controller-manager v0.29.2 h1:S99UKzjvyFWG4WZWaWQ+iu64X9axwzbi4152tFd73+4= +k8s.io/controller-manager v0.29.2/go.mod h1:xghbiyv5l/SVA5yVvRuGDmNVJEGl7MQqPAD0hvjZLhM= +k8s.io/cri-api v0.29.2 h1:LLSeWVC3h1nVMpV9vHiE+mO3spDYmz/C0GvxH6p6tkg= +k8s.io/cri-api v0.29.2/go.mod h1:9fQTFm+wi4FLyqrkVUoMJiUB3mE74XrVvHz8uFY/sSw= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kms v0.29.1 h1:6dMOaxllwiAZ8p3Hys65b78MDG+hONpBBpk1rQsaEtk= -k8s.io/kms v0.29.1/go.mod h1:Hqkx3zEGWThUTbcSkK508DUv4c1HOJOB5qihSoLBWgU= -k8s.io/kube-aggregator v0.29.1 h1:ArCHuHNT2vNOQbrFBjt23nUs+08w1KcLABuWUinOD4U= -k8s.io/kube-aggregator v0.29.1/go.mod h1:Wdf0L0CWYwhUKs+KaYiM+NwqkZTp0Erd/wgefvyZBwQ= +k8s.io/kms v0.29.2 h1:MDsbp98gSlEQs7K7dqLKNNTwKFQRYYvO4UOlBOjNy6Y= +k8s.io/kms v0.29.2/go.mod h1:s/9RC4sYRZ/6Tn6yhNjbfJuZdb8LzlXhdlBnKizeFDo= +k8s.io/kube-aggregator v0.29.2 h1:z9qJn5wlGmGaX6EfM7OEhr6fq6SBjDKR6tPRZ/qgxeY= +k8s.io/kube-aggregator v0.29.2/go.mod h1:QEuwzmMJJsg0eg1Gv+u4cWcYeJG2+8vN8/nTXBzopUo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubectl v0.29.1 h1:rWnW3hi/rEUvvg7jp4iYB68qW5un/urKbv7fu3Vj0/s= -k8s.io/kubectl v0.29.1/go.mod h1:SZzvLqtuOJYSvZzPZR9weSuP0wDQ+N37CENJf0FhDF4= -k8s.io/kubelet v0.29.1 h1:cso8Dk8dymkj8q+EvW/aCbIYU2aOkH27gho48tYza/8= -k8s.io/kubelet v0.29.1/go.mod h1:hTl/naFcCVG1Ku17fMgj/krbheBwBkf3gnFhaboMx7E= -k8s.io/kubernetes v1.29.1 h1:fxJFVb8uqbYZDYHpwIsAndBQs360cQGb0xa1gYFh3fo= -k8s.io/kubernetes v1.29.1/go.mod h1:xZPKU0yO0CBbLTnbd+XGyRmmtmaVuJykDb8gNCkeeUE= -k8s.io/metrics v0.29.1 h1:qutc3aIPMCniMuEApuLaeYX47rdCn8eycVDx7R6wMlQ= -k8s.io/metrics v0.29.1/go.mod h1:JrbV2U71+v7d/9qb90UVKL8r0uJ6Z2Hy4V7mDm05cKs= -k8s.io/mount-utils v0.29.1 h1:veXlIm52Y4tm3H0pG03cOdkw0KOJxYDa0fQqhJCoqvQ= -k8s.io/mount-utils v0.29.1/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y= +k8s.io/kubectl v0.29.2 h1:uaDYaBhumvkwz0S2XHt36fK0v5IdNgL7HyUniwb2IUo= +k8s.io/kubectl v0.29.2/go.mod h1:BhizuYBGcKaHWyq+G7txGw2fXg576QbPrrnQdQDZgqI= +k8s.io/kubelet v0.29.2 h1:bQ2StqkUqPCFNLtGLsb3v3O2LKQHXNMju537zOGboRg= +k8s.io/kubelet v0.29.2/go.mod h1:i5orNPqW/fAMrqptbCXFW/vLBBP12TZZc41IrrvF7SY= +k8s.io/kubernetes v1.29.2 h1:8hh1cntqdulanjQt7wSSSsJfBgOyx6fUdFWslvGL5m0= +k8s.io/kubernetes v1.29.2/go.mod h1:xZPKU0yO0CBbLTnbd+XGyRmmtmaVuJykDb8gNCkeeUE= +k8s.io/metrics v0.29.2 h1:oLSTHEr40V7c7C8wDRRhiAefjGRHROK5zeV8NT0tpzc= +k8s.io/metrics v0.29.2/go.mod h1:cWzACDpKElWhm0CElwfK+7I39wDNbmDDCX7hywjvgR4= +k8s.io/mount-utils v0.29.2 h1:FrUfgvOo63nqJRPXKoqN/DW1lMnR/y0pzpFErKh6p2o= +k8s.io/mount-utils v0.29.2/go.mod h1:9IWJTMe8tG0MYMLEp60xK9GYVeCdA3g4LowmnVi+t9Y= k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= k8s.io/utils v0.0.0-20230726121419-3b25d923346b/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 3a48e15953ed..b2afa91e1c1c 100644 --- a/hack/tool/go.mod +++ b/hack/tool/go.mod @@ -94,8 +94,8 @@ require ( google.golang.org/protobuf v1.31.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apimachinery v0.29.1 // indirect - k8s.io/client-go v0.29.1 // indirect + k8s.io/apimachinery v0.29.2 // indirect + k8s.io/client-go v0.29.2 // indirect k8s.io/klog/v2 v2.110.1 // indirect k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect diff --git a/hack/tool/go.sum b/hack/tool/go.sum index 6c98ef8576f3..25fee66aa185 100644 --- a/hack/tool/go.sum +++ b/hack/tool/go.sum @@ -342,12 +342,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.29.1 h1:DAjwWX/9YT7NQD4INu49ROJuZAAAP/Ijki48GUPzxqw= -k8s.io/api v0.29.1/go.mod h1:7Kl10vBRUXhnQQI8YR/R327zXC8eJ7887/+Ybta+RoQ= -k8s.io/apimachinery v0.29.1 h1:KY4/E6km/wLBguvCZv8cKTeOwwOBqFNjwJIdMkMbbRc= -k8s.io/apimachinery v0.29.1/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/client-go v0.29.1 h1:19B/+2NGEwnFLzt0uB5kNJnfTsbV8w6TgQRz9l7ti7A= -k8s.io/client-go v0.29.1/go.mod h1:TDG/psL9hdet0TI9mGyHJSgRkW3H9JZk2dNEUS7bRks= +k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= +k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= +k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= +k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= +k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= +k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= diff --git a/inttest/sonobuoy/README.md b/inttest/sonobuoy/README.md index 0ce84392902b..9263502fe3a7 100644 --- a/inttest/sonobuoy/README.md +++ b/inttest/sonobuoy/README.md @@ -61,7 +61,7 @@ spec: user: "ubuntu" uploadBinary: true k0s: - version: "1.29.1+k0s.0" + version: "1.29.2+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.29.1+k0s.0 -INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+k0s.0 -INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.1+k0s.0 +INFO [ssh] 3.250.52.147:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.2+k0s.0 +INFO [ssh] 63.32.21.232:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.2+k0s.0 +INFO [ssh] 54.216.71.108:22: uploading k0s binary from /home/ubuntu/.cache/k0sctl/k0s/linux/amd64/k0s-v1.29.2+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.29.1+k0s.0 is now installed +INFO k0s cluster version v1.29.2+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.29.1 + --kubernetes-version=v1.29.2 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 b5311c04a48d..38cddccd23c8 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.29.1+k0s.0 +version: v1.29.2+k0s.0 downloadURLs: k0s: linux-amd64: ..../k0s-amd64 diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index 3406b95991cf..dc71e5e79130 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -78,7 +78,7 @@ const ( MetricsImage = "registry.k8s.io/metrics-server/metrics-server" MetricsImageVersion = "v0.6.4" KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.29.1" + KubeProxyImageVersion = "v1.29.2" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.11.1" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless"