From 1513bf0a1e9baf6eae569f87f94c0908672ff26b Mon Sep 17 00:00:00 2001 From: Christian Hoffmeister Date: Fri, 13 Jan 2023 09:39:51 +0100 Subject: [PATCH] Update talos/k8s versions (#5) --- .github/workflows/test-e2e.yml | 12 ++++++------ Dockerfile | 2 +- README.md | 6 +++--- e2etests/00_test.go | 4 ++-- e2etests/02_add_node_test.go | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 196aea5..a2e3d3b 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -18,12 +18,12 @@ jobs: fail-fast: false matrix: version: - - talos: 1.2.6 - kubernetes: 1.23.13 - - talos: 1.2.6 - kubernetes: 1.24.7 - - talos: 1.2.6 - kubernetes: 1.25.3 + - talos: 1.2.8 + kubernetes: 1.23.15 + - talos: 1.2.8 + kubernetes: 1.24.9 + - talos: 1.2.8 + kubernetes: 1.25.5 steps: - uses: actions/setup-go@v2 with: diff --git a/Dockerfile b/Dockerfile index 206d367..660820c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,6 @@ RUN apk add ca-certificates FROM scratch ENTRYPOINT ["/bin/hcloud-talos"] COPY --from=ca-certificates /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -COPY --from=ghcr.io/siderolabs/talosctl:v1.2.6 /talosctl /bin/talosctl +COPY --from=ghcr.io/siderolabs/talosctl:v1.2.8 /talosctl /bin/talosctl COPY hcloud-talos /bin/hcloud-talos WORKDIR /workdir diff --git a/README.md b/README.md index dc23fd7..162e43a 100644 --- a/README.md +++ b/README.md @@ -21,9 +21,9 @@ cd my-cluster export HCLOUD_TOKEN=... # bootstrap cluster -hcloud-talos -v bootstrap-cluster --talos-version=1.2.6 --kubernetes-version=1.25.3 my-cluster controlplane-1 +hcloud-talos -v bootstrap-cluster --talos-version=1.2.8 --kubernetes-version=1.25.5 my-cluster controlplane-1 # add more nodes -hcloud-talos -v add-node --talos-version=1.2.6 controlplane-2 --controlplane -hcloud-talos -v add-node --talos-version=1.2.6 worker-1 +hcloud-talos -v add-node --talos-version=1.2.8 controlplane-2 --controlplane +hcloud-talos -v add-node --talos-version=1.2.8 worker-1 ``` diff --git a/e2etests/00_test.go b/e2etests/00_test.go index 3f17045..cbfe235 100644 --- a/e2etests/00_test.go +++ b/e2etests/00_test.go @@ -35,7 +35,7 @@ func TestMain(t *testing.M) { func setup() { talosVersion = os.Getenv("TALOS_VERSION") if talosVersion == "" { - talosVersion = "1.2.6" + talosVersion = "1.2.8" } talosctlUrl = fmt.Sprintf("https://github.com/siderolabs/talos/releases/download/v%s/talosctl-%s-%s", talosVersion, runtime.GOOS, runtime.GOARCH) talosctlBin = path.Join(os.TempDir(), fmt.Sprintf("talosctl-%s", talosVersion)) @@ -51,7 +51,7 @@ func setup() { kubernetesVersion = os.Getenv("KUBERNETES_VERSION") if kubernetesVersion == "" { - kubernetesVersion = "1.25.3" + kubernetesVersion = "1.25.5" } hcloudToken = os.Getenv("HCLOUD_TOKEN") diff --git a/e2etests/02_add_node_test.go b/e2etests/02_add_node_test.go index bc999f1..5deb2e1 100644 --- a/e2etests/02_add_node_test.go +++ b/e2etests/02_add_node_test.go @@ -12,7 +12,7 @@ func TestAddNode(t *testing.T) { ConfigFile: configFile, ServerType: "cx21", NodeName: "worker-01", - TalosVersion: "1.2.6", + TalosVersion: "1.2.8", }) assert.NoError(t, err) }