From f8039d95ac6757c2d7564e11245c7f5bdfaf0ac3 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Mon, 27 Sep 2021 11:16:41 -0700 Subject: [PATCH] images: rm k8s-testimages in Makefiles replace with references to k8s-staging-test-infra --- images/bazelbuild/Makefile | 2 +- images/bigquery/Makefile | 2 +- images/bootstrap/Makefile | 2 +- images/builder/run.sh | 2 +- images/gcb-docker-gcloud/Makefile | 2 +- images/gcloud-in-go/Makefile | 2 +- images/krte/Makefile | 2 +- images/kubekins-e2e/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/bazelbuild/Makefile b/images/bazelbuild/Makefile index 260f01689046..35c1e167a082 100644 --- a/images/bazelbuild/Makefile +++ b/images/bazelbuild/Makefile @@ -13,7 +13,7 @@ # limitations under the License. push-prod: - bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch --build-dir=. images/bazelbuild + bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb --build-dir=. images/bazelbuild push: bazel run //images/builder -- --allow-dirty --build-dir=. images/bazelbuild diff --git a/images/bigquery/Makefile b/images/bigquery/Makefile index 678150d42106..a8eb0c4d3c9c 100644 --- a/images/bigquery/Makefile +++ b/images/bigquery/Makefile @@ -13,7 +13,7 @@ # limitations under the License. push-prod: - bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/bigquery + bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/bigquery push: bazel run //images/builder -- --allow-dirty images/bigquery diff --git a/images/bootstrap/Makefile b/images/bootstrap/Makefile index 6524d4ac578d..a397ec2f3ce7 100644 --- a/images/bootstrap/Makefile +++ b/images/bootstrap/Makefile @@ -13,7 +13,7 @@ # limitations under the License. push-prod: - bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/bootstrap + bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/bootstrap push: bazel run //images/builder -- --allow-dirty images/bootstrap diff --git a/images/builder/run.sh b/images/builder/run.sh index 776518eaa6cc..18e2a3feacc4 100755 --- a/images/builder/run.sh +++ b/images/builder/run.sh @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Used by gcr.io/k8s-testimages/image-builder. +# Used by gcr.io/k8s-staging-test-infra/image-builder. # See ci-runner.sh for the version prow uses to build and run on the fly. set -e diff --git a/images/gcb-docker-gcloud/Makefile b/images/gcb-docker-gcloud/Makefile index 733a20c63ba4..5b94e6ab5ff2 100644 --- a/images/gcb-docker-gcloud/Makefile +++ b/images/gcb-docker-gcloud/Makefile @@ -13,7 +13,7 @@ # limitations under the License. push-prod: - bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/gcb-docker-gcloud + bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/gcb-docker-gcloud push: bazel run //images/builder -- --allow-dirty images/gcb-docker-gcloud diff --git a/images/gcloud-in-go/Makefile b/images/gcloud-in-go/Makefile index db067c8f8a08..6f2bf12fa4b2 100644 --- a/images/gcloud-in-go/Makefile +++ b/images/gcloud-in-go/Makefile @@ -13,7 +13,7 @@ # limitations under the License. push-prod: - bazel run //images/builder -- --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/gcloud-in-go + bazel run //images/builder -- --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/gcloud-in-go push: bazel run //images/builder -- --allow-dirty images/gcloud-in-go diff --git a/images/krte/Makefile b/images/krte/Makefile index 6164d74d9ada..489b2589e909 100644 --- a/images/krte/Makefile +++ b/images/krte/Makefile @@ -20,7 +20,7 @@ ifneq ($(K8S), everything) endif push-prod: - bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch images/krte + bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb images/krte push: bazel run //images/builder -- $(EXTRA_ARG) --allow-dirty images/krte diff --git a/images/kubekins-e2e/Makefile b/images/kubekins-e2e/Makefile index b25430e6ad71..c761f61f1720 100644 --- a/images/kubekins-e2e/Makefile +++ b/images/kubekins-e2e/Makefile @@ -20,7 +20,7 @@ ifneq ($(K8S), everything) endif push-prod: - bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-testimages --scratch-bucket=gs://k8s-testimages-scratch --build-dir=. images/kubekins-e2e + bazel run //images/builder -- $(EXTRA_ARG) --project=k8s-staging-test-infra --scratch-bucket=gs://k8s-staging-test-infra-gcb --build-dir=. images/kubekins-e2e push: bazel run //images/builder -- $(EXTRA_ARG) --allow-dirty --build-dir=. images/kubekins-e2e