Skip to content

Commit

Permalink
Merge pull request #908 from Nordix/lentzi90/prow-use-staging-registry
Browse files Browse the repository at this point in the history
Prow: Switch to staging registry
  • Loading branch information
metal3-io-bot authored Nov 23, 2024
2 parents dcceda7 + 797a3b6 commit 40f883a
Show file tree
Hide file tree
Showing 18 changed files with 27 additions and 26 deletions.
9 changes: 5 additions & 4 deletions prow/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ export CONTAINER_RUNTIME ?= docker
validate:
$(CONTAINER_RUNTIME) run --rm \
--volume "${PWD}:/workdir:ro,z" \
--entrypoint /checkconfig \
gcr.io/k8s-prow/checkconfig:v20231011-33fbc60185 \
--config-path /workdir/manifests/overlays/metal3/config.yaml \
--plugin-config /workdir/manifests/overlays/metal3/plugins.yaml \
--entrypoint /ko-app/checkconfig \
us-docker.pkg.dev/k8s-infra-prow/images/checkconfig:v20240730-12bb925b4 \
--config-path /workdir/config/config.yaml \
--job-config-path /workdir/config/jobs \
--plugin-config /workdir/config/plugins.yaml \
--strict
8 changes: 4 additions & 4 deletions prow/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ plank:
path_strategy: explicit
s3_credentials_secret: s3-credentials
utility_images:
clonerefs: gcr.io/k8s-prow/clonerefs:v20240730-12bb925b4
entrypoint: gcr.io/k8s-prow/entrypoint:v20240730-12bb925b4
initupload: gcr.io/k8s-prow/initupload:v20240730-12bb925b4
sidecar: gcr.io/k8s-prow/sidecar:v20240730-12bb925b4
clonerefs: us-docker.pkg.dev/k8s-infra-prow/images/clonerefs:v20240730-12bb925b4
entrypoint: us-docker.pkg.dev/k8s-infra-prow/images/entrypoint:v20240730-12bb925b4
initupload: us-docker.pkg.dev/k8s-infra-prow/images/initupload:v20240730-12bb925b4
sidecar: us-docker.pkg.dev/k8s-infra-prow/images/sidecar:v20240730-12bb925b4
resources:
clonerefs:
requests:
Expand Down
2 changes: 1 addition & 1 deletion prow/config/generic-autobumper-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ includedConfigPaths:
targetVersion: "latest"
prefixes:
- name: "k8s-prow images"
prefix: "gcr.io/k8s-prow/"
prefix: "us-docker.pkg.dev/k8s-infra-prow/images/"
repo: "https://github.com/metal3-io/project-infra"
summarise: false
2 changes: 1 addition & 1 deletion prow/config/jobs/metal3-io/project-infra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ presubmits:
decorate: true
spec:
containers:
- image: gcr.io/k8s-prow/checkconfig:v20240730-12bb925b4
- image: us-docker.pkg.dev/k8s-infra-prow/images/checkconfig:v20240730-12bb925b4
command:
- checkconfig
args:
Expand Down
6 changes: 3 additions & 3 deletions prow/config/jobs/periodics.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ periodics:
decorate: true
spec:
containers:
- image: gcr.io/k8s-prow/commenter:v20240731-a5d9345e59
- image: us-docker.pkg.dev/k8s-infra-prow/images/commenter:v20240731-a5d9345e59
command:
- commenter
args:
Expand Down Expand Up @@ -37,7 +37,7 @@ periodics:
decorate: true
spec:
containers:
- image: gcr.io/k8s-prow/commenter:v20240731-a5d9345e59
- image: us-docker.pkg.dev/k8s-infra-prow/images/commenter:v20240731-a5d9345e59
command:
- commenter
args:
Expand Down Expand Up @@ -71,7 +71,7 @@ periodics:
base_ref: main
spec:
containers:
- image: gcr.io/k8s-prow/generic-autobumper:v20240730-12bb925b4
- image: us-docker.pkg.dev/k8s-infra-prow/images/generic-autobumper:v20240730-12bb925b4
command:
- generic-autobumper
args:
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/crier.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: crier
image: gcr.io/k8s-prow/crier:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/crier:v20240730-12bb925b4
args:
- --blob-storage-workers=10
- --config-path=/etc/config/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/deck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: deck
image: gcr.io/k8s-prow/deck:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/deck:v20240730-12bb925b4
args:
- --config-path=/etc/config/config.yaml
- --job-config-path=/etc/job-config
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/ghproxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
containers:
- name: ghproxy
image: gcr.io/k8s-prow/ghproxy:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/ghproxy:v20240730-12bb925b4
args:
- --cache-dir=/cache
- --cache-sizeGB=99
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/hook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: hook
image: gcr.io/k8s-prow/hook:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/hook:v20240730-12bb925b4
imagePullPolicy: Always
args:
- --dry-run=false
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/horologium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: horologium
image: gcr.io/k8s-prow/horologium:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/horologium:v20240730-12bb925b4
args:
- --dry-run=false
- --config-path=/etc/config/config.yaml
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/prow-controller-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
- --github-endpoint=https://api.github.com
- --enable-controller=plank
- --github-token-path=/etc/github/token
image: gcr.io/k8s-prow/prow-controller-manager:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/prow-controller-manager:v20240730-12bb925b4
volumeMounts:
- name: github-token
mountPath: /etc/github
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/sinker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
serviceAccountName: "sinker"
containers:
- name: sinker
image: gcr.io/k8s-prow/sinker:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/sinker:v20240730-12bb925b4
args:
- --config-path=/etc/config/config.yaml
- --dry-run=false
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/statusreconciler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: statusreconciler
image: gcr.io/k8s-prow/status-reconciler:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/status-reconciler:v20240730-12bb925b4
args:
- --dry-run=false
- --continue-on-error=true
Expand Down
2 changes: 1 addition & 1 deletion prow/manifests/base/tide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
serviceAccountName: "tide"
containers:
- name: tide
image: gcr.io/k8s-prow/tide:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/tide:v20240730-12bb925b4
args:
- --dry-run=false
- --config-path=/etc/config/config.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: cherrypicker
image: gcr.io/k8s-prow/cherrypicker:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/cherrypicker:v20240730-12bb925b4
imagePullPolicy: Always
args:
- --github-token-path=/etc/github/token
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
serviceAccountName: jenkins-operator
containers:
- name: jenkins-operator
image: gcr.io/k8s-prow/jenkins-operator:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/jenkins-operator:v20240730-12bb925b4
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 @@ -28,7 +28,7 @@ spec:
spec:
containers:
- name: label-sync
image: gcr.io/k8s-prow/label_sync:v20240731-a5d9345e59
image: us-docker.pkg.dev/k8s-infra-prow/images/label_sync:v20240731-a5d9345e59
args:
- --config=/etc/config/labels.yaml
- --confirm=true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
terminationGracePeriodSeconds: 180
containers:
- name: needs-rebase
image: gcr.io/k8s-prow/needs-rebase:v20240730-12bb925b4
image: us-docker.pkg.dev/k8s-infra-prow/images/needs-rebase:v20240730-12bb925b4
imagePullPolicy: Always
args:
- --dry-run=false
Expand Down

0 comments on commit 40f883a

Please sign in to comment.