Merge pull request #4 from smunukutla-mycarrier/fix-probes-and-ports

Fix probes and ports
metrico · May 20, 2024 · e020135 · e020135
2 parents f4e8902 + 0b69bcf
commit e020135
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 12 deletions.
diff --git a/templates/reader.yaml b/templates/reader.yaml
@@ -60,20 +60,30 @@ spec:
           imagePullPolicy: {{ .Values.reader.imagePullPolicy }}
           name: qryn-reader
           ports:
-            - containerPort: {{ .Values.reader.env.qrynHttpSettingsPort }}
+            - name: http
+              containerPort: {{.Values.reader.env.qrynHttpSettingsPort }}
               protocol: TCP
           resources: {{- toYaml .Values.reader.resources | nindent 12 }}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           livenessProbe:
             httpGet:
-              path: "/ready"
+              path: /ready
               port: http
-            initialDelaySeconds: 10 #Default 0
-            periodSeconds: 10 #Default 10
-            timeoutSeconds: 1 #Default 1
-            successThreshold: 1 #Default 1
-            failureThreshold: 3 #Default 3
+            initialDelaySeconds: {{ .Values.reader.livenessProbe.initialDelaySeconds | default 15 }}
+            periodSeconds: {{ .Values.reader.livenessProbe.periodSeconds | default 10 }}
+            timeoutSeconds: {{ .Values.reader.livenessProbe.timeoutSeconds | default 3 }}
+            failureThreshold: {{ .Values.reader.livenessProbe.failureThreshold | default 6 }}
+            successThreshold: {{ .Values.reader.livenessProbe.successThreshold | default 1 }}
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: http
+            initialDelaySeconds: {{ .Values.reader.readinessProbe.initialDelaySeconds | default 15 }}
+            periodSeconds: {{ .Values.reader.readinessProbe.periodSeconds | default 10 }}
+            timeoutSeconds: {{ .Values.reader.readinessProbe.timeoutSeconds | default 3 }}
+            failureThreshold: {{ .Values.reader.readinessProbe.failureThreshold | default 6 }}
+            successThreshold: {{ .Values.reader.readinessProbe.successThreshold | default 1 }}
       dnsPolicy: ClusterFirst
       imagePullSecrets:
         - name: qryn-dckr

diff --git a/templates/writer.yaml b/templates/writer.yaml
@@ -64,17 +64,30 @@ spec:
           imagePullPolicy: {{ .Values.writer.imagePullPolicy }}
           name: qryn-writer
           ports:
-            {{ range .Values.writer.ports }}
-            - containerPort: {{ .targetPort }}
-              protocol: {{ .protocol }}
-            {{ end }}
+            - name: http
+              containerPort: {{.Values.writer.env.qrynHttpSettingsPort }}
+              protocol: TCP
           resources: {{- toYaml .Values.writer.resources | nindent 12 }}
           terminationMessagePath: /dev/termination-log
           terminationMessagePolicy: File
           livenessProbe:
             httpGet:
-              path: "/ready"
+              path: /ready
               port: http
+            initialDelaySeconds: {{ .Values.writer.livenessProbe.initialDelaySeconds | default 15 }}
+            periodSeconds: {{ .Values.writer.livenessProbe.periodSeconds | default 10 }}
+            timeoutSeconds: {{ .Values.writer.livenessProbe.timeoutSeconds | default 3 }}
+            failureThreshold: {{ .Values.writer.livenessProbe.failureThreshold | default 6 }}
+            successThreshold: {{ .Values.writer.livenessProbe.successThreshold | default 1 }}
+          readinessProbe:
+            httpGet:
+              path: /ready
+              port: http
+            initialDelaySeconds: {{ .Values.writer.readinessProbe.initialDelaySeconds | default 15 }}
+            periodSeconds: {{ .Values.writer.readinessProbe.periodSeconds | default 10 }}
+            timeoutSeconds: {{ .Values.writer.readinessProbe.timeoutSeconds | default 3 }}
+            failureThreshold: {{ .Values.writer.readinessProbe.failureThreshold | default 6 }}
+            successThreshold: {{ .Values.writer.readinessProbe.successThreshold | default 1 }}
       dnsPolicy: ClusterFirst
       imagePullSecrets:
         - name: qryn-dckr

diff --git a/values.yaml b/values.yaml
@@ -53,6 +53,18 @@ reader:
   revisionHistoryLimit: 10
   type: ClusterIP
   podAnnotations: []
+  livenessProbe: {}
+    # initialDelaySeconds: 15
+    # periodSeconds: 10
+    # timeoutSeconds: 3
+    # failureThreshold: 6
+    # successThreshold: 1
+  readinessProbe: {}
+    # initialDelaySeconds: 15
+    # periodSeconds: 10
+    # timeoutSeconds: 3
+    # failureThreshold: 6
+    # successThreshold: 1
   nodeSelector: {}
   tolerations: []
   affinity: {}
@@ -95,6 +107,18 @@ writer:
   revisionHistoryLimit: 10
   type: ClusterIP
   podAnnotations: []
+  livenessProbe: {}
+    # initialDelaySeconds: 15
+    # periodSeconds: 10
+    # timeoutSeconds: 3
+    # failureThreshold: 6
+    # successThreshold: 1
+  readinessProbe: {}
+    # initialDelaySeconds: 15
+    # periodSeconds: 10
+    # timeoutSeconds: 3
+    # failureThreshold: 6
+    # successThreshold: 1
   nodeSelector: {}
   tolerations: []
   affinity: {}