From f3fcd0b8108d6a8e89dfda998634715237598454 Mon Sep 17 00:00:00 2001
From: Shane McDonald <me@shanemcd.com>
Date: Sat, 23 Jan 2021 10:15:53 -0500
Subject: [PATCH] Update to operator sdk 0.19.4

---
 ansible/{ => templates}/awx-operator.yaml.j2 |  0
 ansible/templates/operator.yml.j2            | 21 +++++++++-----------
 build/Dockerfile                             |  2 +-
 deploy/awx-operator.yaml                     | 21 +++++++++-----------
 4 files changed, 19 insertions(+), 25 deletions(-)
 rename ansible/{ => templates}/awx-operator.yaml.j2 (100%)

diff --git a/ansible/awx-operator.yaml.j2 b/ansible/templates/awx-operator.yaml.j2
similarity index 100%
rename from ansible/awx-operator.yaml.j2
rename to ansible/templates/awx-operator.yaml.j2
diff --git a/ansible/templates/operator.yml.j2 b/ansible/templates/operator.yml.j2
index d6105102..8fd88f92 100644
--- a/ansible/templates/operator.yml.j2
+++ b/ansible/templates/operator.yml.j2
@@ -15,18 +15,7 @@ spec:
     spec:
       serviceAccountName: awx-operator
       containers:
-        - name: ansible
-          command:
-            - /usr/local/bin/ao-logs
-            - /tmp/ansible-operator/runner
-            - stdout
-          image: "{{ operator_image }}:{{ operator_version }}"
-          imagePullPolicy: "{{ pull_policy|default('Always') }}"
-          volumeMounts:
-            - mountPath: /tmp/ansible-operator/runner
-              name: runner
-              readOnly: true
-        - name: operator
+        - name: awx-operator
           image: "{{ operator_image }}:{{ operator_version }}"
           imagePullPolicy: "{{ pull_policy|default('Always') }}"
           volumeMounts:
@@ -42,6 +31,14 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: awx-operator
+            - name: ANSIBLE_GATHERING
+              value: explicit
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 6789
+            initialDelaySeconds: 5
+            periodSeconds: 3
       volumes:
         - name: runner
           emptyDir: {}
diff --git a/build/Dockerfile b/build/Dockerfile
index 61ff7a97..71fe5210 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/ansible-operator:v0.17.0
+FROM quay.io/operator-framework/ansible-operator:v0.19.4
 
 # Install Ansible requirements.
 COPY requirements.yml ${HOME}/requirements.yml
diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml
index 81e6ef4d..c1878dd3 100644
--- a/deploy/awx-operator.yaml
+++ b/deploy/awx-operator.yaml
@@ -110,18 +110,7 @@ spec:
     spec:
       serviceAccountName: awx-operator
       containers:
-        - name: ansible
-          command:
-            - /usr/local/bin/ao-logs
-            - /tmp/ansible-operator/runner
-            - stdout
-          image: "ansible/awx-operator:0.5.0"
-          imagePullPolicy: "Always"
-          volumeMounts:
-            - mountPath: /tmp/ansible-operator/runner
-              name: runner
-              readOnly: true
-        - name: operator
+        - name: awx-operator
           image: "ansible/awx-operator:0.5.0"
           imagePullPolicy: "Always"
           volumeMounts:
@@ -137,6 +126,14 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: awx-operator
+            - name: ANSIBLE_GATHERING
+              value: explicit
+          livenessProbe:
+            httpGet:
+              path: /healthz
+              port: 6789
+            initialDelaySeconds: 5
+            periodSeconds: 3
       volumes:
         - name: runner
           emptyDir: {}