From d7e3c61a602a1034e410a4bc9d46b7719997582b Mon Sep 17 00:00:00 2001 From: Arnaud Meukam Date: Wed, 21 Aug 2024 20:42:55 +0200 Subject: [PATCH] Drop kops-ci references Ref: - https://github.com/kubernetes/k8s.io/issues/2625 Signed-off-by: Arnaud Meukam --- docs/contributing/test_versions.md | 10 +++++----- tests/e2e/e2e.mk | 2 +- tests/e2e/pkg/kops/download.go | 2 +- tests/e2e/scenarios/aws-boskos/run-test.sh | 2 +- tests/e2e/scenarios/build/run-test.sh | 2 +- .../e2e/scenarios/cilium-connectivity-test/run-test.sh | 2 +- tests/e2e/scenarios/kops-upgrade/run-test.sh | 2 +- tests/e2e/scenarios/lib/common.sh | 8 ++++---- .../scenarios/upgrade-ha-leader-migration/run-test.sh | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docs/contributing/test_versions.md b/docs/contributing/test_versions.md index 988721d10f..ed4265b5dc 100644 --- a/docs/contributing/test_versions.md +++ b/docs/contributing/test_versions.md @@ -11,15 +11,15 @@ After each successful merge to a release branch, the build is made available thr | branch | marker | |--------|--------| -| https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt | master branch | +| https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt | master branch | | https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.21/latest-ci.txt | kOps 1.21 release branch | | https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.22/latest-ci.txt | kOps 1.22 release branch | You can create a cluster using these markers using the following scripts: ```sh -marker="https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt" -export KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)" +marker="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt" +export KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)" wget -q "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops" chmod +x ./kops ./kops version @@ -34,8 +34,8 @@ When a PR builds successfully, you can test the PR using the following script: ```sh pr=13208 sha=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/kubernetes/kops/pulls/${pr} | jq -r .head.sha ) -export KOPS_BASE_URL="https://storage.googleapis.com/kops-ci/pulls/pull-kops-e2e-kubernetes-aws/pull-${sha}" +export KOPS_BASE_URL="https://storage.googleapis.com/k8s-staging-kops/pulls/pull-kops-aws-distro-debian12/pull-${sha}" wget -q "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops" chmod +x ./kops ./kops version -``` \ No newline at end of file +``` diff --git a/tests/e2e/e2e.mk b/tests/e2e/e2e.mk index a0746321c0..7fe8dee609 100644 --- a/tests/e2e/e2e.mk +++ b/tests/e2e/e2e.mk @@ -27,7 +27,7 @@ test-e2e-aws-simple-1-20: test-e2e-install -v 2 \ --build --up --down \ --cloud-provider=aws \ - --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \ + --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \ --kubernetes-version=https://dl.k8s.io/release/stable-1.20.txt \ --template-path=tests/e2e/templates/simple.yaml.tmpl \ --test=kops \ diff --git a/tests/e2e/pkg/kops/download.go b/tests/e2e/pkg/kops/download.go index 7863fd4e23..b7c6b5a035 100644 --- a/tests/e2e/pkg/kops/download.go +++ b/tests/e2e/pkg/kops/download.go @@ -28,7 +28,7 @@ import ( // DownloadKops will download the kops binary from the version marker URL // Returning the URL to use for KOPS_BASE_URL -// Example markerURL: https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt +// Example markerURL: https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt func DownloadKops(markerURL, downloadPath string) (string, error) { var b bytes.Buffer if err := util.HTTPGETWithHeaders(markerURL, nil, &b); err != nil { diff --git a/tests/e2e/scenarios/aws-boskos/run-test.sh b/tests/e2e/scenarios/aws-boskos/run-test.sh index e3b0da7849..a3d1907aa5 100755 --- a/tests/e2e/scenarios/aws-boskos/run-test.sh +++ b/tests/e2e/scenarios/aws-boskos/run-test.sh @@ -56,7 +56,7 @@ fi # Download latest prebuilt kOps if [[ -z "${KOPS_BASE_URL:-}" ]]; then - KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)" + KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)" fi export KOPS_BASE_URL diff --git a/tests/e2e/scenarios/build/run-test.sh b/tests/e2e/scenarios/build/run-test.sh index 4dad8276ec..fa58e61316 100755 --- a/tests/e2e/scenarios/build/run-test.sh +++ b/tests/e2e/scenarios/build/run-test.sh @@ -26,7 +26,7 @@ cd "${GOPATH}"/src/k8s.io/kubernetes kubetest2 kops -v=6 \ --up --down --build --build-kubernetes=true --target-build-arch=linux/amd64 \ --cloud-provider=gce --admin-access=0.0.0.0/0 \ - --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci.txt \ + --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt \ --create-args "--gce-service-account=default --networking=kubenet --set=spec.nodeProblemDetector.enabled=true" \ --test=kops \ -- \ diff --git a/tests/e2e/scenarios/cilium-connectivity-test/run-test.sh b/tests/e2e/scenarios/cilium-connectivity-test/run-test.sh index 4d0195016b..b27737b8a3 100755 --- a/tests/e2e/scenarios/cilium-connectivity-test/run-test.sh +++ b/tests/e2e/scenarios/cilium-connectivity-test/run-test.sh @@ -18,7 +18,7 @@ REPO_ROOT=$(git rev-parse --show-toplevel); source "${REPO_ROOT}"/tests/e2e/scenarios/lib/common.sh export KOPS_BASE_URL -KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)" +KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)" KOPS=$(kops-download-from-base) ARGS="--set=cluster.spec.networking.cilium.hubble.enabled=true --set=cluster.spec.certManager.enabled=true" diff --git a/tests/e2e/scenarios/kops-upgrade/run-test.sh b/tests/e2e/scenarios/kops-upgrade/run-test.sh index d9bb2d311b..789d3aaee2 100755 --- a/tests/e2e/scenarios/kops-upgrade/run-test.sh +++ b/tests/e2e/scenarios/kops-upgrade/run-test.sh @@ -34,7 +34,7 @@ ${KUBETEST2} \ --create-args="--networking calico" export KOPS_BASE_URL -KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)" +KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)" KOPS=$(kops-download-from-base) "${KOPS}" update cluster diff --git a/tests/e2e/scenarios/lib/common.sh b/tests/e2e/scenarios/lib/common.sh index 6d2614d1e3..3b31642081 100644 --- a/tests/e2e/scenarios/lib/common.sh +++ b/tests/e2e/scenarios/lib/common.sh @@ -41,7 +41,7 @@ export CHANNELS export KOPS_RUN_TOO_NEW_VERSION=1 -if [[ -z "${DISCOVERY_STORE-}" ]]; then +if [[ -z "${DISCOVERY_STORE-}" ]]; then DISCOVERY_STORE="${KOPS_STATE_STORE-}" fi @@ -98,7 +98,7 @@ function kops-base-from-marker() { if [[ "${1}" =~ ^https: ]]; then curl -fs "${1}" elif [[ "${1}" == "latest" ]]; then - curl -fs "https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt" + curl -fs "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt" else curl -fs "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-${1}/latest-ci.txt" fi @@ -107,7 +107,7 @@ function kops-base-from-marker() { # This function will download the latest kops if in a periodic job, otherwise build from the current tree function kops-acquire-latest() { if [[ "${JOB_TYPE-}" == "periodic" ]]; then - KOPS_BASE_URL="$(curl -fs https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)" + KOPS_BASE_URL="$(curl -fs https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)" KOPS=$(kops-download-from-base) CHANNELS=$(kops-channels-download-from-base) else @@ -150,4 +150,4 @@ function kops-up() { --create-args="${create_args}" \ --control-plane-count="${KOPS_CONTROL_PLANE_COUNT:-1}" \ --template-path="${KOPS_TEMPLATE-}" -} \ No newline at end of file +} diff --git a/tests/e2e/scenarios/upgrade-ha-leader-migration/run-test.sh b/tests/e2e/scenarios/upgrade-ha-leader-migration/run-test.sh index f48843414f..dd16bab7d9 100755 --- a/tests/e2e/scenarios/upgrade-ha-leader-migration/run-test.sh +++ b/tests/e2e/scenarios/upgrade-ha-leader-migration/run-test.sh @@ -30,7 +30,7 @@ fi # for periodic job, let kubetest2 fetch latest kops. Otherwise let kubetest2 build. if [[ "${JOB_TYPE-}" == "periodic" ]]; then - KUBETEST2="${KUBETEST2} --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt" + KUBETEST2="${KUBETEST2} --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt" else KUBETEST2="${KUBETEST2} --build" fi