From 534f7f76afd48a609b51030d24c334252616305c Mon Sep 17 00:00:00 2001
From: Luca Burgazzoli <lburgazzoli@gmail.com>
Date: Mon, 31 Jul 2023 17:50:35 +0200
Subject: [PATCH] chore: switch container registry from quay.io/lburgazzoli to
 docker.io/daprio

---
 .github/workflows/build.yaml      | 11 ++++++-----
 Makefile                          |  2 +-
 config/manager/kustomization.yaml |  8 ++++----
 config/samples/catalog.yaml       |  6 +++---
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e1d25ac..552c92e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -14,7 +14,7 @@ concurrency:
 
 env:
   IMAGE_VERSION: ${{ github.ref_name}}
-  IMAGE_TAG_BASE: "quay.io/lburgazzoli/dapr-operator"
+  IMAGE_TAG_BASE: "${{ vars.DOCKER_DAPRIO_REGISTRY }}/daprio/dapr-kubernetes-operator"
 
 jobs:
   build:
@@ -22,12 +22,13 @@ jobs:
     steps:
       - name: check-out
         uses: actions/checkout@v3
-      - name: Login to Quay.io
+      - name: Container Registry login
         uses: docker/login-action@v2
+        env:
+          DOCKER_REGISTRY_ID: ${{ vars.DOCKER_DAPRIO_REGISTRY }}
         with:
-          registry: quay.io
-          username: ${{ secrets.CONTAINER_REGISTRY_USERNAME }}
-          password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+          username: ${{ secrets.DOCKER_REGISTRY_ID }}
+          password: ${{ secrets.DOCKER_REGISTRY_PASS }}
       - name: Build Operator Container Image
         run: |
           export VERSION="${IMAGE_VERSION#v}"
diff --git a/Makefile b/Makefile
index 89ab56e..59f89ef 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 #
 # For example, running 'make bundle-build bundle-push catalog-build catalog-push' will build and push both
 # dapr.io/dapr-operator-bundle:$VERSION and dapr.io/dapr-operator-catalog:$VERSION.
-IMAGE_TAG_BASE ?= quay.io/lburgazzoli/dapr-operator
+IMAGE_TAG_BASE ?= docker.io/daprio/dapr-kubernetes-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 13b6807..fc887a6 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -1,8 +1,8 @@
 resources:
-- manager.yaml
+  - manager.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
-- name: controller
-  newName: quay.io/lburgazzoli/dapr-operator
-  newTag: v0.0.22
+  - name: controller
+    newName: docker.io/daprio/dapr-kubernetes-operator
+    newTag: v0.0.22
diff --git a/config/samples/catalog.yaml b/config/samples/catalog.yaml
index a2db366..6c61f0d 100644
--- a/config/samples/catalog.yaml
+++ b/config/samples/catalog.yaml
@@ -1,12 +1,12 @@
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
-  name: dapr-catalog
+  name: daprio-catalog
   namespace: openshift-marketplace
 spec:
   sourceType: grpc
-  image: quay.io/lburgazzoli/dapr-operator-catalog:latest
-  displayName: Dapr Catalog
+  image: docker.io/daprio/dapr-kubernetes-operator-catalog:latest
+  displayName: dapr.io catalog
   publisher: dapr.io
   updateStrategy:
     registryPoll: