From 2ab4946fd3676610c554564a8a3a0611513f4599 Mon Sep 17 00:00:00 2001
From: Lenka Segura <lsegura@redhat.com>
Date: Jan 27 2023 17:23:31 +0000
Subject: Update for quay.io


---

diff --git a/Makefile b/Makefile
index f24905f..88cf8d5 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,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
 # fas2discourse.apps.fedoraproject.org/fas2discourse-bundle:$VERSION and fas2discourse.apps.fedoraproject.org/fas2discourse-catalog:$VERSION.
-IMAGE_TAG_BASE ?= fas2discourse.apps.fedoraproject.org/fas2discourse
+IMAGE_TAG_BASE ?= quay.io/fedora/fas2discourse-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>)
@@ -47,7 +47,7 @@ ifeq ($(USE_IMAGE_DIGESTS), true)
 endif
 
 # Image URL to use all building/pushing image targets
-IMG ?= controller:latest
+IMG ?= $(IMAGE_TAG_BASE):v$(VERSION)
 
 .PHONY: all
 all: docker-build
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 636d408..4401235 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -1,5 +1,5 @@
 # Adds namespace to all resources.
-namespace: fas2discourse-system
+namespace: fas2discourse-operator
 
 # Value of this field is prepended to the
 # names of all resources, e.g. a deployment named
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 2bcd3ee..ce65302 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -8,3 +8,10 @@ configMapGenerator:
 - name: manager-config
   files:
   - controller_manager_config.yaml
+  name: manager-config
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+images:
+  - name: controller
+    newName: quay.io/fedora/fas2discourse-operator
+    newTag: v.0.0.1
diff --git a/config/rbac/auth_proxy_role_binding.yaml b/config/rbac/auth_proxy_role_binding.yaml
index ec7acc0..1ae0c3c 100644
--- a/config/rbac/auth_proxy_role_binding.yaml
+++ b/config/rbac/auth_proxy_role_binding.yaml
@@ -9,4 +9,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: controller-manager
-  namespace: system
+  namespace: fas2discourse-dev
diff --git a/config/rbac/auth_proxy_service.yaml b/config/rbac/auth_proxy_service.yaml
index 71f1797..a4c9b05 100644
--- a/config/rbac/auth_proxy_service.yaml
+++ b/config/rbac/auth_proxy_service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     control-plane: controller-manager
   name: controller-manager-metrics-service
-  namespace: system
+  namespace: fas2discourse-dev
 spec:
   ports:
   - name: https
diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml
index 1d1321e..d88ad0d 100644
--- a/config/rbac/leader_election_role_binding.yaml
+++ b/config/rbac/leader_election_role_binding.yaml
@@ -9,4 +9,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: controller-manager
-  namespace: system
+  namespace: fas2discourse-dev
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
index 2070ede..6e277b3 100644
--- a/config/rbac/role_binding.yaml
+++ b/config/rbac/role_binding.yaml
@@ -9,4 +9,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: controller-manager
-  namespace: system
+  namespace: fas2discourse-dev
diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml
index 7cd6025..fbd88dc 100644
--- a/config/rbac/service_account.yaml
+++ b/config/rbac/service_account.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: controller-manager
-  namespace: system
+  namespace: fas2discourse-dev