Skip to content

Commit

Permalink
Change image refs: distroless.dev -> cgr.dev/chainguard
Browse files Browse the repository at this point in the history
These images are equivalent, and both redirect to exactly the same
backend location, but we're trying to move away from the distroless
"brand" in favor of the "Chainguard Images" brand.
  • Loading branch information
imjasonh authored and tekton-robot committed Sep 23, 2022
1 parent df29072 commit 898baef
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .ko.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
defaultBaseImage: distroless.dev/static
defaultBaseImage: cgr.dev/chainguard/static
baseImageOverrides:
# git-init uses a base image that includes Git, and supports running either
# as root or as user nonroot with UID 65532.
github.com/tektoncd/pipeline/cmd/git-init: distroless.dev/git
github.com/tektoncd/pipeline/cmd/git-init: cgr.dev/chainguard/git
6 changes: 3 additions & 3 deletions config/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ spec:
"-gsutil-image", "gcr.io/google.com/cloudsdktool/cloud-sdk@sha256:27b2c22bf259d9bc1a291e99c63791ba0c27a04d2db0a43241ba0f1f20f4067f",

# The shell image must allow root in order to create directories and copy files to PVCs.
# distroless.dev/busybox as of April 14 2022
# cgr.dev/chainguard/busybox as of April 14 2022
# image shall not contains tag, so it will be supported on a runtime like cri-o
"-shell-image", "distroless.dev/busybox@sha256:19f02276bf8dbdd62f069b922f10c65262cc34b710eea26ff928129a736be791",
"-shell-image", "cgr.dev/chainguard/busybox@sha256:19f02276bf8dbdd62f069b922f10c65262cc34b710eea26ff928129a736be791",

# for script mode to work with windows we need a powershell image
# pinning to nanoserver tag as of July 15 2021
Expand Down Expand Up @@ -123,7 +123,7 @@ spec:
capabilities:
drop:
- all
# User 65532 is the distroless nonroot user ID
# User 65532 is the nonroot user ID
runAsUser: 65532
runAsGroup: 65532
ports:
Expand Down
6 changes: 3 additions & 3 deletions tekton/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,23 +98,23 @@ spec:
# Combine Distroless with a Windows base image, used for the entrypoint image.
COMBINED_BASE_IMAGE=$(go run ./vendor/github.com/tektoncd/plumbing/cmd/combine/main.go \
distroless.dev/static \
cgr.dev/chainguard/static \
mcr.microsoft.com/windows/nanoserver:ltsc2019 \
mcr.microsoft.com/windows/nanoserver:ltsc2022 \
${CONTAINER_REGISTRY}/$(params.package)/combined-base-image:latest)
# NOTE: Make sure this list of images to use the combined base image is in sync with what's in test/presubmit-tests.sh's 'ko_resolve' function.
cat <<EOF > ${PROJECT_ROOT}/.ko.yaml
# This matches the value configured in .ko.yaml
defaultBaseImage: distroless.dev/static
defaultBaseImage: cgr.dev/chainguard/static
baseImageOverrides:
# Use the combined base image for images that should include Windows support.
$(params.package)/cmd/entrypoint: ${COMBINED_BASE_IMAGE}
$(params.package)/cmd/nop: ${COMBINED_BASE_IMAGE}
$(params.package)/cmd/workingdirinit: ${COMBINED_BASE_IMAGE}
# This matches values configured in .ko.yaml
$(params.package)/cmd/git-init: distroless.dev/git
$(params.package)/cmd/git-init: cgr.dev/chainguard/git
EOF
cat ${PROJECT_ROOT}/.ko.yaml
Expand Down
4 changes: 2 additions & 2 deletions test/presubmit-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ function ko_resolve() {
header "Running `ko resolve`"

cat <<EOF > .ko.yaml
defaultBaseImage: distroless.dev/static
defaultBaseImage: cgr.dev/chainguard/static
baseImageOverrides:
# Use the combined base image for images that should include Windows support.
# NOTE: Make sure this list of images to use the combined base image is in sync with what's in tekton/publish.yaml's 'create-ko-yaml' Task.
github.com/tektoncd/pipeline/cmd/entrypoint: gcr.io/tekton-releases/github.com/tektoncd/pipeline/combined-base-image:latest
github.com/tektoncd/pipeline/cmd/nop: gcr.io/tekton-releases/github.com/tektoncd/pipeline/combined-base-image:latest
github.com/tektoncd/pipeline/cmd/workingdirinit: gcr.io/tekton-releases/github.com/tektoncd/pipeline/combined-base-image:latest
github.com/tektoncd/pipeline/cmd/git-init: distroless.dev/git
github.com/tektoncd/pipeline/cmd/git-init: cgr.dev/chainguard/git
EOF

KO_DOCKER_REPO=example.com ko resolve -l 'app.kubernetes.io/component!=resolvers' --platform=all --push=false -R -f config 1>/dev/null
Expand Down

0 comments on commit 898baef

Please sign in to comment.