From 387932e960260e1834182a2fdcfd6d3564da9e57 Mon Sep 17 00:00:00 2001
From: Yanis Guenane <yguenane@gmail.com>
Date: Wed, 24 Mar 2021 20:33:03 +0100
Subject: [PATCH] Update liveness probe defaults

The liveness probes default are too agressive and can lead to
undeployable operators[1][2] - We are bumping them as per the
operator-sdk default in 1.0[3]

[1] https://github.com/operator-framework/operator-sdk/issues/3216
[2] https://github.com/operator-framework/operator-sdk/issues/3267
[3]
https://github.com/operator-framework/operator-sdk/commit/ea43495073a543ede5f10ea5790660004cf750be

Fixes: https://github.com/ansible/awx-operator/issues/131
---
 ansible/templates/operator.yml.j2                          | 4 ++--
 deploy/awx-operator.yaml                                   | 7 ++-----
 deploy/crds/awx_v1beta1_crd.yaml                           | 3 ---
 .../manifests/awx-operator.clusterserviceversion.yaml      | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ansible/templates/operator.yml.j2 b/ansible/templates/operator.yml.j2
index 8fd88f92..f4256339 100644
--- a/ansible/templates/operator.yml.j2
+++ b/ansible/templates/operator.yml.j2
@@ -37,8 +37,8 @@ spec:
             httpGet:
               path: /healthz
               port: 6789
-            initialDelaySeconds: 5
-            periodSeconds: 3
+            initialDelaySeconds: 15
+            periodSeconds: 20
       volumes:
         - name: runner
           emptyDir: {}
diff --git a/deploy/awx-operator.yaml b/deploy/awx-operator.yaml
index c352d1f4..58e2c141 100644
--- a/deploy/awx-operator.yaml
+++ b/deploy/awx-operator.yaml
@@ -143,8 +143,8 @@ spec:
             httpGet:
               path: /healthz
               port: 6789
-            initialDelaySeconds: 5
-            periodSeconds: 3
+            initialDelaySeconds: 15
+            periodSeconds: 20
       volumes:
         - name: runner
           emptyDir: {}
@@ -350,9 +350,6 @@ spec:
                   type: string
                 tower_web_extra_volume_mounts:
                   type: string
-                tower_ee_image:
-                  description: Registry path to the Execution Environment container to use
-                  type: string
                 tower_redis_image:
                   description: Registry path to the redis container to use
                   type: string
diff --git a/deploy/crds/awx_v1beta1_crd.yaml b/deploy/crds/awx_v1beta1_crd.yaml
index 7684cb64..0cbda243 100644
--- a/deploy/crds/awx_v1beta1_crd.yaml
+++ b/deploy/crds/awx_v1beta1_crd.yaml
@@ -199,9 +199,6 @@ spec:
                   type: string
                 tower_web_extra_volume_mounts:
                   type: string
-                tower_ee_image:
-                  description: Registry path to the Execution Environment container to use
-                  type: string
                 tower_redis_image:
                   description: Registry path to the redis container to use
                   type: string
diff --git a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
index d58dbfc6..c3e66461 100644
--- a/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
+++ b/deploy/olm-catalog/awx-operator/manifests/awx-operator.clusterserviceversion.yaml
@@ -440,8 +440,8 @@ spec:
                   httpGet:
                     path: /healthz
                     port: 6789
-                  initialDelaySeconds: 5
-                  periodSeconds: 3
+                  initialDelaySeconds: 15
+                  periodSeconds: 20
                 name: awx-operator
                 resources: {}
                 volumeMounts: