ckan: adjust liveness and readiness probes and allow to modify via (o…

…ptional) values
datopian · Nov 13, 2018 · eef5f93 · eef5f93
1 parent c5b4306
commit eef5f93
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/charts_repository/ckan-v0.0.0.tgz b/charts_repository/ckan-v0.0.0.tgz
diff --git a/charts_repository/efs-v0.0.0.tgz b/charts_repository/efs-v0.0.0.tgz
diff --git a/charts_repository/index.yaml b/charts_repository/index.yaml
@@ -1,66 +1,66 @@
 apiVersion: v1
 entries:
   ckan:
-  - created: 2018-11-13T18:46:16.58154347+02:00
+  - created: 2018-11-13T23:35:14.915013313+02:00
     digest: 1adc37fc3e0fd5e1dc71d380d962b2493c7e9a71a1546f6d8bceda6a57dd0cbf
     name: ckan
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/ckan-v0.0.3.tgz
     version: v0.0.3
-  - created: 2018-11-13T18:46:16.581078995+02:00
+  - created: 2018-11-13T23:35:14.914398572+02:00
     digest: 32fbadcdb115a991f2e62218db36aef6ecb1c3c962b4956940acc7408ed0348d
     name: ckan
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/ckan-v0.0.2.tgz
     version: v0.0.2
-  - created: 2018-11-13T18:46:16.580531567+02:00
+  - created: 2018-11-13T23:35:14.913766189+02:00
     digest: 1df1f656568d00357ed82af087f21348f38d59cbe556845259c2d9cedd5dbd1a
     name: ckan
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/ckan-v0.0.1.tgz
     version: v0.0.1
-  - created: 2018-11-13T18:46:16.579867853+02:00
-    digest: b48205240a35ca2305d355e7cb7fb4df485dbb5306d9b45525eac305332886c0
+  - created: 2018-11-13T23:35:14.913099607+02:00
+    digest: 02ccf698fe1c7ed442d04a2d548850341d41a09fdc94d74fe79687020a1ee55f
     name: ckan
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/ckan-v0.0.0.tgz
     version: v0.0.0
   efs:
-  - created: 2018-11-13T18:46:16.582157047+02:00
+  - created: 2018-11-13T23:35:14.915813508+02:00
     digest: b247e3b5f68057c5e4810b4adcf4fbc14e907b84f13015421f50e8bb93e7932b
     name: efs
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/efs-v0.0.3.tgz
     version: v0.0.3
-  - created: 2018-11-13T18:46:16.582024772+02:00
+  - created: 2018-11-13T23:35:14.915544712+02:00
     digest: cf24e9f0c836073232677bb36bfea878c1d459e68a6cb91502ed280cd6b54425
     name: efs
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/efs-v0.0.2.tgz
     version: v0.0.2
-  - created: 2018-11-13T18:46:16.581740757+02:00
-    digest: 747274a4b1de7bfcfe5fe6833a1bf2e6c45f8f7677fc7580ec42830bb875d4cb
+  - created: 2018-11-13T23:35:14.915221999+02:00
+    digest: d5a2584bbb881ce95dd7dcc0280ed1f8fe3b1a197f5ca22476b42c22178e26e6
     name: efs
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/efs-v0.0.0.tgz
     version: v0.0.0
   traefik:
-  - created: 2018-11-13T18:46:16.58272637+02:00
+  - created: 2018-11-13T23:35:14.916891133+02:00
     digest: f34d9474a5ce8d50a6185e3615317a0cfec04e3df0c45a2934eb1665129b18f1
     name: traefik
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/traefik-v0.0.3.tgz
     version: v0.0.3
-  - created: 2018-11-13T18:46:16.582569353+02:00
+  - created: 2018-11-13T23:35:14.916563889+02:00
     digest: e6ee915b867b870da1355c8c61693b43ad39339d0089c8f0ccab6807c9d456b0
     name: traefik
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/traefik-v0.0.2.tgz
     version: v0.0.2
-  - created: 2018-11-13T18:46:16.582307649+02:00
-    digest: c057b29a7a17b97f1c0406286d00b3ce2e406ce000ac2a9d735e49de8b46ac56
+  - created: 2018-11-13T23:35:14.916261588+02:00
+    digest: 09d0cd491d3792f717fcc15205655d2f119d9669596823b6c95f7518dcaba4c9
     name: traefik
     urls:
     - https://raw.githubusercontent.com/ViderumGlobal/ckan-cloud-helm/master/charts_repository/traefik-v0.0.0.tgz
     version: v0.0.0
-generated: 2018-11-13T18:46:16.579303648+02:00
+generated: 2018-11-13T23:35:14.912431552+02:00
diff --git a/charts_repository/traefik-v0.0.0.tgz b/charts_repository/traefik-v0.0.0.tgz
diff --git a/ckan/templates/ckan-deployment.yaml b/ckan/templates/ckan-deployment.yaml
@@ -93,18 +93,18 @@ spec:
           httpGet:
             path: /
             port: 5000
-          initialDelaySeconds: 3
-          periodSeconds: 5
-          timeoutSeconds: 8
-          failureThreshold: 2
+          initialDelaySeconds: {{ .Values.ckanReadinessInitialDelaySeconds | default "15" }}
+          periodSeconds: {{ .Values.ckanReadinessPeriodSeconds | default "10" }}
+          timeoutSeconds: {{ .Values.ckanReadinessTimeoutSeconds | default "12" }}
+          failureThreshold: {{ .Values.ckanReadinessFailureThreshold | default "5" }}
         livenessProbe:
           httpGet:
             path: /
             port: 5000
-          initialDelaySeconds: 20
-          periodSeconds: 60
-          timeoutSeconds: 8
-          failureThreshold: 3
+          initialDelaySeconds: {{ .Values.ckanLivenessInitialDelaySeconds | default "60" }}
+          periodSeconds: {{ .Values.ckanLivenessPeriodSeconds | default "60" }}
+          timeoutSeconds: {{ .Values.ckanLivenessTimeoutSeconds | default "12" }}
+          failureThreshold: {{ .Values.ckanLivenessFailureThreshold | default "5" }}
       volumes:
       - name: ckan-conf-secrets
         emptyDir: {}