Skip to content

Commit 8bb5b7a

Browse files
Changes to gcr.io images
1 parent d836aeb commit 8bb5b7a

File tree

7 files changed

+15
-8
lines changed

7 files changed

+15
-8
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ $ CONFIG_PATH=$(pwd)/config/prow/config.yaml JOB_CONFIG_PATH=$(pwd)/config/jobs/
3232

3333
03 May 2022 - Usage of pod-utility images from locally built and pushed `quay.io/powercloud` private repo is deprecated.
3434

35-
The upstream pod-utility images from `gcr.io/k8s-prow` will be used - [Change](https://github.com/ppc64le-cloud/test-infra/pull/309/files#diff-d840b3456d7d17beb3ded91cf0ca9d6fd065baedb31a0a634b5101df3f7925d4L77)
35+
The upstream pod-utility images from `us-docker.pkg.dev/k8s-infra-prow/images` will be used.
36+
37+
[Change1](https://github.com/ppc64le-cloud/test-infra/pull/309/files#diff-d840b3456d7d17beb3ded91cf0ca9d6fd065baedb31a0a634b5101df3f7925d4L77) - Started using google container registry upstream images
38+
39+
[Change2](https://github.com/ppc64le-cloud/test-infra/pull/487/files#diff-d840b3456d7d17beb3ded91cf0ca9d6fd065baedb31a0a634b5101df3f7925d4R83) - Moved from using Container Registry to Temporary Upstream Artifact Registry. (May change to registry.k8s.io in future. Ref: [issue](https://github.com/kubernetes-sigs/prow/issues/113)
3640

3741
Files from [here](https://github.com/ppc64le-cloud/test-infra/tree/master/images/pod-utilities) will not be used.

config/jobs/ppc64le-cloud/test-infra/test-infra-presubmits.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ presubmits:
2121
run_if_changed: '^(config/prow/(config|plugins).yaml$|config/jobs/.*.yaml$)'
2222
spec:
2323
containers:
24-
- image: gcr.io/k8s-prow/checkconfig:v20240205-8f023a0da6
24+
- image: us-docker.pkg.dev/k8s-infra-prow/images/checkconfig:v20250307-7a867cddc
2525
command:
2626
- checkconfig
2727
args:

config/prow/cluster/label_sync_cron_job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: label-sync
19-
image: gcr.io/k8s-prow/label_sync:v20240409-13cd3acf7e
19+
image: gcr.io/k8s-staging-test-infra/label_sync:v20250306-095fc63a16
2020
args:
2121
- --config=/etc/config/labels.yaml
2222
- --confirm=true

config/prow/perfdash/perfdash-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
containers:
1818
- name: perfdash
19-
image: gcr.io/k8s-testimages/perfdash:2.34
19+
image: gcr.io/k8s-staging-perf-tests/perfdash:2.54
2020
command:
2121
- /perfdash
2222
- --www=true

hack/test-pj.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ function main() {
1212
parseArgs "$@"
1313

1414
# Generate PJ and Pod.
15-
docker run -i --rm -v "${PWD}:${PWD}" -v "${config}:${config}" ${job_config_mnt} -w "${PWD}" gcr.io/k8s-prow/mkpj "--config-path=${config}" "--job=${job}" ${job_config_flag} > "${PWD}/pj.yaml"
16-
docker run -i --rm -v "${PWD}:${PWD}" -w "${PWD}" gcr.io/k8s-prow/mkpod --build-id=snowflake "--prow-job=${PWD}/pj.yaml" --local "--out-dir=${out_dir}/${job}" > "${PWD}/pod.yaml"
15+
docker run -i --rm -v "${PWD}:${PWD}" -v "${config}:${config}" ${job_config_mnt} -w "${PWD}" us-docker.pkg.dev/k8s-infra-prow/images/mkpj "--config-path=${config}" "--job=${job}" ${job_config_flag} > "${PWD}/pj.yaml"
16+
docker run -i --rm -v "${PWD}:${PWD}" -w "${PWD}" us-docker.pkg.dev/k8s-infra-prow/images/mkpod --build-id=snowflake "--prow-job=${PWD}/pj.yaml" --local "--out-dir=${out_dir}/${job}" > "${PWD}/pod.yaml"
1717

1818
echo "Applying pod to the mkpod cluster. Configure kubectl for the mkpod cluster with:"
1919
echo "Press Control+c for exiting the script"

images/pod-utilities/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FILE=version.txt
22
VERSION?=`cat $(FILE)`
3-
UPSTREAM_REPO=gcr.io/k8s-prow
3+
UPSTREAM_REPO=us-docker.pkg.dev/k8s-infra-prow/images
44
PRIVATE_REPO=quay.io/powercloud
55
ARCH?=amd64
66

images/pod-utilities/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
## Deprecated
22
03 May 2022 - Usage of pod-utility images from locally built and pushed `quay.io/powercloud` private repo is deprecated.
33

4+
The upstream pod-utility images from `us-docker.pkg.dev/k8s-infra-prow/images` will be used.
45

5-
The upstream pod-utility images from `gcr.io/k8s-prow` will be used - [Change](https://github.com/ppc64le-cloud/test-infra/pull/309/files#diff-d840b3456d7d17beb3ded91cf0ca9d6fd065baedb31a0a634b5101df3f7925d4L77)
6+
[Change1](https://github.com/ppc64le-cloud/test-infra/pull/309/files#diff-d840b3456d7d17beb3ded91cf0ca9d6fd065baedb31a0a634b5101df3f7925d4L77) - Started using google container registry upstream images
7+
8+
[Change2](https://github.com/ppc64le-cloud/test-infra/pull/487/files#diff-d840b3456d7d17beb3ded91cf0ca9d6fd065baedb31a0a634b5101df3f7925d4R83) - Moved from using Container Registry to Temporary Upstream Artifact Registry. (May change to registry.k8s.io in future. Ref: [issue](https://github.com/kubernetes-sigs/prow/issues/113)
69

710
### How to build
811

0 commit comments

Comments
 (0)