From dd7b934fe6375992698fa96494cd34e87b67013c Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Fri, 2 Aug 2024 08:45:56 +0200 Subject: [PATCH] fix docker build script --- .github/workflows/e2e.yaml | 4 +--- test/e2e/config/ck8s-docker.yaml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 2e271af5..495a3d77 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -33,9 +33,7 @@ jobs: - name: Build k8s-snap image run: | cd templates/docker - # TODO(ben): required for the rollout upgrade test. Remove KUBERNETES_VERSION_OVERRIDE once we have a 1.31 release. - sudo docker build . -t k8s-snap:dev-old --build-arg BRANCH=main --build-arg KUBERNETES_VERSION_OVERRIDE=v1.29.6 - # TODO(ben): release-1.30 is missing extra-node-args hence we need to use main branch for now. + sudo docker build . -t k8s-snap:dev-old --build-arg BRANCH=main --build-arg KUBERNETES_VERSION=v1.29.6 sudo docker build . -t k8s-snap:dev-new --build-arg BRANCH=main - name: Save provider image run: | diff --git a/test/e2e/config/ck8s-docker.yaml b/test/e2e/config/ck8s-docker.yaml index 38ccb7b4..06134e12 100644 --- a/test/e2e/config/ck8s-docker.yaml +++ b/test/e2e/config/ck8s-docker.yaml @@ -86,7 +86,7 @@ providers: variables: KUBERNETES_VERSION_MANAGEMENT: "v1.28.0" KUBERNETES_VERSION: "v1.29.6" - KUBERNETES_VERSION_UPGRADE_TO: "v1.30.2" + KUBERNETES_VERSION_UPGRADE_TO: "v1.30.3" IP_FAMILY: "IPv4" KIND_IMAGE_VERSION: "v1.28.0"