Remove references to gcr.io/tekton*

Cleanup the remaining refences to tekton-* projects under gcr.io from resources and docs. Signed-off-by: Andrea Frittoli <[email protected]>
tektoncd · Dec 20, 2024 · 02a7340 · 02a7340
1 parent 07a33d1
commit 02a7340
Show file tree

Hide file tree

Showing 27 changed files with 50 additions and 41 deletions.
diff --git a/bots/buildcaptain/README.md b/bots/buildcaptain/README.md
@@ -59,5 +59,5 @@ When connected to [the dogfood cluster](https://github.com/tektoncd/plumbing/blo
 
 ```bash
 # must be run from the `buildcaptain` dir or it will use the go.mod file one level up
-buildcaptain$ KO_DOCKER_REPO=gcr.io/tekton-releases/buildcaptain ko --context dogfood apply -f config/deployment.yaml
+buildcaptain$ KO_DOCKER_REPO=ghcr.io/tektoncd/plumbing/buildcaptain ko --context dogfood apply -f config/deployment.yaml
 ```
diff --git a/bots/mariobot/cmd/mario/main.go b/bots/mariobot/cmd/mario/main.go
@@ -50,7 +50,7 @@ type triggerErrorPayload struct {
 	Error string `json:"errorMessage,omitempty"`
 }
 
-const defaultRegistry = "gcr.io/tekton-releases/dogfooding"
+const defaultRegistry = "ghcr.io/tektoncd/plumbing"
 
 func main() {
 	secretToken := os.Getenv(envSecret)

diff --git a/bots/mariobot/config/mario.yaml b/bots/mariobot/config/mario.yaml
@@ -38,7 +38,7 @@ spec:
                   name: mario-github-secret
                   key: secret-token
             - name: CONTAINER_REGISTRY
-              value: "gcr.io/tekton-releases/dogfooding"
+              value: "ghcr.io/tektoncd/plumbing"
 ---
 apiVersion: v1
 kind: Service

diff --git a/cmd/combine/README.md b/cmd/combine/README.md
@@ -11,7 +11,7 @@ $ go run ./ \
     ghcr.io/distroless/static \
     mcr.microsoft.com/windows/nanoserver:ltsc2022 \
     mcr.microsoft.com/windows/nanoserver:ltsc2019 \
-    gcr.io/MY_PROJECT/combined
+    ghcr.io/MY_PROJECT/combined
 ```
 
 This combines a [distroless](https://github.com/distroless/static) base image providing Linux platform support, with two image providing different versions of a Windows base image.
@@ -27,7 +27,7 @@ combine src1 src2 [src...] dst
 After running the script, you can check the image's platforms using [`crane`](https://github.com/google/go-containerregistry/blob/main/cmd/crane/README.md):
 
 ```
-$ crane manifest gcr.io/MY_PROJECT/combined | jq '.manifests[].platform'
+$ crane manifest ghcr.io/MY_PROJECT/combined | jq '.manifests[].platform'
 {
   "architecture": "386",
   "os": "linux"

diff --git a/scripts/e2e-tests.sh b/scripts/e2e-tests.sh
@@ -409,6 +409,9 @@ function initialize() {
   is_protected_gcr ${KO_DOCKER_REPO} && \
     abort "\$KO_DOCKER_REPO set to ${KO_DOCKER_REPO}, which is forbidden"
 
+  is_protected_ghcr {KO_DOCKER_REPO} && \
+    abort "\$KO_DOCKER_REPO set to ${KO_DOCKER_REPO}, which is forbidden"
+
   readonly RUN_TESTS
   readonly EMIT_METRICS
   readonly GCP_PROJECT

diff --git a/scripts/library.sh b/scripts/library.sh
@@ -358,6 +358,12 @@ function is_protected_gcr() {
   [[ -n $1 && "$1" =~ "^gcr.io/tekton-(releases|nightly)/?$" ]]
 }
 
+# Return whether the given parameter is the tekton release/nightly GCF.
+# Parameters: $1 - full GHCR name, e.g. ghcr.io/tektoncd/foo-bar
+function is_protected_ghcr() {
+  [[ -n $1 && "$1" =~ "^ghcr.io/tektoncd/?$" ]]
+}
+
 # Remove symlinks in a path that are broken or lead outside the repo.
 # Parameters: $1 - path name, e.g. vendor
 function remove_broken_symlinks() {

diff --git a/tekton/ci/cluster-interceptors/add-pr-body/README.md b/tekton/ci/cluster-interceptors/add-pr-body/README.md
@@ -73,7 +73,7 @@ A trigger in an event listener:
 The interceptor is installed via `ko`:
 
 ```bash
-export KO_DOCKER_REPO=gcr.io/tekton-releases/dogfooding
+export KO_DOCKER_REPO=ghcr.io/tektoncd/plumbing
 ko apply -P -f tekton/ci/cluster-interceptors/add-pr-body/config/
 ```
 

diff --git a/tekton/ci/cluster-interceptors/build-id/README.md b/tekton/ci/cluster-interceptors/build-id/README.md
@@ -51,6 +51,6 @@ A trigger in an event listener:
 The interceptor is installed via `ko`:
 
 ```bash
-export KO_DOCKER_REPO=gcr.io/tekton-releases/dogfooding
+export KO_DOCKER_REPO=ghcr.io/tektoncd/plumbing
 ko apply -P -f tekton/ci/cluster-interceptors/build-id/config/
 ```
diff --git a/tekton/ci/interceptors/add-pr-body/README.md b/tekton/ci/interceptors/add-pr-body/README.md
@@ -81,7 +81,7 @@ A trigger in an event listener:
 The interceptor is installed via `ko`:
 
 ```bash
-export KO_DOCKER_REPO=gcr.io/tekton-releases/dogfooding
+export KO_DOCKER_REPO=ghcr.io/tektoncd/plumbing
 ko apply -P -f tekton/ci/interceptors/add-pr-body/config/
 ```
 

diff --git a/tekton/ci/interceptors/add-team-members/README.md b/tekton/ci/interceptors/add-team-members/README.md
@@ -106,7 +106,7 @@ A trigger in an event listener:
 
 The interceptor is installed via `ko`:
 ```
-export KO_DOCKER_REPO=gcr.io/tekton-releases/dogfooding
+export KO_DOCKER_REPO=ghcr.io/tektoncd/plumbing
 ko apply -P -f tekton/ci/interceptors/add-team-members/config/
 ```
 

diff --git a/tekton/ci/jobs/tekton-image-build.yaml b/tekton/ci/jobs/tekton-image-build.yaml
@@ -89,8 +89,8 @@ spec:
     - name: package
       description: package (and its children) under test
     - name: imagePrefix
-      description: The prefix for the image reference to build
-      default: gcr.io/tekton-nightly/dogfooding/ci
+      description: The prefix for the image reference to build - not used
+      default: ghcr.io/tektoncd/dogfooding/ci
   workspaces:
     - name: sources
       description: Workspace where the git repo is prepared for testing

diff --git a/tekton/ci/repos/plumbing/template.yaml b/tekton/ci/repos/plumbing/template.yaml
@@ -98,7 +98,7 @@
         - name: package
           value: $(tt.params.package)
         - name: imagePrefix
-          value: gcr.io/tekton-nightly/dogfooding/ci
+          value: ghcr.io/tektoncd/dogfooding/ci
   - apiVersion: tekton.dev/v1beta1
     kind: PipelineRun
     metadata:

diff --git a/tekton/ci/stepactions/git-batch-merge.yaml b/tekton/ci/stepactions/git-batch-merge.yaml
@@ -60,7 +60,7 @@ spec:
       default: "false"
     - name: gitInitImage
       description: The image used where the git-init binary is.
-      default: "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init:v0.18.1"
+      default: "ghcr.io/tektoncd/github.com/tektoncd/pipeline/cmd/git-init:v0.18.1"
       type: string
   results:
     - name: commit

diff --git a/tekton/cronjobs/README.md b/tekton/cronjobs/README.md
@@ -13,7 +13,7 @@ dedicated trigger template:
   nightly builds
 * [`image-build`](../resources/images/image-build-trigger.yaml): build
   container images and push them to a container repo (by default
-  gcr.io/tekton-releases/dogfooding/myimage)
+  ghcr.io/tektoncd/dogfooding/myimage)
 * [`folder`](../resources/cd/folder-template.yaml): trigger deployment
   of manifests or overlays in a folder
 * [`configmap`](../resources/cd/configmap-template.yaml): trigger

diff --git a/tekton/cronjobs/bases/image-build/trigger-image-build.yaml b/tekton/cronjobs/bases/image-build/trigger-image-build.yaml
@@ -101,7 +101,7 @@ spec:
               - name: SINK_URL
                 value: "sink-url"
               - name: TARGET_IMAGE
-                value: "gcr.io/tekton-releases/dogfooding/myimage"
+                value: "ghcr.io/tektoncd/myproject/myimage"
               - name: TAGS
                 value: "latest"
               - name: PLATFORMS

diff --git a/tekton/cronjobs/dogfooding/catalog/tekton-upstream/README.md b/tekton/cronjobs/dogfooding/catalog/tekton-upstream/README.md
@@ -1,4 +1,4 @@
-# Tekton Catalog CD - gcr.io/tekton-releases
+# Tekton Catalog CD - ghcr.io/tektoncd/catalog
 
 Cron Job to daily deploy the Tekton catalog to the
-gcr.io/tekton-releases container registry project as bundles.
+ghcr.io/tektoncd/catalog container registry project as bundles.
diff --git a/tekton/images/koparse/koparse/koparse.py b/tekton/images/koparse/koparse/koparse.py
@@ -129,7 +129,7 @@ def backwards_compatible_params(container_registry: str, base: str, images: List
     arg_parser.add_argument("--path", type=str, required=True,
                             help="Path to the release.yaml")
     arg_parser.add_argument("--container-registry", dest="container_registry", type=str, required=False,
-                            help="Container registry URI and path e.g. gcr.io/tekton-releases")
+                            help="Container registry URI and path e.g. ghcr.io/tektoncd")
     arg_parser.add_argument("--base", type=str, required=True,
                             help="String prefix which is used to find images within the release.yaml")
     arg_parser.add_argument("--images", type=str, required=True, nargs="+",

diff --git a/tekton/images/koparse/koparse/test_release.yaml b/tekton/images/koparse/koparse/test_release.yaml
@@ -255,7 +255,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  image: gcr.io/k8s-prow/entrypoint@sha256:7c7cd8906ce4982ffee326218e9fc75da2d4896d53cabc9833b9cc8d2d6b2b8f
+  image: ghcr.io/k8s-prow/entrypoint@sha256:7c7cd8906ce4982ffee326218e9fc75da2d4896d53cabc9833b9cc8d2d6b2b8f
 kind: ConfigMap
 metadata:
   name: config-entrypoint
@@ -312,11 +312,11 @@ spec:
         "-logtostderr",
         "-stderrthreshold",
         "INFO",
-        "-kubeconfig-writer-image", "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/kubeconfigwriter:v20201022-ceeec6463e.1_1A@sha256:68453f5bb4b76c0eab98964754114d4f79d3a50413872520d8919a6786ea2b35",
+        "-kubeconfig-writer-image", "ghcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/kubeconfigwriter:v20201022-ceeec6463e.1_1A@sha256:68453f5bb4b76c0eab98964754114d4f79d3a50413872520d8919a6786ea2b35",
         "-git-image",
-        "gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init@sha256:7d5520efa2d55e1346c424797988c541327ee52ef810a840b5c6f278a9de934a",
+        "ghcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/git-init@sha256:7d5520efa2d55e1346c424797988c541327ee52ef810a840b5c6f278a9de934a",
       ]
-        image: gcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/controller@sha256:bdc6f22a44944c829983c30213091b60f490b41f89577e8492f6a2936be0df41
+        image: ghcr.io/tekton-releases/github.com/tektoncd/pipeline/cmd/controller@sha256:bdc6f22a44944c829983c30213091b60f490b41f89577e8492f6a2936be0df41
         name: tekton-pipelines-controller
         volumeMounts:
         - mountPath: /etc/config-logging

diff --git a/tekton/images/koparse/koparse/test_release_no_preserve_path.yaml b/tekton/images/koparse/koparse/test_release_no_preserve_path.yaml
@@ -255,7 +255,7 @@ metadata:
 ---
 apiVersion: v1
 data:
-  image: gcr.io/k8s-prow/entrypoint@sha256:7c7cd8906ce4982ffee326218e9fc75da2d4896d53cabc9833b9cc8d2d6b2b8f
+  image: ghcr.io/k8s-prow/entrypoint@sha256:7c7cd8906ce4982ffee326218e9fc75da2d4896d53cabc9833b9cc8d2d6b2b8f
 kind: ConfigMap
 metadata:
   name: config-entrypoint
@@ -312,11 +312,11 @@ spec:
         "-logtostderr",
         "-stderrthreshold",
         "INFO",
-        "-kubeconfig-writer-image", "gcr.io/tekton-releases/kubeconfigwriter-3d37fea0b053ea82d66b7c0bae03dcb0:v20201022-ceeec6463e.1_1A@sha256:68453f5bb4b76c0eab98964754114d4f79d3a50413872520d8919a6786ea2b35",
+        "-kubeconfig-writer-image", "ghcr.io/tekton-releases/kubeconfigwriter-3d37fea0b053ea82d66b7c0bae03dcb0:v20201022-ceeec6463e.1_1A@sha256:68453f5bb4b76c0eab98964754114d4f79d3a50413872520d8919a6786ea2b35",
         "-git-image",
-        "gcr.io/tekton-releases/git-init-4874978a9786b6625dd8b6ef2a21aa70@sha256:7d5520efa2d55e1346c424797988c541327ee52ef810a840b5c6f278a9de934a",
+        "ghcr.io/tekton-releases/git-init-4874978a9786b6625dd8b6ef2a21aa70@sha256:7d5520efa2d55e1346c424797988c541327ee52ef810a840b5c6f278a9de934a",
       ]
-        image: gcr.io/tekton-releases/controller-10a3e32792f33651396d02b6855a6e36@sha256:bdc6f22a44944c829983c30213091b60f490b41f89577e8492f6a2936be0df41
+        image: ghcr.io/tekton-releases/controller-10a3e32792f33651396d02b6855a6e36@sha256:bdc6f22a44944c829983c30213091b60f490b41f89577e8492f6a2936be0df41
         name: tekton-pipelines-controller
         volumeMounts:
         - mountPath: /etc/config-logging
@@ -340,7 +340,7 @@ spec:
         app: tekton-pipelines-webhook
     spec:
       containers:
-      - image: gcr.io/tekton-releases/webhook-d4749e605405422fd87700164e31b2d1@sha256:cca7069a11aaf0d9d214306d456bc40b2e33e5839429bf07c123ad964d495d8a
+      - image: ghcr.io/tekton-releases/webhook-d4749e605405422fd87700164e31b2d1@sha256:cca7069a11aaf0d9d214306d456bc40b2e33e5839429bf07c123ad964d495d8a
         name: webhook
         volumeMounts:
         - mountPath: /etc/config-logging

diff --git a/tekton/resources/cd/cleanup-template.yaml b/tekton/resources/cd/cleanup-template.yaml
@@ -34,7 +34,7 @@ spec:
       value: $(params.namespace)
   steps:
   - name: cleanup-pr-tr
-    image: gcr.io/tekton-releases/dogfooding/tkn
+    image: ghcr.io/tektoncd/plumbing/tkn
     script: |
       #!/bin/sh
       set -ex

diff --git a/tekton/resources/cd/configmap-template.yaml b/tekton/resources/cd/configmap-template.yaml
@@ -46,7 +46,7 @@ spec:
       value: $(params.configMapKey)
   steps:
   - name: fetch-current-config
-    image: gcr.io/tekton-releases/dogfooding/kubectl
+    image: ghcr.io/tektoncd/plumbing/kubectl
     script: |
       #!/bin/sh
       set -ex
@@ -56,7 +56,7 @@ spec:
           /workspace/${CONFIG_MAP_KEY} || \
           rm /workspace/${CONFIG_MAP_KEY}
   - name: deploy
-    image: gcr.io/tekton-releases/dogfooding/kubectl
+    image: ghcr.io/tektoncd/plumbing/kubectl
     script: |
       #!/bin/sh
       set -ex

diff --git a/tekton/resources/cd/folder-template.yaml b/tekton/resources/cd/folder-template.yaml
@@ -46,7 +46,7 @@ spec:
       value: $(params.isOverlay)
   steps:
   - name: deploy-from-folder
-    image: gcr.io/tekton-releases/dogfooding/kubectl
+    image: ghcr.io/tektoncd/plumbing/kubectl
     script: |
       #!/bin/sh
       set -ex
@@ -108,7 +108,7 @@ spec:
         ${RESOURCES_PATH}/DEPLOYABLE_ALL.yaml > ${RESOURCES_PATH}/DEPLOYABLE_not_sa.yaml
 
   - name: deploy-resources
-    image: gcr.io/tekton-releases/dogfooding/kubectl
+    image: ghcr.io/tektoncd/plumbing/kubectl
     script: |
       #!/bin/sh
       set -ex

diff --git a/tekton/resources/cd/helm-template.yaml b/tekton/resources/cd/helm-template.yaml
@@ -56,7 +56,7 @@ spec:
       value: $(params.preDeployResources)
   steps:
     - name: pre-deploy-from-url
-      image: gcr.io/tekton-releases/dogfooding/kubectl
+      image: ghcr.io/tektoncd/plumbing/kubectl
       script: |
         #!/bin/sh
         set -ex

diff --git a/tekton/resources/nightly-release/README.md b/tekton/resources/nightly-release/README.md
@@ -22,7 +22,7 @@ are available to be passed down to the release pipelines:
     description: The version tag to be applied to published images.
   - name: imageRegistry
     description: Registry where the images will be published to.
-    default: gcr.io/tekton-nightly
+    default: ghcr.io/tektoncd
   - name: projectName
     description: Name of the Tekton project to release (e.g. pipeline, triggers, etc).
 ```

diff --git a/tekton/resources/nightly-tests/bastion-p/test_tekton_component.yaml b/tekton/resources/nightly-tests/bastion-p/test_tekton_component.yaml
@@ -27,7 +27,7 @@ spec:
     description: timeout for the go test runner
     default: 45m
   - name: container-registry
-    description: container registry used to push images during tests e.g. gcr.io/tekton-e2e-tests or icr.io/tekton-e2e-tests
+    description: container registry used to push images during tests e.g. ghcr.io/tekton-e2e-tests or icr.io/tekton-e2e-tests
   - name: tags
     default: e2e
   - name: target-arch

diff --git a/tekton/resources/nightly-tests/bastion-z/test_tekton_component.yaml b/tekton/resources/nightly-tests/bastion-z/test_tekton_component.yaml
@@ -16,7 +16,7 @@ spec:
     description: timeout for the go test runner
     default: 30m
   - name: container-registry
-    description: container registry used to push images during tests e.g. gcr.io/tekton-e2e-tests or icr.io/tekton-e2e-tests
+    description: container registry used to push images during tests e.g. ghcr.io/tekton-e2e-tests or icr.io/tekton-e2e-tests
   - name: tags
     default: e2e
   - name: target-arch

diff --git a/tekton/resources/release/base/github_release.yaml b/tekton/resources/release/base/github_release.yaml
@@ -55,7 +55,7 @@ spec:
         value: $(params.rekor-uuid)
   steps:
     - name: header
-      image: gcr.io/tekton-releases/dogfooding/hub
+      image: ghcr.io/tektoncd/plumbing/hub
       script: |
         #!/bin/bash
         set -ex
@@ -112,7 +112,7 @@ spec:
         ## Changes
         EOF
     - name: filter-data
-      image: gcr.io/tekton-releases/dogfooding/hub
+      image: ghcr.io/tektoncd/plumbing/hub
       workingDir: $(workspaces.shared.path)/repo
       script: |
         #!/usr/bin/env bash
@@ -237,7 +237,7 @@ spec:
         EOF
 
     - name: authors
-      image: gcr.io/tekton-releases/dogfooding/hub
+      image: ghcr.io/tektoncd/plumbing/hub
       workingDir: $(workspaces.shared.path)/repo
       script: |
         #!/usr/bin/env bash
@@ -252,7 +252,7 @@ spec:
         $(awk -F";" '{ print "* :heart_eyes: @"$1 }' $HOME/pr-notes.csv | sort -u)
         EOF
     - name: pr-data
-      image: gcr.io/tekton-releases/dogfooding/hub
+      image: ghcr.io/tektoncd/plumbing/hub
       workingDir: $(workspaces.shared.path)/repo
       script: |
         #!/usr/bin/env bash
@@ -268,7 +268,7 @@ spec:
         -->
         EOF
     - name: create-draft
-      image: gcr.io/tekton-releases/dogfooding/hub
+      image: ghcr.io/tektoncd/plumbing/hub
       workingDir: $(workspaces.shared.path)/repo
       script: |
         #!/usr/bin/env bash