Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

switch to the new prow image registry #518

Merged
merged 1 commit into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions prow/autobump-config/knative.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ gitHubOrg: "knative"
gitHubRepo: "infra"
remoteName: "infra"
headBranchName: "autobump-knative"
upstreamURLBase: "https://raw.githubusercontent.com/kubernetes/test-infra/master"
targetVersion: "upstream"
targetVersion: "latest"
includedConfigPaths:
- "prow/cluster/control-plane"
- "prow/cluster/build"
Expand All @@ -19,25 +18,12 @@ extraFiles:
- "prow/jobs/run_job.sh"
prefixes:
- name: "Prow"
prefix: "gcr.io/k8s-prow/"
refConfigFile: "config/prow/cluster/deck_deployment.yaml"
repo: "https://github.com/kubernetes/test-infra"
prefix: "us-docker.pkg.dev/k8s-infra-prow/images/"
repo: "https://github.com/kubernetes-sigs/prow"
summarise: false
consistentImages: true
consistentImageExceptions:
- "gcr.io/k8s-prow/alpine"
- "gcr.io/k8s-prow/analyze"
- "gcr.io/k8s-prow/commenter"
- "gcr.io/k8s-prow/configurator"
- "gcr.io/k8s-prow/gcsweb"
- "gcr.io/k8s-prow/gencred"
- "gcr.io/k8s-prow/git"
- "gcr.io/k8s-prow/issue-creator"
- "gcr.io/k8s-prow/label_sync"
- "gcr.io/k8s-prow/pr-creator"
- name: "Boskos"
prefix: "gcr.io/k8s-staging-boskos/"
refConfigFile: "config/prow/cluster/build/boskos.yaml"
repo: "https://github.com/kubernetes-sigs/boskos"
summarise: false
consistentImages: true
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-crier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: crier
image: gcr.io/k8s-prow/crier:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/crier:v20240802-66b115076
args:
- --pubsub-workers=5 # Arbitrary number of multiplier
- --blob-storage-workers=1
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-deck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: deck
image: gcr.io/k8s-prow/deck:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/deck:v20240802-66b115076
args:
- --hook-url=http://hook:8888/plugin-help
- --tide-url=http://tide/
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-ghproxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
spec:
containers:
- name: ghproxy
image: gcr.io/k8s-prow/ghproxy:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/ghproxy:v20240802-66b115076
args:
- --cache-dir=/cache
- --cache-sizeGB=99
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-hook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: hook
image: gcr.io/k8s-prow/hook:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/hook:v20240802-66b115076
imagePullPolicy: Always
args:
- --dry-run=false
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-horologium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: horologium
image: gcr.io/k8s-prow/horologium:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/horologium:v20240802-66b115076
args:
- --config-path=/etc/config/config.yaml
- --job-config-path=/etc/job-config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
serviceAccountName: prow-controller-manager
containers:
- name: prow-controller-manager
image: gcr.io/k8s-prow/prow-controller-manager:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/prow-controller-manager:v20240802-66b115076
args:
- --config-path=/etc/config/config.yaml
- --dry-run=false
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-sinker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
serviceAccountName: "sinker"
containers:
- name: sinker
image: gcr.io/k8s-prow/sinker:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/sinker:v20240802-66b115076
args:
- --config-path=/etc/config/config.yaml
- --job-config-path=/etc/job-config
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/400-tide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
serviceAccountName: "tide"
containers:
- name: tide
image: gcr.io/k8s-prow/tide:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/tide:v20240802-66b115076
args:
- --config-path=/etc/config/config.yaml
- --job-config-path=/etc/job-config
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/500-cherrypicker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: cherrypicker
image: gcr.io/k8s-prow/cherrypicker:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/cherrypicker:v20240802-66b115076
args:
- --dry-run=false
- --use-prow-assignments=false
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/500-needs-rebase.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: needs-rebase
image: gcr.io/k8s-prow/needs-rebase:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/needs-rebase:v20240802-66b115076
imagePullPolicy: Always
args:
- --dry-run=false
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/control-plane/500-status-reconciler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: statusreconciler
image: gcr.io/k8s-prow/status-reconciler:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/status-reconciler:v20240802-66b115076
imagePullPolicy: Always
args:
- --dry-run=false
Expand Down
2 changes: 1 addition & 1 deletion prow/cluster/trusted/ghproxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ spec:
spec:
containers:
- name: ghproxy
image: gcr.io/k8s-prow/ghproxy:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/ghproxy:v20240802-66b115076
args:
- --cache-dir=/cache
- --cache-sizeGB=99
Expand Down
16 changes: 8 additions & 8 deletions prow/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ plank:
grace_period: 15s
utility_images:
# Update these versions when updating plank version in cluster.yaml
clonerefs: "gcr.io/k8s-prow/clonerefs:v20240802-66b115076"
initupload: "gcr.io/k8s-prow/initupload:v20240802-66b115076"
entrypoint: "gcr.io/k8s-prow/entrypoint:v20240802-66b115076"
sidecar: "gcr.io/k8s-prow/sidecar:v20240802-66b115076"
clonerefs: "us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240802-66b115076"
initupload: "us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240802-66b115076"
entrypoint: "us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240802-66b115076"
sidecar: "us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240802-66b115076"
gcs_configuration:
bucket: "knative-prow"
path_strategy: "explicit"
Expand All @@ -44,10 +44,10 @@ plank:
grace_period: 15s
utility_images:
# Update these versions when updating plank version in cluster.yaml
clonerefs: "gcr.io/k8s-prow/clonerefs:v20240802-66b115076"
initupload: "gcr.io/k8s-prow/initupload:v20240802-66b115076"
entrypoint: "gcr.io/k8s-prow/entrypoint:v20240802-66b115076"
sidecar: "gcr.io/k8s-prow/sidecar:v20240802-66b115076"
clonerefs: "us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240802-66b115076"
initupload: "us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240802-66b115076"
entrypoint: "us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240802-66b115076"
sidecar: "us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240802-66b115076"
gcs_configuration:
bucket: "knative-prow"
path_strategy: "explicit"
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/custom/autobump-flaky-test-reporter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ periodics:
report_template: '"The autobump-flaky-test-reporter periodic job fails, check the log: <{{.Status.URL}}|View logs>"'
spec:
containers:
- image: gcr.io/k8s-prow/generic-autobumper:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/generic-autobumper:v20240802-66b115076
command:
- generic-autobumper
args:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/custom/autobump-prow-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ periodics:
report_template: '"The autobump-prow-tests periodic job fails, check the log: <{{.Status.URL}}|View logs>"'
spec:
containers:
- image: gcr.io/k8s-prow/generic-autobumper:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/generic-autobumper:v20240802-66b115076
command:
- generic-autobumper
args:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/custom/autobump-prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ periodics:
report_template: '"The autobump-prow periodic job fails, check the log: <{{.Status.URL}}|View logs>"'
spec:
containers:
- image: gcr.io/k8s-prow/generic-autobumper:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/generic-autobumper:v20240802-66b115076
command:
- generic-autobumper
args:
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/custom/autodeploy-prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ periodics:
report_template: '"The config-bootstrapper periodic has failed, check the log: <{{.Status.URL}}|View logs>"'
spec:
containers:
- image: gcr.io/k8s-prow/config-bootstrapper:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/config-bootstrapper:v20240802-66b115076
imagePullPolicy: Always
command:
- config-bootstrapper
Expand Down
2 changes: 1 addition & 1 deletion prow/jobs/custom/branchprotector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ periodics:
spec:
containers:
- name: branchprotector
image: gcr.io/k8s-prow/branchprotector:v20240802-66b115076
image: us-docker.pkg.dev/k8s-infra-prow/images/branchprotector:v20240802-66b115076
command:
- branchprotector
args:
Expand Down
8 changes: 4 additions & 4 deletions prow/jobs/custom/infra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Add a fake hook image here so that autobump.sh can bump only job configs
# image: gcr.io/k8s-prow/hook:v20240802-66b115076
# image: us-docker.pkg.dev/k8s-infra-prow/images/hook:v20240802-66b115076
# See
# https://github.com/kubernetes/test-infra/blob/5815354584709c3f436e3d682110c673d224d7b1/prow/cmd/autobump/autobump.sh#L164

Expand All @@ -25,7 +25,7 @@ presubmits:
cluster: prow-build
spec:
containers:
- image: gcr.io/k8s-prow/checkconfig:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/checkconfig:v20240802-66b115076
command:
- checkconfig
args:
Expand All @@ -48,7 +48,7 @@ presubmits:
cluster: "prow-build"
spec:
containers:
- image: gcr.io/k8s-prow/configurator:v20240405-c76de01869
- image: us-docker.pkg.dev/k8s-infra-prow/images/configurator:v20240405-c76de01869
command:
- configurator
args:
Expand Down Expand Up @@ -373,7 +373,7 @@ postsubmits:
spec:
serviceAccountName: testgrid-updater
containers:
- image: gcr.io/k8s-prow/configurator:v20240405-c76de01869
- image: us-docker.pkg.dev/k8s-infra-prow/images/configurator:v20240405-c76de01869
command:
- configurator
args:
Expand Down
6 changes: 3 additions & 3 deletions prow/jobs/custom/label-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
spec:
containers:
- name: label-sync
image: gcr.io/k8s-prow/label_sync:v20240405-c76de01869
image: us-docker.pkg.dev/k8s-infra-prow/images/label_sync:v20240405-c76de01869
command:
- label_sync
args:
Expand Down Expand Up @@ -68,7 +68,7 @@ periodics:
spec:
containers:
- name: label-sync
image: gcr.io/k8s-prow/label_sync:v20240405-c76de01869
image: us-docker.pkg.dev/k8s-infra-prow/images/label_sync:v20240405-c76de01869
command:
- label_sync
args:
Expand Down Expand Up @@ -118,7 +118,7 @@ postsubmits:
spec:
containers:
- name: label-sync
image: gcr.io/k8s-prow/label_sync:v20240405-c76de01869
image: us-docker.pkg.dev/k8s-infra-prow/images/label_sync:v20240405-c76de01869
command:
- label_sync
args:
Expand Down
12 changes: 6 additions & 6 deletions prow/jobs/custom/peribolos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ presubmits:
- "main"
spec:
containers:
- image: gcr.io/k8s-prow/peribolos:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/peribolos:v20240802-66b115076
command:
- "peribolos"
args:
Expand Down Expand Up @@ -67,7 +67,7 @@ presubmits:
- "main"
spec:
containers:
- image: gcr.io/k8s-prow/peribolos:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/peribolos:v20240802-66b115076
command:
- "peribolos"
args:
Expand Down Expand Up @@ -118,7 +118,7 @@ postsubmits:
testgrid-tab-name: post-knative-peribolos
spec:
containers:
- image: gcr.io/k8s-prow/peribolos:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/peribolos:v20240802-66b115076
command:
- "peribolos"
args:
Expand Down Expand Up @@ -172,7 +172,7 @@ postsubmits:
testgrid-tab-name: post-knative-extensions-peribolos
spec:
containers:
- image: gcr.io/k8s-prow/peribolos:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/peribolos:v20240802-66b115076
command:
- "peribolos"
args:
Expand Down Expand Up @@ -223,7 +223,7 @@ periodics:
testgrid-tab-name: ci-knative-peribolos
spec:
containers:
- image: gcr.io/k8s-prow/peribolos:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/peribolos:v20240802-66b115076
command:
- "peribolos"
args:
Expand Down Expand Up @@ -271,7 +271,7 @@ periodics:
testgrid-tab-name: ci-knative-extensions-peribolos
spec:
containers:
- image: gcr.io/k8s-prow/peribolos:v20240802-66b115076
- image: us-docker.pkg.dev/k8s-infra-prow/images/peribolos:v20240802-66b115076
command:
- "peribolos"
args:
Expand Down
4 changes: 2 additions & 2 deletions prow/jobs/run_job.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if [[ -n "${GITHUB_TOKEN_PATH}" ]]; then
-v "${PWD}:${PWD}" -v "${CONFIG_YAML}:${CONFIG_YAML}" -v "${JOB_CONFIG_YAML}:${JOB_CONFIG_YAML}" \
-v "${GITHUB_TOKEN_PATH}:${GITHUB_TOKEN_PATH}" \
-w "${PWD}" \
gcr.io/k8s-prow/mkpj:v20240802-66b115076 \
us-docker.pkg.dev/k8s-infra-prow/images/mkpj:v20240802-66b115076 \
"--job=${JOB_NAME}" "--config-path=${CONFIG_YAML}" "--job-config-path=${JOB_CONFIG_YAML}" \
"--github-token-path=${GITHUB_TOKEN_PATH}" \
>"${JOB_YAML}"
Expand All @@ -48,7 +48,7 @@ else
docker run -i --rm \
-v "${PWD}:${PWD}" -v "${CONFIG_YAML}:${CONFIG_YAML}" -v "${JOB_CONFIG_YAML}:${JOB_CONFIG_YAML}" \
-w "${PWD}" \
gcr.io/k8s-prow/mkpj:v20240802-66b115076 \
us-docker.pkg.dev/k8s-infra-prow/images/mkpj:v20240802-66b115076 \
"--job=${JOB_NAME}" "--config-path=${CONFIG_YAML}" "--job-config-path=${JOB_CONFIG_YAML}" \
>"${JOB_YAML}" || failed=1

Expand Down
Loading