Make the readiness and liveness probes configurable (jfrog#963)

rahulnlb1 · Jun 22, 2020 · c43d9f1 · c43d9f1
1 parent a662348
commit c43d9f1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 19 deletions.
diff --git a/stable/distribution/CHANGELOG.md b/stable/distribution/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Distribution Chart Changelog
 All changes to this project chart be documented in this file.
 
+## [5.2.4] -  Jun 21, 2020
+* Make the readiness and liveness probes configurable
+
 ## [5.2.3] -  Jun 12, 2020
 * Added support for javaopts for distrubutor and distribution via systemyaml
 

diff --git a/stable/distribution/Chart.yaml b/stable/distribution/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 name: distribution
 home: https://jfrog.com/platform/
 description: A Helm chart for JFrog Distribution
-version: 5.2.3
+version: 5.2.4
 appVersion: 2.3.0
 sources:
 - https://bintray.com/jfrog/product/distribution/view

diff --git a/stable/distribution/templates/distribution-statefulset.yaml b/stable/distribution/templates/distribution-statefulset.yaml
@@ -201,19 +201,14 @@ spec:
         {{- end }}
         resources:
 {{ toYaml .Values.distribution.resources | indent 10 }}
+      {{- if .Values.distribution.readinessProbe.enabled }}
         readinessProbe:
-          httpGet:
-            path: /api/v1/system/ping
-            port: {{ .Values.distribution.internalPort }}
-          initialDelaySeconds: 30
-          periodSeconds: 10
-          failureThreshold: 10
+{{ tpl .Values.distribution.livenessProbe.config . | indent 10 }}
+      {{- end }}
+      {{- if .Values.distribution.livenessProbe.enabled }}
         livenessProbe:
-          httpGet:
-            path: /api/v1/system/ping
-            port: {{ .Values.distribution.internalPort }}
-          initialDelaySeconds: 60
-          periodSeconds: 10
+{{ tpl .Values.distribution.livenessProbe.config . | indent 10 }}
+      {{- end }}
       - name: {{ .Values.distributor.name }}
         image: '{{ .Values.distributor.image.repository }}:{{ default .Chart.AppVersion .Values.distributor.image.version }}'
         imagePullPolicy: {{ .Values.distributor.image.imagePullPolicy }}

diff --git a/stable/distribution/values.yaml b/stable/distribution/values.yaml
@@ -206,13 +206,6 @@ distribution:
   jfrogUrl:
 
   serviceId:
-  env:
-    artifactoryUrl:
-    btServerUrl:
-    artifactoryCi1Url:
-    artifactoryEdge1Url:
-    artifactoryEdge2Url:
-    artifactoryEdge3Url:
 
   ## Extra environment variables that can be used to tune Distribution to your needs.
   ## Uncomment and set value as needed
@@ -293,6 +286,30 @@ distribution:
   #    memory: "4Gi"
   #    cpu: "2"
 
+  livenessProbe:
+    enabled: true
+    config: |
+      httpGet:
+        path: /api/v1/system/ping
+        port: {{ .Values.distribution.internalPort }}
+      initialDelaySeconds: 30
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 3
+      successThreshold: 1
+
+  readinessProbe:
+    enabled: true
+    config: |
+      httpGet:
+        path: /api/v1/system/ping
+        port: {{ .Values.distribution.internalPort }}
+      initialDelaySeconds: 60
+      periodSeconds: 10
+      timeoutSeconds: 1
+      failureThreshold: 10
+      successThreshold: 1
+
   ## Control Java options (JAVA_OPTIONS)
   ## IMPORTANT: keep javaOpts.xmx no higher than resources.limits.memory
   javaOpts: