From 6ab3a66bd1bc16036725b5b4c2b9fbde5b1c996e Mon Sep 17 00:00:00 2001 From: David Simansky Date: Fri, 27 Sep 2024 15:27:40 +0200 Subject: [PATCH 1/3] Use testgrid's configurator image from gcr.io registry --- config/Makefile | 2 +- prow/jobs/custom/infra.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/Makefile b/config/Makefile index 36962b3ff..495e0bd9e 100644 --- a/config/Makefile +++ b/config/Makefile @@ -83,7 +83,7 @@ update-testgrid-config: confirm-main -v "$(GOOGLE_APPLICATION_CREDENTIALS):$(GOOGLE_APPLICATION_CREDENTIALS)" \ -e "GOOGLE_APPLICATION_CREDENTIALS" \ -w "$(PWD)" \ - gcr.io/k8s-prow/configurator:v20220124-9887456efc \ + gcr.io/k8s-prow/configurator:v20240731-a5d9345e59 \ "--oneshot" \ "--output=gs://$(TESTGRID_GCS)/config" \ "--yaml=$(realpath $(TESTGRID_CONFIG))" diff --git a/prow/jobs/custom/infra.yaml b/prow/jobs/custom/infra.yaml index 22c01ddae..e35ebd92a 100644 --- a/prow/jobs/custom/infra.yaml +++ b/prow/jobs/custom/infra.yaml @@ -48,7 +48,7 @@ presubmits: cluster: "prow-build" spec: containers: - - image: us-docker.pkg.dev/k8s-infra-prow/images/configurator:v20240405-c76de01869 + - image: gcr.io/k8s-prow/configurator:v20240731-a5d9345e59 command: - configurator args: @@ -373,7 +373,7 @@ postsubmits: spec: serviceAccountName: testgrid-updater containers: - - image: us-docker.pkg.dev/k8s-infra-prow/images/configurator:v20240405-c76de01869 + - image: gcr.io/k8s-prow/configurator:v20240731-a5d9345e59 command: - configurator args: From e789466f38470d74a8a390b0c96a3efc333ed4b6 Mon Sep 17 00:00:00 2001 From: David Simansky Date: Mon, 30 Sep 2024 11:21:31 +0200 Subject: [PATCH 2/3] Update to staging-test-infra images --- config/Makefile | 2 +- prow/jobs/custom/infra.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/Makefile b/config/Makefile index 495e0bd9e..57680c705 100644 --- a/config/Makefile +++ b/config/Makefile @@ -83,7 +83,7 @@ update-testgrid-config: confirm-main -v "$(GOOGLE_APPLICATION_CREDENTIALS):$(GOOGLE_APPLICATION_CREDENTIALS)" \ -e "GOOGLE_APPLICATION_CREDENTIALS" \ -w "$(PWD)" \ - gcr.io/k8s-prow/configurator:v20240731-a5d9345e59 \ + gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da \ "--oneshot" \ "--output=gs://$(TESTGRID_GCS)/config" \ "--yaml=$(realpath $(TESTGRID_CONFIG))" diff --git a/prow/jobs/custom/infra.yaml b/prow/jobs/custom/infra.yaml index e35ebd92a..1a9bb6c46 100644 --- a/prow/jobs/custom/infra.yaml +++ b/prow/jobs/custom/infra.yaml @@ -48,7 +48,7 @@ presubmits: cluster: "prow-build" spec: containers: - - image: gcr.io/k8s-prow/configurator:v20240731-a5d9345e59 + - image: gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da command: - configurator args: @@ -373,7 +373,7 @@ postsubmits: spec: serviceAccountName: testgrid-updater containers: - - image: gcr.io/k8s-prow/configurator:v20240731-a5d9345e59 + - image: gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da command: - configurator args: From 9bd3c0ade967410851d09935a544c19feefee407 Mon Sep 17 00:00:00 2001 From: Mahamed Ali Date: Mon, 30 Sep 2024 12:51:24 +0100 Subject: [PATCH 3/3] Apply suggestions from code review --- config/Makefile | 2 +- prow/jobs/custom/infra.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/Makefile b/config/Makefile index 57680c705..19cf11618 100644 --- a/config/Makefile +++ b/config/Makefile @@ -83,7 +83,7 @@ update-testgrid-config: confirm-main -v "$(GOOGLE_APPLICATION_CREDENTIALS):$(GOOGLE_APPLICATION_CREDENTIALS)" \ -e "GOOGLE_APPLICATION_CREDENTIALS" \ -w "$(PWD)" \ - gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da \ + gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da9 \ "--oneshot" \ "--output=gs://$(TESTGRID_GCS)/config" \ "--yaml=$(realpath $(TESTGRID_CONFIG))" diff --git a/prow/jobs/custom/infra.yaml b/prow/jobs/custom/infra.yaml index 1a9bb6c46..7ab1c733e 100644 --- a/prow/jobs/custom/infra.yaml +++ b/prow/jobs/custom/infra.yaml @@ -48,7 +48,7 @@ presubmits: cluster: "prow-build" spec: containers: - - image: gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da + - image: gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da9 command: - configurator args: @@ -373,7 +373,7 @@ postsubmits: spec: serviceAccountName: testgrid-updater containers: - - image: gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da + - image: gcr.io/k8s-staging-test-infra/configurator:v20240914-93a93a3da9 command: - configurator args: