From a11f3257f4ba294d02cf071c2690697f02522d3a Mon Sep 17 00:00:00 2001
From: Keshav Prasad <keshavprasadms@gmail.com>
Date: Wed, 21 Apr 2021 15:32:23 +0530
Subject: [PATCH] fix: kong env, kube probe changes (#2457)

* fix: updated readiness and liveness probe values (#2451)

* fix: adding kong lua socket env variable
---
 .../templates/api-manager.env                 |   5 +-
 ansible/roles/stack-sunbird/defaults/main.yml | 435 ++++++++----------
 .../roles/helm-deploy/defaults/main.yml       |  32 +-
 3 files changed, 216 insertions(+), 256 deletions(-)

diff --git a/ansible/roles/stack-api-manager/templates/api-manager.env b/ansible/roles/stack-api-manager/templates/api-manager.env
index 86ffb9a9be..4596b8b2ef 100644
--- a/ansible/roles/stack-api-manager/templates/api-manager.env
+++ b/ansible/roles/stack-api-manager/templates/api-manager.env
@@ -9,5 +9,6 @@ KONG_ADMIN_LISTEN=0.0.0.0:8001
 KONG_MEM_CACHE_SIZE={{ kong_mem_cache_size | default('128m') }}
 KONG_TRUSTED_IPS=0.0.0.0/0,::/0
 KONG_UPSTREAM_KEEPALIVE={{ kong_upstream_keepalive | default('200') }}
-KONG_NGINX_WORKER_PROCESSES={{ kong_nginx_worker_processes | default('auto')}}
-KONG_RATELIMIT_CACHE_SIZE={{kong_ratelimit_cache_size | default('12m') }}
+KONG_NGINX_WORKER_PROCESSES={{ kong_nginx_worker_processes | default('auto') }}
+KONG_RATELIMIT_CACHE_SIZE={{ kong_ratelimit_cache_size | default('12m') }}
+KONG_LUA_SOCKET_POOL_SIZE={{ kong_lua_socket_pool_size | default('30') }}
diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml
index 700aaa49e9..ba50b5df0a 100644
--- a/ansible/roles/stack-sunbird/defaults/main.yml
+++ b/ansible/roles/stack-sunbird/defaults/main.yml
@@ -284,19 +284,19 @@ dhiti_liveness_readiness:
     httpGet:
       path: /ping
       port: 4700
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /ping
       port: 4700
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 groups_liveness_readiness:
   healthcheck: true
@@ -304,19 +304,19 @@ groups_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 lms_liveness_readiness:
   healthcheck: true
@@ -324,19 +324,19 @@ lms_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 apimanager_liveness_readiness:
   healthcheck: true
@@ -344,20 +344,19 @@ apimanager_liveness_readiness:
     httpGet:
       path: /status
       port: 8001
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /status
       port: 8001
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 1
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 assessment_liveness_readiness:
   healthcheck: true
@@ -365,19 +364,19 @@ assessment_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 cert_liveness_readiness:
   healthcheck: true
@@ -385,19 +384,19 @@ cert_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 certregistry_liveness_readiness:
   healthcheck: true
@@ -405,19 +404,19 @@ certregistry_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 content_liveness_readiness:
   healthcheck: true
@@ -425,19 +424,19 @@ content_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 enc_liveness_readiness:
   healthcheck: true
@@ -445,19 +444,19 @@ enc_liveness_readiness:
     httpGet:
       path: /service/health
       port: 8013
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 8013
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 knowledgemw_liveness_readiness:
   healthcheck: true
@@ -465,19 +464,19 @@ knowledgemw_liveness_readiness:
     httpGet:
       path: /service/health
       port: 5000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 5000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 learner_liveness_readiness:
   healthcheck: true
@@ -485,19 +484,19 @@ learner_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 notification_liveness_readiness:
   healthcheck: true
@@ -505,19 +504,19 @@ notification_liveness_readiness:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 player_liveness_readiness:
   healthcheck: true
@@ -525,19 +524,19 @@ player_liveness_readiness:
     httpGet:
       path: /service/health
       port: 3000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 3000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 print_liveness_readiness:
   healthcheck: true
@@ -545,19 +544,19 @@ print_liveness_readiness:
     httpGet:
       path: /health
       port: 5000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 5000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 telemetry_liveness_readiness:
   healthcheck: true
@@ -565,38 +564,38 @@ telemetry_liveness_readiness:
     httpGet:
       path: /health
       port: 9001
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 9001
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 userorg_liveness_readiness:
   readinessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 discussionsmw_liveness_readiness:
   healthcheck: true
@@ -604,59 +603,19 @@ discussionsmw_liveness_readiness:
     httpGet:
       path: /health
       port: 3002
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 3002
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-
-search_liveness_readiness:
-  healthcheck: true
-  readinessProbe:
-    httpGet:
-      path: /health
-      port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 10
+    initialDelaySeconds: 15
+    periodSeconds: 15
     timeoutSeconds: 5
-    failureThreshold: 5
-    successThreshold: 2
-  livenessProbe:
-    httpGet:
-      path: /health
-      port: 9000
-    initialDelaySeconds: 60
-    periodSeconds: 10
-    timeoutSeconds: 10
-    failureThreshold: 5
-
-taxonomy_liveness_readiness:
-  healthcheck: true
-  readinessProbe:
-    httpGet:
-      path: /health
-      port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
-  livenessProbe:
-    httpGet:
-      path: /health
-      port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    failureThreshold: 2
 
 search_liveness_readiness:
   healthcheck: true
@@ -664,19 +623,19 @@ search_liveness_readiness:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 taxonomy_liveness_readiness:
   healthcheck: true
@@ -684,19 +643,19 @@ taxonomy_liveness_readiness:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 report_liveness_readiness:
   healthcheck: true
@@ -704,19 +663,19 @@ report_liveness_readiness:
     httpGet:
       path: /health
       port: 3030
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /service/health
       port: 3030
-    initialDelaySeconds: 60
-    periodSeconds: 10
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 analytics_liveness_readiness:
   healthcheck: true
@@ -724,19 +683,19 @@ analytics_liveness_readiness:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 dial_liveness_readiness:
   healthcheck: true
@@ -744,19 +703,19 @@ dial_liveness_readiness:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 9000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 adminutil__access_keyprefix: "access"
 adminutil__access_keystart: 0
diff --git a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
index 8f248c5ece..b740841c90 100644
--- a/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
+++ b/kubernetes/ansible/roles/helm-deploy/defaults/main.yml
@@ -69,19 +69,19 @@ adminutils_liveness_readiness:
     httpGet:
       path: /health
       port: 4000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
-    successThreshold: 2
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
+    successThreshold: 1
   livenessProbe:
     httpGet:
       path: /health
       port: 4000
-    initialDelaySeconds: 30
-    periodSeconds: 30
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 api_managerecho_liveness_readiness:
   healthcheck: true
@@ -89,19 +89,19 @@ api_managerecho_liveness_readiness:
     httpGet:
       path: /hello
       port: 9595
-    initialDelaySeconds: 30
-    periodSeconds: 10
+    initialDelaySeconds: 15
+    periodSeconds: 15
     timeoutSeconds: 5
-    failureThreshold: 5
+    failureThreshold: 2
     successThreshold: 1
   livenessProbe:
     httpGet:
       path: /hello
       port: 9595
-    initialDelaySeconds: 60
-    periodSeconds: 10
-    timeoutSeconds: 10
-    failureThreshold: 5
+    initialDelaySeconds: 15
+    periodSeconds: 15
+    timeoutSeconds: 5
+    failureThreshold: 2
 
 adminutil__device_keyprefix: "device_key"
 adminutil__access_keyprefix: "access_key"