Skip to content

gcr.io to registry.k8s #613

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion docs/example-snapshot-metadata.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ If this is not the case then substitute the explicit use of `-n default` with th
spec:
restartPolicy: Always
containers:
- image: gcr.io/google_containers/busybox
- image: registry.k8s/google_containers/busybox
command: ["/bin/sh", "-c"]
args: [ "tail -f /dev/null" ]
name: busybox
Expand Down
2 changes: 1 addition & 1 deletion examples/csi-pod-block.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
spec:
restartPolicy: Always
containers:
- image: gcr.io/google_containers/busybox
- image: registry.k8s/google_containers/busybox
command: ["/bin/sh", "-c"]
args: [ "tail -f /dev/null" ]
name: busybox
Expand Down
2 changes: 1 addition & 1 deletion release-tools/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ steps:
# The image must contain bash and curl. Ideally it should also contain
# the desired version of Go (currently defined in release-tools/prow.sh),
# but that just speeds up the build and is not required.
- name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20240718-5ef92b5c36'
- name: 'registry.k8s/k8s-testimages/gcb-docker-gcloud:v20240718-5ef92b5c36'
entrypoint: ./.cloudbuild.sh
env:
- GIT_TAG=${_GIT_TAG}
Expand Down
4 changes: 2 additions & 2 deletions release-tools/prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ configvar CSI_PROW_DRIVER_CANARY "${CSI_PROW_HOSTPATH_CANARY}" "driver image ove

# Image registry to use for canary images.
# Only valid if CSI_PROW_DRIVER_CANARY == "canary".
configvar CSI_PROW_DRIVER_CANARY_REGISTRY "gcr.io/k8s-staging-sig-storage" "registry for canary images"
configvar CSI_PROW_DRIVER_CANARY_REGISTRY "registry.k8s/k8s-staging-sig-storage" "registry for canary images"

# The E2E testing can come from an arbitrary repo. The expectation is that
# the repo supports "go test ./test/e2e -args --storage.testdriver" (https://github.com/kubernetes/kubernetes/pull/72836)
Expand Down Expand Up @@ -960,7 +960,7 @@ patch_kubernetes () {
# overrides that registry.
find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;registry.k8s.io/sig-storage/\(.*\):v.*;registry.k8s.io/sig-storage/\1:canary;'
cat >"$target/e2e-repo-list" <<EOF
sigStorageRegistry: gcr.io/k8s-staging-sig-storage
sigStorageRegistry: registry.k8s/k8s-staging-sig-storage
EOF
cat >&2 <<EOF

Expand Down