From cbd67f42667b7b46db147fa5bac3cc37dfe28f91 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 09:20:46 -0700
Subject: [PATCH 1/7] config/jobs: use kubernetes-release-dev for deprecated
 build jobs

jobs affected:
- ci-kubernetes-build-deprecated
- ci-kubernetes-build-deprecated-1-21
- ci-kubernetes-build-1-20-deprecated
- ci-kubernetes-build-1-19-deprecated
---
 config/jobs/kubernetes/sig-release/kubernetes-builds.yaml        | 1 +
 config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml | 1 +
 config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml | 1 +
 config/jobs/kubernetes/sig-release/release-branch-jobs/1.21.yaml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/config/jobs/kubernetes/sig-release/kubernetes-builds.yaml b/config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
index a0af6d464614..c2620ef944ee 100644
--- a/config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
+++ b/config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
@@ -43,6 +43,7 @@ periodics:
       - --root=/go/src
       - --timeout=240
       - --scenario=kubernetes_build
+      - --release=kubernetes-release-dev
       - --
       - --allow-dup
       - --extra-version-markers=k8s-master
diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
index 21b976dc7734..d62cf5f6bbdc 100644
--- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
+++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
@@ -214,6 +214,7 @@ periodics:
       - --root=/go/src
       - --timeout=240
       - --scenario=kubernetes_build
+      - --release=kubernetes-release-dev
       - --
       - --allow-dup
       - --extra-version-markers=k8s-stable3
diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml
index 9e4d26fd8e15..817435c1eb2b 100644
--- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml
+++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml
@@ -213,6 +213,7 @@ periodics:
       - --root=/go/src
       - --timeout=240
       - --scenario=kubernetes_build
+      - --release=kubernetes-release-dev
       - --
       - --allow-dup
       - --extra-version-markers=k8s-stable2
diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.21.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.21.yaml
index 815911980c70..6679523e2c09 100644
--- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.21.yaml
+++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.21.yaml
@@ -215,6 +215,7 @@ periodics:
       - --root=/go/src
       - --timeout=240
       - --scenario=kubernetes_build
+      - --release=kubernetes-release-dev
       - --
       - --allow-dup
       - --extra-version-markers=k8s-stable1

From 5ff9997571a1d52210650810aa00d03f5a73aa93 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 08:14:02 -0700
Subject: [PATCH 2/7] kubetest: default to k8s-release-dev for ci builds

jobs impacted (anything using --extract but not --extract-ci-bucket):
- ci-benchmark-kube-dns-master
- ci-benchmark-nodelocal-dns-master
- ci-containerd-e2e-cos-gce
- ci-containerd-e2e-cos-gce-1-4
- ci-containerd-e2e-cos-gce-1-4-canary
- ci-containerd-e2e-cos-gce-canary
- ci-containerd-e2e-ubuntu-gce
- ci-containerd-e2e-ubuntu-gce-canary
- ci-containerd-soak-cos-gce
- ci-cos-containerd-e2e-cos-gce
- ci-cos-containerd-e2e-cos-gce-canary
- ci-cos-containerd-e2e-ubuntu-gce
- ci-cos-containerd-e2e-ubuntu-gce-canary
- ci-cri-containerd-e2e-cos-gce
- ci-cri-containerd-e2e-cos-gce-alpha-features
- ci-cri-containerd-e2e-cos-gce-alpha-features-canary
- ci-cri-containerd-e2e-cos-gce-canary
- ci-cri-containerd-e2e-cos-gce-flaky
- ci-cri-containerd-e2e-cos-gce-flaky-canary
- ci-cri-containerd-e2e-cos-gce-ingress
- ci-cri-containerd-e2e-cos-gce-ip-alias
- ci-cri-containerd-e2e-cos-gce-ip-alias-canary
- ci-cri-containerd-e2e-cos-gce-proto
- ci-cri-containerd-e2e-cos-gce-proto-canary
- ci-cri-containerd-e2e-cos-gce-reboot
- ci-cri-containerd-e2e-cos-gce-reboot-canary
- ci-cri-containerd-e2e-cos-gce-serial
- ci-cri-containerd-e2e-cos-gce-slow
- ci-cri-containerd-e2e-cos-gce-slow-canary
- ci-cri-containerd-e2e-gce-device-plugin-gpu
- ci-cri-containerd-e2e-gce-device-plugin-gpu-canary
- ci-cri-containerd-e2e-ubuntu-gce
- ci-cri-containerd-e2e-ubuntu-gce-canary
- ci-gce-pd-csi-driver-latest-k8s-master-windows-2004
- ci-gce-pd-csi-driver-latest-k8s-master-windows-2004-migration
- ci-gce-pd-csi-driver-latest-k8s-master-windows-2019
- ci-gce-pd-csi-driver-latest-k8s-master-windows-2019-migration
- ci-gce-pd-csi-driver-latest-k8s-master-windows-20h2
- ci-gce-pd-csi-driver-latest-k8s-master-windows-20h2-migration
- ci-ingress-gce-e2e
- ci-ingress-gce-e2e-canary
- ci-ingress-gce-e2e-release-1-6
- ci-ingress-gce-e2e-scale
- ci-kubemci-ingress-conformance
- ci-kubernetes-e2e-autoscaling-hpa-cpu
- ci-kubernetes-e2e-autoscaling-vpa-actuation
- ci-kubernetes-e2e-autoscaling-vpa-admission-controller
- ci-kubernetes-e2e-autoscaling-vpa-full
- ci-kubernetes-e2e-autoscaling-vpa-recommender
- ci-kubernetes-e2e-autoscaling-vpa-updater
- ci-kubernetes-e2e-gce-alpha-api
- ci-kubernetes-e2e-gce-beta-stable1-downgrade-cluster
- ci-kubernetes-e2e-gce-beta-stable1-downgrade-cluster
- ci-kubernetes-e2e-gce-beta-stable1-downgrade-cluster-parallel
- ci-kubernetes-e2e-gce-beta-stable1-downgrade-cluster-parallel
- ci-kubernetes-e2e-gce-beta-stable1-gci-kubectl-skew
- ci-kubernetes-e2e-gce-beta-stable1-gci-kubectl-skew
- ci-kubernetes-e2e-gce-beta-stable1-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-beta-stable1-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-canary
- ci-kubernetes-e2e-gce-canary
- ci-kubernetes-e2e-gce-coredns-performance
- ci-kubernetes-e2e-gce-coredns-performance-nodecache
- ci-kubernetes-e2e-gce-gci-serial-sig-cli
- ci-kubernetes-e2e-gce-gpu-beta-stable1-cluster-downgrade
- ci-kubernetes-e2e-gce-gpu-beta-stable1-cluster-downgrade
- ci-kubernetes-e2e-gce-gpu-master-stable1-cluster-downgrade
- ci-kubernetes-e2e-gce-gpu-master-stable1-cluster-downgrade
- ci-kubernetes-e2e-gce-gpu-stable1-beta-cluster-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-beta-cluster-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-beta-master-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-beta-master-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-master-cluster-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-master-cluster-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-master-master-upgrade
- ci-kubernetes-e2e-gce-gpu-stable1-master-master-upgrade
- ci-kubernetes-e2e-gce-gpu-stable2-stable1-cluster-upgrade
- ci-kubernetes-e2e-gce-gpu-stable2-stable1-cluster-upgrade
- ci-kubernetes-e2e-gce-gpu-stable2-stable1-master-upgrade
- ci-kubernetes-e2e-gce-gpu-stable2-stable1-master-upgrade
- ci-kubernetes-e2e-gce-iscsi
- ci-kubernetes-e2e-gce-iscsi-serial
- ci-kubernetes-e2e-gce-kubedns-performance
- ci-kubernetes-e2e-gce-kubedns-performance-nodecache
- ci-kubernetes-e2e-gce-master-new-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-master-new-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-network-metric-measurement
- ci-kubernetes-e2e-gce-new-master-gci-kubectl-skew
- ci-kubernetes-e2e-gce-new-master-gci-kubectl-skew
- ci-kubernetes-e2e-gce-new-master-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-new-master-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-node-containerd-throughput
- ci-kubernetes-e2e-gce-node-throughput
- ci-kubernetes-e2e-gce-scalability-canary
- ci-kubernetes-e2e-gce-stable1-beta-gci-kubectl-skew
- ci-kubernetes-e2e-gce-stable1-beta-gci-kubectl-skew
- ci-kubernetes-e2e-gce-stable1-beta-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-stable1-beta-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster-new
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster-new
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster-new-parallel
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster-new-parallel
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster-parallel
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-cluster-parallel
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-master
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-master
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-master-parallel
- ci-kubernetes-e2e-gce-stable1-beta-upgrade-master-parallel
- ci-kubernetes-e2e-gce-stable1-stable2-downgrade-cluster
- ci-kubernetes-e2e-gce-stable1-stable2-downgrade-cluster
- ci-kubernetes-e2e-gce-stable1-stable2-downgrade-cluster-parallel
- ci-kubernetes-e2e-gce-stable1-stable2-downgrade-cluster-parallel
- ci-kubernetes-e2e-gce-stable1-stable2-gci-kubectl-skew
- ci-kubernetes-e2e-gce-stable1-stable2-gci-kubectl-skew
- ci-kubernetes-e2e-gce-stable1-stable2-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-stable1-stable2-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-stable2-stable1-gci-kubectl-skew
- ci-kubernetes-e2e-gce-stable2-stable1-gci-kubectl-skew
- ci-kubernetes-e2e-gce-stable2-stable1-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-stable2-stable1-gci-kubectl-skew-serial
- ci-kubernetes-e2e-gce-stable2-stable1-upgrade-cluster
- ci-kubernetes-e2e-gce-stable2-stable1-upgrade-cluster
- ci-kubernetes-e2e-gce-stable2-stable1-upgrade-cluster-new
- ci-kubernetes-e2e-gce-stable2-stable1-upgrade-cluster-new
- ci-kubernetes-e2e-gce-stable2-stable1-upgrade-master
- ci-kubernetes-e2e-gce-stable2-stable1-upgrade-master
- ci-kubernetes-e2e-gce-taint-evict
- ci-kubernetes-e2e-gci-gce-alpha-enabled-default
- ci-kubernetes-e2e-gci-gce-autoscaling
- ci-kubernetes-e2e-gci-gce-autoscaling-hpa-cm
- ci-kubernetes-e2e-gci-gce-autoscaling-migs
- ci-kubernetes-e2e-gci-gce-autoscaling-migs-hpa
- ci-kubernetes-e2e-gci-gce-containerd
- ci-kubernetes-e2e-gci-gce-coredns
- ci-kubernetes-e2e-gci-gce-coredns-nodecache
- ci-kubernetes-e2e-gci-gce-flaky
- ci-kubernetes-e2e-gci-gce-flaky-repro
- ci-kubernetes-e2e-gci-gce-ingress-manual-network
- ci-kubernetes-e2e-gci-gce-ip-alias
- ci-kubernetes-e2e-gci-gce-ipvs
- ci-kubernetes-e2e-gci-gce-kube-dns
- ci-kubernetes-e2e-gci-gce-kube-dns-nodecache
- ci-kubernetes-e2e-gci-gce-network-proxy-grpc
- ci-kubernetes-e2e-gci-gce-network-proxy-http-connect
- ci-kubernetes-e2e-gci-gce-proto
- ci-kubernetes-e2e-gci-gce-scalability-networkpolicies
- ci-kubernetes-e2e-gci-gce-scalability-node-killer
- ci-kubernetes-e2e-gci-gce-serial
- ci-kubernetes-e2e-gci-gce-serial-kube-dns
- ci-kubernetes-e2e-gci-gce-serial-kube-dns-nodecache
- ci-kubernetes-e2e-gci-gce-sig-cli
- ci-kubernetes-e2e-gci-gce-single-flake-attempt
- ci-kubernetes-e2e-gci-gce-slow
- ci-kubernetes-e2e-gci-gce-statefulset
- ci-kubernetes-e2e-kops-aws-sig-cli
- ci-kubernetes-e2e-prow-canary
- ci-kubernetes-e2e-snapshot
- ci-kubernetes-e2e-storage-selinux
- ci-kubernetes-e2e-ubuntu-gce-network-policies
- ci-kubernetes-e2e-windows-containerd-gce
- ci-kubernetes-e2e-windows-containerd-gce-1-21
- ci-kubernetes-e2e-windows-gce-2004
- ci-kubernetes-e2e-windows-gce-2004-1-21
- ci-kubernetes-e2e-windows-gce-2019
- ci-kubernetes-e2e-windows-gce-2019-1-18
- ci-kubernetes-e2e-windows-gce-2019-1-19
- ci-kubernetes-e2e-windows-gce-2019-1-20
- ci-kubernetes-e2e-windows-gce-2019-1-21
- ci-kubernetes-e2e-windows-gce-20h2
- ci-kubernetes-e2e-windows-gce-20h2-1-21
- ci-kubernetes-e2e-windows-gce-alpha-features
- ci-kubernetes-e2e-windows-gce-serial
- ci-kubernetes-e2e-windows-node-throughput
- ci-kubernetes-e2e-windows-node-throughput-iis
- ci-kubernetes-kubemark-100-canary
- ci-kubernetes-kubemark-100-gce
- ci-kubernetes-kubemark-100-gce-scheduler
- ci-kubernetes-kubemark-100-gce-scheduler-highqps
- ci-kubernetes-kubemark-500-gce
- ci-kubernetes-kubemark-500-gce-1-20
- ci-kubernetes-kubemark-500-gce-1-21
- ci-kubernetes-kubemark-500-gce-canary
- ci-kubernetes-kubemark-500-gce-stable2
- ci-kubernetes-kubemark-500-gce-stable3
- ci-kubernetes-kubemark-gce-scale
- ci-kubernetes-kubemark-gce-scale-canary
- ci-kubernetes-kubemark-gce-scale-scheduler
- ci-kubernetes-kubemark-gce-scale-scheduler-canary
- ci-kubernetes-kubemark-high-density-100-gce
- ci-kubernetes-local-e2e
- ci-kubernetes-soak-gce-gci
- ci-kubernetes-soak-gci-gce-beta
- ci-kubernetes-soak-gci-gce-stable1
- ci-kubernetes-soak-gci-gce-stable2
- ci-kubernetes-soak-gci-gce-stable3
- ci-kubernetes-storage-scalability
- ci-poseidon-e2e-gce
- pull-csi-driver-smb-e2e-gce
- pull-gcp-compute-persistent-disk-csi-driver-e2e-win2019
- pull-gcp-compute-persistent-disk-csi-driver-e2e-windows-20h2
- pull-kube-storage-version-migrator-disruptive
- pull-kube-storage-version-migrator-fully-automated-e2e
- pull-kube-storage-version-migrator-manually-launched-e2e
- pull-kubernetes-csi-csi-driver-host-path-windows
- pull-perf-tests-100-adhoc
- pull-perf-tests-benchmark-kube-dns
- pull-perf-tests-clusterloader2
- pull-perf-tests-clusterloader2-kubemark
- sig-auth-serviceaccount-admission-controller-migration
- sig-auth-serviceaccount-admission-controller-migration
---
 config/tests/jobs/jobs_test.go | 2 +-
 kubetest/extract_test.go       | 4 ++--
 kubetest/main.go               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/tests/jobs/jobs_test.go b/config/tests/jobs/jobs_test.go
index baff1f045c5b..0c6fc5be48d7 100644
--- a/config/tests/jobs/jobs_test.go
+++ b/config/tests/jobs/jobs_test.go
@@ -1133,7 +1133,7 @@ func TestKubernetesE2eJobsMustExtractFromK8sInfraBuckets(t *testing.T) {
 		needsFix := false
 		extracts := []string{}
 		const (
-			defaultCIBucket       = "kubernetes-release-dev" // ensure this matches kubetest --extract-ci-bucket default
+			defaultCIBucket       = "k8s-release-dev" // ensure this matches kubetest --extract-ci-bucket default
 			expectedCIBucket      = "k8s-release-dev"
 			defaultReleaseBucket  = "kubernetes-release" // ensure this matches kubetest --extract-release-bucket default
 			expectedReleaseBucket = "k8s-release"
diff --git a/kubetest/extract_test.go b/kubetest/extract_test.go
index 677f449247f9..0d5a2dac370e 100644
--- a/kubetest/extract_test.go
+++ b/kubetest/extract_test.go
@@ -155,8 +155,8 @@ func TestExtractStrategies(t *testing.T) {
 			"bazel/49747/master:b341939d6d3666b119028400a4311cc66da9a542,49747:c4656c3d029e47d03b3d7d9915d79cab72a80852",
 		},
 		{
-			"gs://kubernetes-release-dev/bazel/v1.8.0-alpha.3.389+eab2f8f6c19fcb",
-			"https://storage.googleapis.com/kubernetes-release-dev/bazel",
+			"gs://k8s-release-dev/bazel/v1.8.0-alpha.3.389+eab2f8f6c19fcb",
+			"https://storage.googleapis.com/k8s-release-dev/bazel",
 			"v1.8.0-alpha.3.389+eab2f8f6c19fcb",
 		},
 		{
diff --git a/kubetest/main.go b/kubetest/main.go
index 9b909b4205b2..d526e9e7b9c1 100644
--- a/kubetest/main.go
+++ b/kubetest/main.go
@@ -141,7 +141,7 @@ func defineFlags() *options {
 	flag.StringVar(&o.dump, "dump", "", "If set, dump bring-up and cluster logs to this location on test or cluster-up failure")
 	flag.StringVar(&o.dumpPreTestLogs, "dump-pre-test-logs", "", "If set, dump cluster logs to this location before running tests")
 	flag.Var(&o.extract, "extract", "Extract k8s binaries from the specified release location")
-	flag.StringVar(&o.extractCIBucket, "extract-ci-bucket", "kubernetes-release-dev", "Extract k8s CI binaries from the specified GCS bucket")
+	flag.StringVar(&o.extractCIBucket, "extract-ci-bucket", "k8s-release-dev", "Extract k8s CI binaries from the specified GCS bucket")
 	flag.StringVar(&o.extractReleaseBucket, "extract-release-bucket", "kubernetes-release", "Extract k8s release binaries from the specified GCS bucket")
 	flag.BoolVar(&o.extractSource, "extract-source", false, "Extract k8s src together with other tarballs")
 	flag.BoolVar(&o.flushMemAfterBuild, "flush-mem-after-build", false, "If true, try to flush container memory after building")

From ca8d14be2ab56c71d151d77907fe50a9e17dc82c Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 08:24:49 -0700
Subject: [PATCH 3/7] scenarios: use k8s-release-dev in build, bazel

job configs affected:
- ci-kubernetes-build-deprecated
- ci-kubernetes-build-deprecated-1-21
- ci-kubernetes-build-1-20-deprecated
- ci-kubernetes-build-1-19-deprecated
- anything that uses --scenario=kubernetes_bazel
---
 scenarios/kubernetes_bazel.py | 2 +-
 scenarios/kubernetes_build.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scenarios/kubernetes_bazel.py b/scenarios/kubernetes_bazel.py
index ae83a32675e7..d81cfe2852c2 100755
--- a/scenarios/kubernetes_bazel.py
+++ b/scenarios/kubernetes_bazel.py
@@ -272,7 +272,7 @@ def create_parser():
         '--test-args', action="append", help='Bazel test args')
     parser.add_argument(
         '--gcs',
-        default='gs://kubernetes-release-dev/bazel',
+        default='gs://k8s-release-dev/bazel',
         help='GCS path for where to push build')
     parser.add_argument(
         '--version-suffix',
diff --git a/scenarios/kubernetes_build.py b/scenarios/kubernetes_build.py
index 15ccfc206aa3..fdab957794db 100755
--- a/scenarios/kubernetes_build.py
+++ b/scenarios/kubernetes_build.py
@@ -65,7 +65,7 @@ def check_build_exists(gcs, suffix, fast):
 
     if version:
         if not gcs:
-            gcs = 'kubernetes-release-dev'
+            gcs = 'k8s-release-dev'
         gcs = 'gs://' + gcs
         mode = 'ci'
         if fast:

From 0a9bdd86b38daf779d7f1766ca1321b1ab58016a Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 08:25:30 -0700
Subject: [PATCH 4/7] images/kubekins-e2e: use k8s-release-dev in
 kops-e2e-runner.sh

jobs affected:
- anything that doesn't explicitly set KOPS_KUBE_RELEASE_URL that uses
  kops-e2e-runner.sh
---
 images/kubekins-e2e/kops-e2e-runner.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/kubekins-e2e/kops-e2e-runner.sh b/images/kubekins-e2e/kops-e2e-runner.sh
index 54940cd3c25e..1e62308c6cde 100755
--- a/images/kubekins-e2e/kops-e2e-runner.sh
+++ b/images/kubekins-e2e/kops-e2e-runner.sh
@@ -48,13 +48,13 @@ e2e_args=( \
 # TODO(zmerlynn): This is duplicating some logic in e2e-runner.sh, but
 # I'd rather keep it isolated for now.
 if [[ "${KOPS_DEPLOY_LATEST_KUBE:-}" =~ ^[yY]$ ]]; then
-  readonly KOPS_KUBE_LATEST_URL=${KOPS_DEPLOY_LATEST_URL:-"https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt"}
+  readonly KOPS_KUBE_LATEST_URL=${KOPS_DEPLOY_LATEST_URL:-"https://storage.googleapis.com/k8s-release-dev/ci/latest.txt"}
   readonly KOPS_KUBE_LATEST=$(curl -fsS --retry 3 "${KOPS_KUBE_LATEST_URL}")
   if [[ -z "${KOPS_KUBE_LATEST}" ]]; then
     echo "Can't fetch kube latest URL" >&2
     exit 1
   fi
-  readonly KOPS_KUBE_RELEASE_URL=${KOPS_KUBE_RELEASE_URL:-"https://storage.googleapis.com/kubernetes-release-dev/ci"}
+  readonly KOPS_KUBE_RELEASE_URL=${KOPS_KUBE_RELEASE_URL:-"https://storage.googleapis.com/k8s-release-dev/ci"}
 
   e2e_args+=(--kops-kubernetes-version="${KOPS_KUBE_RELEASE_URL}/${KOPS_KUBE_LATEST}")
 fi

From 0a7bb9c7cdb1004419269a030a8efc9863c95039 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 08:26:00 -0700
Subject: [PATCH 5/7] config/jobs: use k8s-release-dev in kops jobs

job configs affected:
- e2e-kops-gce-latest
- e2e-kops-grid-scenario-ipv6-conformance
- e2e-kops-grid-scenario-ipv6-calico
- e2e-kops-grid-scenario-ipv6-cilium
- e2e-kops-aws-misc-arm64-ci
- e2e-kops-aws-misc-arm64-conformance
- e2e-kops-aws-misc-amd64-conformance
- e2e-kops-aws-k8s-latest
- pull-kops-e2e-k8s-ci
- pull-kops-e2e-k8s-ci-ha
- pull-kops-e2e-ipv6-conformance
- pull-kops-verify-cloudformation
- kops-postsubmit
---
 config/jobs/kubernetes/kops/helpers.py        |  4 ++--
 .../kubernetes/kops/kops-periodics-gce.yaml   |  4 ++--
 .../kubernetes/kops/kops-periodics-misc2.yaml | 24 +++++++++----------
 .../kops/kops-periodics-versions.yaml         |  4 ++--
 .../kubernetes/kops/kops-presubmits-e2e.yaml  | 12 +++++-----
 .../jobs/kubernetes/kops/kops-presubmits.yaml |  2 +-
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/config/jobs/kubernetes/kops/helpers.py b/config/jobs/kubernetes/kops/helpers.py
index dc1f96fa8ae9..a1dcac7b1b7d 100644
--- a/config/jobs/kubernetes/kops/helpers.py
+++ b/config/jobs/kubernetes/kops/helpers.py
@@ -87,8 +87,8 @@ def k8s_version_info(k8s_version):
         k8s_deploy_url = "https://storage.googleapis.com/kubernetes-release/release/latest.txt"
     elif k8s_version == 'ci':
         marker = 'latest.txt'
-        k8s_deploy_url = "https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt"
-        test_package_bucket = 'kubernetes-release-dev'
+        k8s_deploy_url = "https://storage.googleapis.com/k8s-release-dev/ci/latest.txt"
+        test_package_bucket = 'k8s-release-dev'
         test_package_dir = 'ci'
     elif k8s_version == 'stable':
         marker = 'stable.txt'
diff --git a/config/jobs/kubernetes/kops/kops-periodics-gce.yaml b/config/jobs/kubernetes/kops/kops-periodics-gce.yaml
index cd13d5ce4799..dd10536b6463 100644
--- a/config/jobs/kubernetes/kops/kops-periodics-gce.yaml
+++ b/config/jobs/kubernetes/kops/kops-periodics-gce.yaml
@@ -95,12 +95,12 @@ periodics:
           --create-args="--channel=alpha" \
           --env=KOPS_FEATURE_FLAGS=GoogleCloudBucketACL \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --parallel=25 \
diff --git a/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml b/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml
index 7feb7a32e042..63db7493c184 100644
--- a/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml
+++ b/config/jobs/kubernetes/kops/kops-periodics-misc2.yaml
@@ -98,12 +98,12 @@ periodics:
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
           --env=KOPS_FEATURE_FLAGS=AWSIPv6 \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --focus-regex="\[Conformance\]|\[NodeConformance\]" \
@@ -167,12 +167,12 @@ periodics:
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
           --env=KOPS_FEATURE_FLAGS=AWSIPv6,UseServiceAccountIAM \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --parallel=25
@@ -235,12 +235,12 @@ periodics:
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=cilium --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
           --env=KOPS_FEATURE_FLAGS=AWSIPv6 \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --parallel=25
@@ -754,12 +754,12 @@ periodics:
           --cloud-provider=aws \
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210622' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=m6g.large --master-size=m6g.large" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --parallel=25
@@ -820,12 +820,12 @@ periodics:
           --cloud-provider=aws \
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210622' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=m6g.large --master-size=m6g.large" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --focus-regex="\[Conformance\]|\[NodeConformance\]" \
@@ -888,12 +888,12 @@ periodics:
           --cloud-provider=aws \
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=kubenet --container-runtime=containerd --node-size=c5.large --master-size=c5.large" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --focus-regex="\[Conformance\]|\[NodeConformance\]" \
diff --git a/config/jobs/kubernetes/kops/kops-periodics-versions.yaml b/config/jobs/kubernetes/kops/kops-periodics-versions.yaml
index a94c6d801329..03631d9dd825 100644
--- a/config/jobs/kubernetes/kops/kops-periodics-versions.yaml
+++ b/config/jobs/kubernetes/kops/kops-periodics-versions.yaml
@@ -34,12 +34,12 @@ periodics:
           --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd" \
           --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
           --publish-version-marker=gs://kops-ci/bin/latest-ci-green.txt \
-          --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+          --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
           --test=kops \
           -- \
           --ginkgo-args="--debug" \
           --test-args="-test.timeout=60m -num-nodes=0" \
-          --test-package-bucket=kubernetes-release-dev \
+          --test-package-bucket=k8s-release-dev \
           --test-package-dir=ci \
           --test-package-marker=latest.txt \
           --parallel=25
diff --git a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
index 9e9fa70861b5..91d334320ef5 100644
--- a/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
+++ b/config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
@@ -36,13 +36,13 @@ presubmits:
             --up --build --down \
             --cloud-provider=aws \
             --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd" \
-            --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+            --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
             --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
             --test=kops \
             -- \
             --ginkgo-args="--debug" \
             --test-args="-test.timeout=60m -num-nodes=0" \
-            --test-package-bucket=kubernetes-release-dev \
+            --test-package-bucket=k8s-release-dev \
             --test-package-dir=ci \
             --test-package-marker=latest.txt \
             --focus-regex="\[Conformance\]|\[NodeConformance\]" \
@@ -104,13 +104,13 @@ presubmits:
             --up --build --down \
             --cloud-provider=aws \
             --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --master-count=3 --node-count=6 --zones=eu-central-1a,eu-central-1b,eu-central-1c" \
-            --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+            --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
             --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
             --test=kops \
             -- \
             --ginkgo-args="--debug" \
             --test-args="-test.timeout=60m -num-nodes=0" \
-            --test-package-bucket=kubernetes-release-dev \
+            --test-package-bucket=k8s-release-dev \
             --test-package-dir=ci \
             --test-package-marker=latest.txt \
             --focus-regex="\[Conformance\]|\[NodeConformance\]" \
@@ -635,13 +635,13 @@ presubmits:
             --cloud-provider=aws \
             --create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
             --env=KOPS_FEATURE_FLAGS=AWSIPv6 \
-            --kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
+            --kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
             --kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
             --test=kops \
             -- \
             --ginkgo-args="--debug" \
             --test-args="-test.timeout=60m -num-nodes=0" \
-            --test-package-bucket=kubernetes-release-dev \
+            --test-package-bucket=k8s-release-dev \
             --test-package-dir=ci \
             --test-package-marker=latest.txt \
             --focus-regex="\[Conformance\]|\[NodeConformance\]" \
diff --git a/config/jobs/kubernetes/kops/kops-presubmits.yaml b/config/jobs/kubernetes/kops/kops-presubmits.yaml
index de68d5896747..ed9aed0e1f46 100644
--- a/config/jobs/kubernetes/kops/kops-presubmits.yaml
+++ b/config/jobs/kubernetes/kops/kops-presubmits.yaml
@@ -479,7 +479,7 @@ postsubmits:
         args:
         - "make"
         - "prow-postsubmit"
-        - "UPLOAD_DEST=gs://kubernetes-release-dev/kops/ci"
+        - "UPLOAD_DEST=gs://k8s-release-dev/kops/ci"
         resources:
           requests:
             memory: "2Gi"

From cd9915125b508ae82b63611aadba3dfc5cb13b72 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 08:26:17 -0700
Subject: [PATCH 6/7] config/jobs: use k8s-release-dev in coverage jobs

jobs affected:
- ci-kubernetes-coverage-conformance
- ci-kubernetes-coverage-e2e-gci-gce
---
 config/jobs/kubernetes/sig-testing/coverage.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/jobs/kubernetes/sig-testing/coverage.yaml b/config/jobs/kubernetes/sig-testing/coverage.yaml
index daa83a44a8b9..f60fd85e6fda 100644
--- a/config/jobs/kubernetes/sig-testing/coverage.yaml
+++ b/config/jobs/kubernetes/sig-testing/coverage.yaml
@@ -36,7 +36,7 @@ periodics:
           --build=quick \
           --dump-before-and-after \
           --extract=local \
-          --stage=gs://kubernetes-release-dev/ci/ci-kubernetes-conformance-coverage \
+          --stage=gs://k8s-release-dev/ci/ci-kubernetes-conformance-coverage \
           --gcp-zone=us-west1-b \
           --provider=gce \
           --timeout=300m \
@@ -98,7 +98,7 @@ periodics:
           --build=quick \
           --dump-before-and-after \
           --extract=local \
-          --stage=gs://kubernetes-release-dev/ci/ci-kubernetes-coverage-e2e-gci-gce \
+          --stage=gs://k8s-release-dev/ci/ci-kubernetes-coverage-e2e-gci-gce \
           --gcp-master-image=gci \
           --gcp-node-image=gci \
           --gcp-nodes=4 \

From b3aa42794e32be0f119309371c19ca2f0b10b6e1 Mon Sep 17 00:00:00 2001
From: Aaron Crickenberger <spiffxp@google.com>
Date: Fri, 9 Jul 2021 08:27:17 -0700
Subject: [PATCH 7/7] config/jobs: use k8s-release-dev in release-branch jobs

jobs affected:
- periodic-kubernetes-bazel-build-1-19
- ci-kubernetes-bazel-build-1-19
- periodic-kubernetes-bazel-build-1-20
- ci-kubernetes-bazel-build-1-20
---
 .../jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml | 4 ++--
 .../jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
index d62cf5f6bbdc..9625cb566cb3 100644
--- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
+++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.19.yaml
@@ -412,7 +412,7 @@ periodics:
             --config=ci \
             "--build=//... -//vendor/..." \
             --release=//build/release-tars \
-            --gcs=gs://kubernetes-release-dev/ci-periodic \
+            --gcs=gs://k8s-release-dev/ci-periodic \
             --version-suffix=-bazel
       command:
       - bash
@@ -712,7 +712,7 @@ postsubmits:
         - --
         - --build=//... -//vendor/...
         - --release=//build/release-tars
-        - --gcs=gs://kubernetes-release-dev/ci
+        - --gcs=gs://k8s-release-dev/ci
         - --version-suffix=-bazel
         image: gcr.io/k8s-testimages/kubekins-e2e:v20210707-0f9c540-1.19
         name: ""
diff --git a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml
index 817435c1eb2b..6a559cdeacbc 100644
--- a/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml
+++ b/config/jobs/kubernetes/sig-release/release-branch-jobs/1.20.yaml
@@ -409,7 +409,7 @@ periodics:
             --config=ci \
             "--build=//... -//vendor/..." \
             --release=//build/release-tars \
-            --gcs=gs://kubernetes-release-dev/ci-periodic \
+            --gcs=gs://k8s-release-dev/ci-periodic \
             --version-suffix=-bazel
       command:
       - bash
@@ -711,7 +711,7 @@ postsubmits:
         - --
         - --build=//... -//vendor/...
         - --release=//build/release-tars
-        - --gcs=gs://kubernetes-release-dev/ci
+        - --gcs=gs://k8s-release-dev/ci
         - --version-suffix=-bazel
         image: gcr.io/k8s-testimages/kubekins-e2e:v20210707-0f9c540-1.20
         name: ""