added port configuration for liveness/readiness probes in helm charts

eiximenis · eiximenis · commit a4f169ddce46 · 2019-01-29T12:25:02.000+01:00
diff --git a/k8s/helm/apigwmm/templates/deployment.yaml b/k8s/helm/apigwmm/templates/deployment.yaml
@@ -40,6 +40,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -49,6 +50,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/apigwmm/values.yaml b/k8s/helm/apigwmm/values.yaml
@@ -55,7 +55,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/apigwms/templates/deployment.yaml b/k8s/helm/apigwms/templates/deployment.yaml
@@ -40,6 +40,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -49,6 +50,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/apigwms/values.yaml b/k8s/helm/apigwms/values.yaml
@@ -55,7 +55,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
-    periodSeconds: 15
+    periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/apigwwm/templates/deployment.yaml b/k8s/helm/apigwwm/templates/deployment.yaml
@@ -40,6 +40,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -49,6 +50,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/apigwwm/values.yaml b/k8s/helm/apigwwm/values.yaml
@@ -55,7 +55,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
-    periodSeconds: 15
+    periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/apigwws/templates/deployment.yaml b/k8s/helm/apigwws/templates/deployment.yaml
@@ -39,6 +39,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -48,6 +49,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/apigwws/values.yaml b/k8s/helm/apigwws/values.yaml
@@ -55,7 +55,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/basket-api/templates/deployment.yaml b/k8s/helm/basket-api/templates/deployment.yaml
@@ -31,7 +31,8 @@ spec:
           {{ if .Values.probes -}}
           {{- if .Values.probes.liveness -}}
           livenessProbe:
-            httpGet:
+            httpGet: 
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/basket-api/values.yaml b/k8s/helm/basket-api/values.yaml
@@ -46,7 +46,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/catalog-api/templates/deployment.yaml b/k8s/helm/catalog-api/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/catalog-api/values.yaml b/k8s/helm/catalog-api/values.yaml
@@ -49,8 +49,10 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
 
diff --git a/k8s/helm/identity-api/templates/deployment.yaml b/k8s/helm/identity-api/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/identity-api/values.yaml b/k8s/helm/identity-api/values.yaml
@@ -66,7 +66,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
-    periodSeconds: 15
+    periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/locations-api/templates/deployment.yaml b/k8s/helm/locations-api/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/locations-api/values.yaml b/k8s/helm/locations-api/values.yaml
@@ -57,7 +57,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/marketing-api/templates/deployment.yaml b/k8s/helm/marketing-api/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/marketing-api/values.yaml b/k8s/helm/marketing-api/values.yaml
@@ -61,7 +61,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/mobileshoppingagg/templates/deployment.yaml b/k8s/helm/mobileshoppingagg/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/mobileshoppingagg/values.yaml b/k8s/helm/mobileshoppingagg/values.yaml
@@ -69,7 +69,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/ordering-api/templates/deployment.yaml b/k8s/helm/ordering-api/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/ordering-api/values.yaml b/k8s/helm/ordering-api/values.yaml
@@ -55,7 +55,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/ordering-backgroundtasks/values.yaml b/k8s/helm/ordering-backgroundtasks/values.yaml
@@ -61,7 +61,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/payment-api/templates/deployment.yaml b/k8s/helm/payment-api/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/payment-api/values.yaml b/k8s/helm/payment-api/values.yaml
@@ -47,7 +47,9 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15
+    port: 80
diff --git a/k8s/helm/webshoppingagg/templates/deployment.yaml b/k8s/helm/webshoppingagg/templates/deployment.yaml
@@ -32,6 +32,7 @@ spec:
           {{- if .Values.probes.liveness -}}
           livenessProbe:
             httpGet:
+              port: {{ .Values.probes.liveness.port }}
               path: {{ .Values.probes.liveness.path }}
               initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.liveness.periodSeconds }}
@@ -41,6 +42,7 @@ spec:
           {{- if .Values.probes.readiness }}
           readinessProbe:
             httpGet:
+              port: {{ .Values.probes.readiness.port }}
               path: {{ .Values.probes.readiness.path }}
               initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
               periodSeconds: {{ .Values.probes.readiness.periodSeconds }}
diff --git a/k8s/helm/webshoppingagg/values.yaml b/k8s/helm/webshoppingagg/values.yaml
@@ -69,8 +69,10 @@ probes:
     path: /liveness
     initialDelaySeconds: 10
     periodSeconds: 15
+    port: 80
   readiness:
     path: /hc
     initialDelaySeconds: 90
     periodSeconds: 15      
+    port: 80
 
