diff --git a/.ko.yaml b/.ko.yaml index 4c9fa221b5..d5be8d66c6 100644 --- a/.ko.yaml +++ b/.ko.yaml @@ -1,4 +1,4 @@ -defaultBaseImage: gcr.io/distroless/static:nonroot +defaultBaseImage: ghcr.io/distroless/static baseImageOverrides: github.com/tektoncd/operator/cmd/openshift/operator: registry.access.redhat.com/ubi8/ubi-minimal github.com/tektoncd/operator/cmd/openshift/webhook: registry.access.redhat.com/ubi8/ubi-minimal diff --git a/charts/tekton-operator/templates/_helpers.tpl b/charts/tekton-operator/templates/_helpers.tpl index 1ae78cbe0a..f778661804 100644 --- a/charts/tekton-operator/templates/_helpers.tpl +++ b/charts/tekton-operator/templates/_helpers.tpl @@ -103,9 +103,9 @@ tekton-operator {{- $image = .Values.operator.image.repository }} {{- else -}} {{- if .Values.openshift.enabled -}} - {{- $image = "gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/operator" -}} + {{- $image = "ghcr.io/tektoncd/operator/github.com/tektoncd/operator/cmd/openshift/operator" -}} {{- else -}} - {{- $image = "gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/operator" -}} + {{- $image = "ghcr.io/tektoncd/operator/github.com/tektoncd/operator/cmd/kubernetes/operator" -}} {{- end -}} {{- end -}} {{- printf "%s:%s" $image $tag -}} @@ -124,9 +124,9 @@ tekton-operator {{- $image = .Values.webhook.image.repository }} {{- else -}} {{- if .Values.openshift.enabled -}} - {{- $image = "gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/webhook" -}} + {{- $image = "ghcr.io/tektoncd/operator/github.com/tektoncd/operator/cmd/openshift/webhook" -}} {{- else -}} - {{- $image = "gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/webhook" -}} + {{- $image = "ghcr.io/tektoncd/operator/github.com/tektoncd/operator/cmd/kubernetes/webhook" -}} {{- end -}} {{- end -}} {{- printf "%s:%s" $image $tag -}} @@ -140,9 +140,9 @@ tekton-operator {{- $image = .Values.webhookProxy.image.repository }} {{- else -}} {{- if .Values.openshift.enabled -}} - {{- $image = "gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/openshift/proxy-webhook" -}} + {{- $image = "ghcr.io/tektoncd/operator/github.com/tektoncd/operator/cmd/openshift/proxy-webhook" -}} {{- else -}} - {{- $image = "gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/proxy-webhook" -}} + {{- $image = "ghcr.io/tektoncd/operator/github.com/tektoncd/operator/cmd/kubernetes/proxy-webhook" -}} {{- end -}} {{- end -}} {{- printf "%s:%s" $image $tag -}} diff --git a/charts/tekton-operator/values.yaml b/charts/tekton-operator/values.yaml index a3eba0b21c..b791507c54 100644 --- a/charts/tekton-operator/values.yaml +++ b/charts/tekton-operator/values.yaml @@ -55,8 +55,8 @@ operator: pruner: image: # Container image for Tekton pruner. Defaults to gcr. - repository: "gcr.io/tekton-releases/dogfooding/tkn" - tag: "233de6c8b8583a34c2379fa98d42dba739146c9336e8d41b66030484357481ed" # v0.38.1 + repository: "ghcr.io/tektoncd/plumbing/tkn" + tag: "d1da68e766393c4b4eb162128f2c5fd2cee270828811a113fcda1e8a586e7471" ## Configuration for the tekton-operator-webhook pod webhook: diff --git a/config/kubernetes/base/operator.yaml b/config/kubernetes/base/operator.yaml index 143c67c42d..930259b36e 100644 --- a/config/kubernetes/base/operator.yaml +++ b/config/kubernetes/base/operator.yaml @@ -51,7 +51,7 @@ spec: - name: IMAGE_PIPELINES_PROXY value: ko://github.com/tektoncd/operator/cmd/kubernetes/proxy-webhook - name: IMAGE_JOB_PRUNER_TKN - value: gcr.io/tekton-releases/dogfooding/tkn@sha256:233de6c8b8583a34c2379fa98d42dba739146c9336e8d41b66030484357481ed # v0.38.1 + value: ghcr.io/tektoncd/plumbing/tkn@sha256:d1da68e766393c4b4eb162128f2c5fd2cee270828811a113fcda1e8a586e7471 - name: METRICS_DOMAIN value: tekton.dev/operator - name: VERSION diff --git a/config/openshift/base/operator.yaml b/config/openshift/base/operator.yaml index d05e616a16..2068f721db 100644 --- a/config/openshift/base/operator.yaml +++ b/config/openshift/base/operator.yaml @@ -63,7 +63,7 @@ spec: - name: IMAGE_PIPELINES_PROXY value: ko://github.com/tektoncd/operator/cmd/openshift/proxy-webhook - name: IMAGE_JOB_PRUNER_TKN - value: gcr.io/tekton-releases/dogfooding/tkn@sha256:233de6c8b8583a34c2379fa98d42dba739146c9336e8d41b66030484357481ed # v0.38.1 + value: ghcr.io/tektoncd/plumbing/tkn@sha256:d1da68e766393c4b4eb162128f2c5fd2cee270828811a113fcda1e8a586e7471 - name: METRICS_DOMAIN value: tekton.dev/operator - name: VERSION diff --git a/operatorhub/kubernetes/config.yaml b/operatorhub/kubernetes/config.yaml index 697ab46282..160083083d 100644 --- a/operatorhub/kubernetes/config.yaml +++ b/operatorhub/kubernetes/config.yaml @@ -13,7 +13,7 @@ image-substitutions: containerName: tekton-operator-lifecycle envKeys: - IMAGE_PIPELINES_PROXY -- image: gcr.io/tekton-releases/dogfooding/tkn@sha256:233de6c8b8583a34c2379fa98d42dba739146c9336e8d41b66030484357481ed # v0.38.1 +- image: ghcr.io/tektoncd/plumbing/tkn@sha256:d1da68e766393c4b4eb162128f2c5fd2cee270828811a113fcda1e8a586e7471 replaceLocations: envTargets: - deploymentName: tekton-operator diff --git a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml index 040c9d74dc..bf8521e66a 100644 --- a/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml +++ b/operatorhub/kubernetes/release-artifacts/bundle/manifests/tektoncd-operator.clusterserviceversion.yaml @@ -815,7 +815,7 @@ spec: - name: IMAGE_PIPELINES_PROXY value: gcr.io/tekton-releases/github.com/tektoncd/operator/cmd/kubernetes/proxy-webhook@sha256:c2c3a38c2d26fc05d336e0e47c24a488a26cc6df8d72cd55e00ac05668d090d4 - name: IMAGE_JOB_PRUNER_TKN - value: gcr.io/tekton-releases/dogfooding/tkn@sha256:233de6c8b8583a34c2379fa98d42dba739146c9336e8d41b66030484357481ed # v0.38.1 + value: ghcr.io/tektoncd/plumbing/tkn@sha256:d1da68e766393c4b4eb162128f2c5fd2cee270828811a113fcda1e8a586e7471 - name: METRICS_DOMAIN value: tekton.dev/operator - name: VERSION diff --git a/tekton/build-publish-images-manifests.yaml b/tekton/build-publish-images-manifests.yaml index ee60b5d56d..e3f0f1c75d 100644 --- a/tekton/build-publish-images-manifests.yaml +++ b/tekton/build-publish-images-manifests.yaml @@ -17,7 +17,7 @@ spec: description: The vX.Y.Z version that the artifacts should be tagged with (including `v`) - name: imageRegistry description: The target image registry - default: gcr.io + default: ghcr.io - name: imageRegistryPath description: The path (project) in the image registry - name: imageRegistryRegions diff --git a/tekton/operator-release-pipeline.yaml b/tekton/operator-release-pipeline.yaml index c977f0d356..b1336156f0 100644 --- a/tekton/operator-release-pipeline.yaml +++ b/tekton/operator-release-pipeline.yaml @@ -12,7 +12,7 @@ spec: description: the git revision to release - name: imageRegistry description: The target image registry - default: gcr.io + default: ghcr.io - name: imageRegistryPath description: The path (project) in the image registry default: tekton-releases