From 4eb9a7f5a1f28d3c245888dfd3e4403d986b7081 Mon Sep 17 00:00:00 2001 From: Christian Schlotter Date: Tue, 6 Aug 2024 15:02:22 +0200 Subject: [PATCH] fix for pre-releases --- .../main/base/patch-k8s-install-script-kcp.yaml | 3 +++ .../main/base/patch-k8s-install-script-kct.yaml | 3 +++ .../main/clusterclass/patch-k8s-install-script.yaml | 6 ++++++ .../main/base/patch-k8s-install-script-kcp.yaml | 3 +++ .../main/base/patch-k8s-install-script-kct.yaml | 3 +++ .../main/clusterclass/patch-k8s-install-script.yaml | 6 ++++++ 6 files changed, 24 insertions(+) diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kcp.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kcp.yaml index 060b49613c..12c33d21a9 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kcp.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kcp.yaml @@ -78,6 +78,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml index 4ebf30cc17..75f62edc3e 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/base/patch-k8s-install-script-kct.yaml @@ -81,6 +81,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl diff --git a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml index e04d690a6f..83d4461dda 100644 --- a/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml +++ b/test/e2e/data/infrastructure-vsphere-govmomi/main/clusterclass/patch-k8s-install-script.yaml @@ -84,6 +84,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl @@ -201,6 +204,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kcp.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kcp.yaml index 060b49613c..12c33d21a9 100644 --- a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kcp.yaml +++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kcp.yaml @@ -78,6 +78,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kct.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kct.yaml index 4ebf30cc17..75f62edc3e 100644 --- a/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kct.yaml +++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/base/patch-k8s-install-script-kct.yaml @@ -81,6 +81,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl diff --git a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-k8s-install-script.yaml b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-k8s-install-script.yaml index e04d690a6f..83d4461dda 100644 --- a/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-k8s-install-script.yaml +++ b/test/e2e/data/infrastructure-vsphere-supervisor/main/clusterclass/patch-k8s-install-script.yaml @@ -84,6 +84,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl @@ -201,6 +204,9 @@ systemctl restart kubelet else CI_URL="https://dl.k8s.io/ci/$${KUBERNETES_VERSION}/bin/linux/amd64" + if [[ "$${KUBERNETES_VERSION}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+-(beta|rc).[0-9]+$ ]]; then + CI_URL="https://dl.k8s.io/release/$${KUBERNETES_VERSION}/bin/linux/amd64" + fi for CI_PACKAGE in "$${PACKAGES_TO_TEST[@]}"; do # Browser: https://console.cloud.google.com/storage/browser/k8s-release-dev?project=k8s-release-dev # e.g.: https://storage.googleapis.com/k8s-release-dev/ci/v1.21.0-beta.1.378+cf3374e43491c5/bin/linux/amd64/kubectl