From 9de8f45c37fae687df69f2ea256a617e3bf76ddf Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Thu, 21 Jan 2021 15:23:37 -0500
Subject: [PATCH] Make tests use correct image!

---
 ansible/group_vars/all              | 2 --
 ansible/templates/operator.yml.j2   | 1 -
 molecule/test-local/converge.yml    | 6 ++----
 molecule/test-minikube/converge.yml | 5 ++---
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 13e4ac87..af82bcab 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -1,5 +1,3 @@
 operator_image: ansible/awx-operator
 operator_version: 0.5.0
 pull_policy: Always
-operator_file_path: "../deploy/awx-operator.yaml"
-operator_template: "../deploy/operator.yaml"
diff --git a/ansible/templates/operator.yml.j2 b/ansible/templates/operator.yml.j2
index ca4bcbba..d6105102 100644
--- a/ansible/templates/operator.yml.j2
+++ b/ansible/templates/operator.yml.j2
@@ -12,7 +12,6 @@ spec:
     metadata:
       labels:
         name: awx-operator
-        namespace: default
     spec:
       serviceAccountName: awx-operator
       containers:
diff --git a/molecule/test-local/converge.yml b/molecule/test-local/converge.yml
index b098524f..3678d8a8 100644
--- a/molecule/test-local/converge.yml
+++ b/molecule/test-local/converge.yml
@@ -26,11 +26,9 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates"
     pull_policy: Never
-    operator_image: awx.ansible.com/awx-operator:testing
+    operator_image: awx.ansible.com/awx-operator
+    operator_version: testing
     custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}"
-  vars_files:
-    - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all"
-
   tasks:
 
     - block:
diff --git a/molecule/test-minikube/converge.yml b/molecule/test-minikube/converge.yml
index 8a8c98e5..9ab0d90a 100644
--- a/molecule/test-minikube/converge.yml
+++ b/molecule/test-minikube/converge.yml
@@ -34,11 +34,10 @@
     deploy_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/deploy"
     templates_dir: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/templates"
     pull_policy: Never
-    operator_image: awx.ansible.com/awx-operator:testing
+    operator_image: awx.ansible.com/awx-operator
+    operator_version: testing
     # Change this to _awx to test AWX, _tower to test Tower.
     custom_resource: "{{ lookup('file', '/'.join([deploy_dir, 'crds/awx_v1beta1_molecule.yaml'])) | from_yaml }}"
-  vars_files:
-    - "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') }}/ansible/group_vars/all"
 
   tasks:
     - block: