From 894b0ffa5fc0feea62e947dc8ce8ff0cd906e91b Mon Sep 17 00:00:00 2001
From: "Christian M. Adams" <chadams@redhat.com>
Date: Mon, 25 Oct 2021 14:02:59 -0400
Subject: [PATCH] Rename operator image name to make it unique from resource &
 pulp operators

---
 config/default/manager_auth_proxy_patch.yaml | 2 +-
 config/default/manager_config_patch.yaml     | 8 ++++----
 config/manager/kustomization.yaml            | 2 +-
 config/manager/manager.yaml                  | 2 +-
 config/rbac/role.yaml                        | 2 +-
 config/rbac/role_binding.yaml                | 4 ++--
 config/testing/debug_logs_patch.yaml         | 2 +-
 config/testing/manager_image.yaml            | 2 +-
 config/testing/pull_policy/Always.yaml       | 2 +-
 config/testing/pull_policy/IfNotPresent.yaml | 2 +-
 config/testing/pull_policy/Never.yaml        | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml
index 999ea20b..4b913f7b 100644
--- a/config/default/manager_auth_proxy_patch.yaml
+++ b/config/default/manager_auth_proxy_patch.yaml
@@ -21,7 +21,7 @@ spec:
             - containerPort: 8443
               protocol: TCP
               name: https
-        - name: manager
+        - name: awx-manager
           args:
             - "--health-probe-bind-address=:6789"
             - "--metrics-bind-address=127.0.0.1:8080"
diff --git a/config/default/manager_config_patch.yaml b/config/default/manager_config_patch.yaml
index d1e952e9..9a2c0072 100644
--- a/config/default/manager_config_patch.yaml
+++ b/config/default/manager_config_patch.yaml
@@ -8,14 +8,14 @@ spec:
   template:
     spec:
       containers:
-        - name: manager
+        - name: awx-manager
           args:
             - "--config=controller_manager_config.yaml"
           volumeMounts:
-            - name: manager-config
+            - name: awx-manager-config
               mountPath: /controller_manager_config.yaml
               subPath: controller_manager_config.yaml
       volumes:
-        - name: manager-config
+        - name: awx-manager-config
           configMap:
-            name: manager-config
+            name: awx-manager-config
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index d094b2ae..260f8f08 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -5,7 +5,7 @@ generatorOptions:
 configMapGenerator:
 - files:
   - controller_manager_config.yaml
-  name: manager-config
+  name: awx-manager-config
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 5f96629c..72d5180b 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -30,7 +30,7 @@ spec:
             - --leader-elect
             - --leader-election-id=awx-operator
           image: controller:latest
-          name: manager
+          name: awx-manager
           env:
             - name: ANSIBLE_GATHERING
               value: explicit
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index d3e57ac7..381a66aa 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   creationTimestamp: null
-  name: manager-role
+  name: awx-manager-role
 rules:
   - apiGroups:
       - route.openshift.io
diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml
index 9e6d6a45..f8ef07f0 100644
--- a/config/rbac/role_binding.yaml
+++ b/config/rbac/role_binding.yaml
@@ -2,11 +2,11 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: manager-rolebinding
+  name: awx-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
-  name: manager-role
+  name: awx-manager-role
 subjects:
   - kind: ServiceAccount
     name: controller-manager
diff --git a/config/testing/debug_logs_patch.yaml b/config/testing/debug_logs_patch.yaml
index 3e31e2fb..0d01b1ff 100644
--- a/config/testing/debug_logs_patch.yaml
+++ b/config/testing/debug_logs_patch.yaml
@@ -8,7 +8,7 @@ spec:
   template:
     spec:
       containers:
-        - name: manager
+        - name: awx-manager
           env:
             - name: ANSIBLE_DEBUG_LOGS
               value: "TRUE"
diff --git a/config/testing/manager_image.yaml b/config/testing/manager_image.yaml
index e44f542d..12d34430 100644
--- a/config/testing/manager_image.yaml
+++ b/config/testing/manager_image.yaml
@@ -8,5 +8,5 @@ spec:
   template:
     spec:
       containers:
-        - name: manager
+        - name: awx-manager
           image: testing
diff --git a/config/testing/pull_policy/Always.yaml b/config/testing/pull_policy/Always.yaml
index 6b0a8e2a..2c704ba0 100644
--- a/config/testing/pull_policy/Always.yaml
+++ b/config/testing/pull_policy/Always.yaml
@@ -8,5 +8,5 @@ spec:
   template:
     spec:
       containers:
-        - name: manager
+        - name: awx-manager
           imagePullPolicy: Always
diff --git a/config/testing/pull_policy/IfNotPresent.yaml b/config/testing/pull_policy/IfNotPresent.yaml
index 2f52f496..a6c5b682 100644
--- a/config/testing/pull_policy/IfNotPresent.yaml
+++ b/config/testing/pull_policy/IfNotPresent.yaml
@@ -8,5 +8,5 @@ spec:
   template:
     spec:
       containers:
-        - name: manager
+        - name: awx-manager
           imagePullPolicy: IfNotPresent
diff --git a/config/testing/pull_policy/Never.yaml b/config/testing/pull_policy/Never.yaml
index 86f13d81..b20700d4 100644
--- a/config/testing/pull_policy/Never.yaml
+++ b/config/testing/pull_policy/Never.yaml
@@ -8,5 +8,5 @@ spec:
   template:
     spec:
       containers:
-        - name: manager
+        - name: awx-manager
           imagePullPolicy: Never