From 69e29be46e3b21acd98f94e60ad5ff42ea9e14bc Mon Sep 17 00:00:00 2001
From: Nick Carboni <ncarboni@redhat.com>
Date: Mon, 18 Jun 2018 15:13:31 -0400
Subject: [PATCH] Remove the health checks from ContainerEmbeddedAnsible

We already do health checks from the EmbeddedAnsibleWorker
so we don't really need OpenShift to do more, especially if they
have small built-in timeouts.

https://bugzilla.redhat.com/show_bug.cgi?id=1576744
---
 .../container_embedded_ansible.rb             | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/lib/embedded_ansible/container_embedded_ansible.rb b/lib/embedded_ansible/container_embedded_ansible.rb
index 265a15931cc9..8d8bbf26d607 100644
--- a/lib/embedded_ansible/container_embedded_ansible.rb
+++ b/lib/embedded_ansible/container_embedded_ansible.rb
@@ -77,30 +77,13 @@ def create_ansible_deployment_config
       dc[:spec][:template][:spec][:serviceAccountName] = settings.service_account
 
       container = dc[:spec][:template][:spec][:containers].first
-      container[:ports]          = [{:containerPort => 443}, {:containerPort => 80}]
-      container[:livenessProbe]  = liveness_probe
-      container[:readinessProbe] = readiness_probe
-      container[:env]            = container_environment
-      container[:image]          = image
-
+      container[:ports]           = [{:containerPort => 443}, {:containerPort => 80}]
+      container[:env]             = container_environment
+      container[:image]           = image
       container[:securityContext] = {:privileged => true}
-    end
-  end
-
-  def liveness_probe
-    {
-      :tcpSocket           => {:port => 443},
-      :initialDelaySeconds => 480,
-      :timeoutSeconds      => 3
-    }
-  end
 
-  def readiness_probe
-    {
-      :httpGet             => {:path => "/", :port => 443, :scheme => "HTTPS"},
-      :initialDelaySeconds => 200,
-      :timeoutSeconds      => 3
-    }
+      container.delete(:livenessProbe)
+    end
   end
 
   def container_environment