Merge pull request #23774 from spiffxp/k8s-infra-image-makefiles

images: rm k8s-testimages in Makefiles
kubernetes · Sep 27, 2021 · 471c27b · 471c27b
2 parents 8d536b6 + f8039d9
commit 471c27b
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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