Skip to content

Move away from gcr.io staging repo #10

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.

Sign up for GitHub

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Move away from gcr.io staging repo #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffe003e
cloudbuild: stage image builds to registry.k8s.io
BlaineEXE Jan 24, 2025
fc93465
cloudbuild: update k8s-testimages repo migration info
BlaineEXE Jan 24, 2025
713acf6
build: add gcr.io/distroless/static deprecation note
BlaineEXE Jan 24, 2025
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 cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ substitutions:
steps:
# TODO: currently gcr.io/k8s-testimages/gcb-docker-gcloud has not moved to Artifact Registry
# gcr.io will be shut down 18 Mar 2025, and we need replacement before then. Latest info below:
# https://github.com/kubernetes/test-infra/blob/master/images/gcb-docker-gcloud/cloudbuild.yaml
Comment on lines 17 to -19
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is still no replacement for gcr.io/k8s-testimages/gcb-docker-gcloud. The best I can do now is update our TODO note with latest info and progress.

# https://github.com/kubernetes/k8s.io/issues/1523#issuecomment-920311451
- id: do-multi-arch-build-all-images
name: gcr.io/k8s-testimages/gcb-docker-gcloud:v20240718-5ef92b5c36
args:
Expand Down
3 changes: 3 additions & 0 deletions controller/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ RUN CGO_ENABLED=0 go build -o /buildroot/artifacts/controller cmd/*.go
#
# FINAL IMAGE
#

# gcr.io is deprecated, but gcr.io/distroless/static is hosted by artifact hub with the gcr.io path.
# See: https://github.com/GoogleContainerTools/distroless/issues/1320
FROM gcr.io/distroless/static:nonroot

LABEL maintainers="Kubernetes Authors"
Expand Down
3 changes: 3 additions & 0 deletions hack/Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ RUN CGO_ENABLED=0 go build -o /buildroot/artifacts/{{COMPONENT}} cmd/*.go
#
# FINAL IMAGE
#

# gcr.io is deprecated, but gcr.io/distroless/static is hosted by artifact hub with the gcr.io path.
# See: https://github.com/GoogleContainerTools/distroless/issues/1320
FROM gcr.io/distroless/static:nonroot
Comment on lines +30 to 33
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not necessary to migrate this gcr.io image for reason in comment. It seems good to have this note. I would probably forget and then do all my google searching again in 6 months without it.


LABEL maintainers="Kubernetes Authors"
Expand Down
2 changes: 1 addition & 1 deletion hack/cloudbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ echo "PLATFORM: ${PLATFORM}"
# debug the rest of the script in case of image/CI build issues
set -o xtrace

REPO="gcr.io/k8s-staging-sig-storage"
REPO="registry.k8s.io/k8s-staging-sig-storage"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is going to work. registry.k8s.io doesn't have a web interface to browse images, but I can browse it with this: https://explore.ggcr.dev/?repo=registry.k8s.io

There is no k8s-staging-sig-storage in that list. Only the non-staging sig-storage repo. What are we supposed to do for staging images?


CONTROLLER_IMAGE="${REPO}/objectstorage-controller"
SIDECAR_IMAGE="${REPO}/objectstorage-sidecar"
Expand Down
3 changes: 3 additions & 0 deletions sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ RUN CGO_ENABLED=0 go build -o /buildroot/artifacts/sidecar cmd/*.go
#
# FINAL IMAGE
#

# gcr.io is deprecated, but gcr.io/distroless/static is hosted by artifact hub with the gcr.io path.
# See: https://github.com/GoogleContainerTools/distroless/issues/1320
FROM gcr.io/distroless/static:nonroot

LABEL maintainers="Kubernetes Authors"
Expand Down