Merge pull request #70 from shanemcd/update-base-imaage

Update to operator sdk 0.19.4

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: {}

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

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: {}