From 7becb9d03621209a0130225dd1d6371dccf8a814 Mon Sep 17 00:00:00 2001 From: Burhan Nasir Date: Mon, 1 Oct 2018 20:32:09 +0500 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=94=20Typo=20=20fix=20=20"suittable"?= =?UTF-8?q?=20=3D>=20"suitable"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a4e1d3c3..a424e0a41 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ The architecture proposes a microservice oriented architecture implementation wi > ### Important Note on API Gateways and published APIs > Since April 2018, we have introduced the implementation of the [API Gateway pattern](http://microservices.io/patterns/apigateway.html) and [Backend-For-Front-End (BFF) pattern](https://samnewman.io/patterns/architectural/bff/) in eShopOnContainers architecture, so you can filter and publish simplified APIs and URIs and apply additional security in that tier while hiding/securing the internal microservices to the client apps or outside consumers. These sample API Gateways in eShopOnContainers are based on [Ocelot](https://github.com/ThreeMammals/Ocelot), an OSS lightweight API Gateway solution explained [here](http://threemammals.com/ocelot). The deployed API Gateways are autonomous and can be deployed as your own custom microservices/containers, as it is currently done in eShopOnContainers, so you can test it even in a simple development environment with just Docker engine or deploy it into orchestrators like Kubernetes in AKS or Service Fabric. -> For your production-ready architecture you can either keep using [Ocelot](https://github.com/ThreeMammals/Ocelot) which is simple and easy to use and used in production by significant companies or if you need further functionality and a much richer set of features suittable for commercial APIs, you can also substitute those API Gateways and use [Azure API Management](https://azure.microsoft.com/en-us/services/api-management/) or any other commercial API Gateway, as shown in the following image. +> For your production-ready architecture you can either keep using [Ocelot](https://github.com/ThreeMammals/Ocelot) which is simple and easy to use and used in production by significant companies or if you need further functionality and a much richer set of features suitable for commercial APIs, you can also substitute those API Gateways and use [Azure API Management](https://azure.microsoft.com/en-us/services/api-management/) or any other commercial API Gateway, as shown in the following image.

From 2c5f58f1040e94c78eb003f458382239a9f41383 Mon Sep 17 00:00:00 2001 From: eiximenis Date: Tue, 29 Jan 2019 11:35:43 +0100 Subject: [PATCH 2/5] healtchecks --- k8s/helm/apigwmm/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/apigwmm/values.yaml | 10 +++++++++- k8s/helm/apigwms/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/apigwms/values.yaml | 10 +++++++++- k8s/helm/apigwwm/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/apigwwm/values.yaml | 10 +++++++++- k8s/helm/apigwws/templates/deployment.yaml | 19 ++++++++++++++++++- k8s/helm/apigwws/values.yaml | 10 +++++++++- k8s/helm/basket-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/basket-api/values.yaml | 9 +++++++++ .../catalog-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/catalog-api/values.yaml | 9 +++++++++ .../identity-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/identity-api/values.yaml | 10 +++++++++- .../locations-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/locations-api/values.yaml | 10 +++++++++- .../marketing-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/marketing-api/values.yaml | 10 +++++++++- .../templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/mobileshoppingagg/values.yaml | 10 +++++++++- .../ordering-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/ordering-api/values.yaml | 10 +++++++++- .../templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/ordering-backgroundtasks/values.yaml | 10 +++++++++- .../payment-api/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/payment-api/values.yaml | 10 +++++++++- .../webshoppingagg/templates/deployment.yaml | 18 ++++++++++++++++++ k8s/helm/webshoppingagg/values.yaml | 9 +++++++++ 28 files changed, 378 insertions(+), 12 deletions(-) diff --git a/k8s/helm/apigwmm/templates/deployment.yaml b/k8s/helm/apigwmm/templates/deployment.yaml index 2e30c78e7..14b450c62 100644 --- a/k8s/helm/apigwmm/templates/deployment.yaml +++ b/k8s/helm/apigwmm/templates/deployment.yaml @@ -36,6 +36,24 @@ spec: path: configuration.json containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} volumeMounts: diff --git a/k8s/helm/apigwmm/values.yaml b/k8s/helm/apigwmm/values.yaml index 5bf92838a..ff3a7ab43 100644 --- a/k8s/helm/apigwmm/values.yaml +++ b/k8s/helm/apigwmm/values.yaml @@ -50,4 +50,12 @@ env: values: - name: ASPNETCORE_ENVIRONMENT value: Development - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/apigwms/templates/deployment.yaml b/k8s/helm/apigwms/templates/deployment.yaml index 2c8a43050..55dc06772 100644 --- a/k8s/helm/apigwms/templates/deployment.yaml +++ b/k8s/helm/apigwms/templates/deployment.yaml @@ -36,6 +36,24 @@ spec: path: configuration.json containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} volumeMounts: diff --git a/k8s/helm/apigwms/values.yaml b/k8s/helm/apigwms/values.yaml index dc8b50ba1..1ee17ee79 100644 --- a/k8s/helm/apigwms/values.yaml +++ b/k8s/helm/apigwms/values.yaml @@ -50,4 +50,12 @@ env: values: - name: ASPNETCORE_ENVIRONMENT value: Development - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 \ No newline at end of file diff --git a/k8s/helm/apigwwm/templates/deployment.yaml b/k8s/helm/apigwwm/templates/deployment.yaml index 1e0e58888..f37e1030d 100644 --- a/k8s/helm/apigwwm/templates/deployment.yaml +++ b/k8s/helm/apigwwm/templates/deployment.yaml @@ -36,6 +36,24 @@ spec: path: configuration.json containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} volumeMounts: diff --git a/k8s/helm/apigwwm/values.yaml b/k8s/helm/apigwwm/values.yaml index 5b3b5c97a..d108cbf70 100644 --- a/k8s/helm/apigwwm/values.yaml +++ b/k8s/helm/apigwwm/values.yaml @@ -50,4 +50,12 @@ env: values: - name: ASPNETCORE_ENVIRONMENT value: Development - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 \ No newline at end of file diff --git a/k8s/helm/apigwws/templates/deployment.yaml b/k8s/helm/apigwws/templates/deployment.yaml index b52e77042..b82f39ae7 100644 --- a/k8s/helm/apigwws/templates/deployment.yaml +++ b/k8s/helm/apigwws/templates/deployment.yaml @@ -6,7 +6,6 @@ kind: Deployment metadata: name: {{ template "apigwws.fullname" . }} labels: - ufo: {{ $cfgname}} app: {{ template "apigwws.name" . }} chart: {{ template "apigwws.chart" . }} release: {{ .Release.Name }} @@ -36,6 +35,24 @@ spec: path: configuration.json containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} volumeMounts: diff --git a/k8s/helm/apigwws/values.yaml b/k8s/helm/apigwws/values.yaml index 9f37619af..688278276 100644 --- a/k8s/helm/apigwws/values.yaml +++ b/k8s/helm/apigwws/values.yaml @@ -50,4 +50,12 @@ env: values: - name: ASPNETCORE_ENVIRONMENT value: Development - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/basket-api/templates/deployment.yaml b/k8s/helm/basket-api/templates/deployment.yaml index ee283122c..972e4032e 100644 --- a/k8s/helm/basket-api/templates/deployment.yaml +++ b/k8s/helm/basket-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/basket-api/values.yaml b/k8s/helm/basket-api/values.yaml index 892fdf584..472855f7d 100644 --- a/k8s/helm/basket-api/values.yaml +++ b/k8s/helm/basket-api/values.yaml @@ -41,3 +41,12 @@ env: values: - name: OrchestratorType value: 'K8S' +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/catalog-api/templates/deployment.yaml b/k8s/helm/catalog-api/templates/deployment.yaml index 99e270af9..a221ef1d3 100644 --- a/k8s/helm/catalog-api/templates/deployment.yaml +++ b/k8s/helm/catalog-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/catalog-api/values.yaml b/k8s/helm/catalog-api/values.yaml index e0306a824..4fa2594ae 100644 --- a/k8s/helm/catalog-api/values.yaml +++ b/k8s/helm/catalog-api/values.yaml @@ -44,4 +44,13 @@ env: value: Development - name: OrchestratorType value: 'K8S' +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/identity-api/templates/deployment.yaml b/k8s/helm/identity-api/templates/deployment.yaml index 753725a9f..2da87ab1f 100644 --- a/k8s/helm/identity-api/templates/deployment.yaml +++ b/k8s/helm/identity-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/identity-api/values.yaml b/k8s/helm/identity-api/values.yaml index 9777db355..4ac314118 100644 --- a/k8s/helm/identity-api/values.yaml +++ b/k8s/helm/identity-api/values.yaml @@ -61,4 +61,12 @@ env: value: 'K8S' - name: IsClusterEnv value: 'True' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 \ No newline at end of file diff --git a/k8s/helm/locations-api/templates/deployment.yaml b/k8s/helm/locations-api/templates/deployment.yaml index c8f3f00cd..8e8327459 100644 --- a/k8s/helm/locations-api/templates/deployment.yaml +++ b/k8s/helm/locations-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/locations-api/values.yaml b/k8s/helm/locations-api/values.yaml index 99c130def..210ba0e8f 100644 --- a/k8s/helm/locations-api/values.yaml +++ b/k8s/helm/locations-api/values.yaml @@ -52,4 +52,12 @@ env: value: Development - name: OrchestratorType value: 'K8S' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/marketing-api/templates/deployment.yaml b/k8s/helm/marketing-api/templates/deployment.yaml index e0cbeb3ce..debdb19f2 100644 --- a/k8s/helm/marketing-api/templates/deployment.yaml +++ b/k8s/helm/marketing-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/marketing-api/values.yaml b/k8s/helm/marketing-api/values.yaml index b898af73c..909288971 100644 --- a/k8s/helm/marketing-api/values.yaml +++ b/k8s/helm/marketing-api/values.yaml @@ -56,4 +56,12 @@ env: value: Development - name: OrchestratorType value: 'K8S' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/mobileshoppingagg/templates/deployment.yaml b/k8s/helm/mobileshoppingagg/templates/deployment.yaml index 5e81da7bf..355ffce7e 100644 --- a/k8s/helm/mobileshoppingagg/templates/deployment.yaml +++ b/k8s/helm/mobileshoppingagg/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/mobileshoppingagg/values.yaml b/k8s/helm/mobileshoppingagg/values.yaml index 7773891e7..9c72dd963 100644 --- a/k8s/helm/mobileshoppingagg/values.yaml +++ b/k8s/helm/mobileshoppingagg/values.yaml @@ -64,4 +64,12 @@ env: value: 'K8S' - name: IsClusterEnv value: 'True' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/ordering-api/templates/deployment.yaml b/k8s/helm/ordering-api/templates/deployment.yaml index 19845c251..583485674 100644 --- a/k8s/helm/ordering-api/templates/deployment.yaml +++ b/k8s/helm/ordering-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/ordering-api/values.yaml b/k8s/helm/ordering-api/values.yaml index c4a7cdf99..e9f82c53d 100644 --- a/k8s/helm/ordering-api/values.yaml +++ b/k8s/helm/ordering-api/values.yaml @@ -50,4 +50,12 @@ env: value: Development - name: OrchestratorType value: 'K8S' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml index cb57ca18d..85c8848bb 100644 --- a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml +++ b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/ordering-backgroundtasks/values.yaml b/k8s/helm/ordering-backgroundtasks/values.yaml index adfa20c03..f10c39e01 100644 --- a/k8s/helm/ordering-backgroundtasks/values.yaml +++ b/k8s/helm/ordering-backgroundtasks/values.yaml @@ -56,4 +56,12 @@ env: value: Development - name: OrchestratorType value: 'K8S' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/payment-api/templates/deployment.yaml b/k8s/helm/payment-api/templates/deployment.yaml index 8b414145f..aa36ae035 100644 --- a/k8s/helm/payment-api/templates/deployment.yaml +++ b/k8s/helm/payment-api/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/payment-api/values.yaml b/k8s/helm/payment-api/values.yaml index 0ee6dd4d9..673621538 100644 --- a/k8s/helm/payment-api/values.yaml +++ b/k8s/helm/payment-api/values.yaml @@ -42,4 +42,12 @@ env: value: Development - name: OrchestratorType value: 'K8S' - +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 diff --git a/k8s/helm/webshoppingagg/templates/deployment.yaml b/k8s/helm/webshoppingagg/templates/deployment.yaml index 9d557b0e0..64d372f17 100644 --- a/k8s/helm/webshoppingagg/templates/deployment.yaml +++ b/k8s/helm/webshoppingagg/templates/deployment.yaml @@ -28,6 +28,24 @@ spec: {{- end }} containers: - name: {{ .Chart.Name }} + {{ if .Values.probes -}} + {{- if .Values.probes.liveness -}} + livenessProbe: + httpGet: + path: {{ .Values.probes.liveness.path }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + {{- end -}} + {{- end -}} + {{- if .Values.probes -}} + {{- if .Values.probes.readiness }} + readinessProbe: + httpGet: + path: {{ .Values.probes.readiness.path }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + {{- end -}} + {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: diff --git a/k8s/helm/webshoppingagg/values.yaml b/k8s/helm/webshoppingagg/values.yaml index 78c826e42..ce7f72549 100644 --- a/k8s/helm/webshoppingagg/values.yaml +++ b/k8s/helm/webshoppingagg/values.yaml @@ -64,4 +64,13 @@ env: value: 'K8S' - name: IsClusterEnv value: 'True' +probes: + liveness: + path: /liveness + initialDelaySeconds: 10 + periodSeconds: 15 + readiness: + path: /hc + initialDelaySeconds: 90 + periodSeconds: 15 From 8a31efeab2a330643792ea80786f7da3e93dc957 Mon Sep 17 00:00:00 2001 From: eiximenis Date: Tue, 29 Jan 2019 11:43:15 +0100 Subject: [PATCH 3/5] badge for buid status --- README.md | 3 ++ .../WebHostExtensions.cs | 49 +++++++++++++------ src/Services/Ordering/Ordering.API/web.config | 10 ++-- 3 files changed, 43 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 037d532a3..ffdf6450a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # eShopOnContainers - Microservices Architecture and Containers based Reference Application (**BETA state** - Visual Studio 2017 and CLI environments compatible) Sample .NET Core reference application, powered by Microsoft, based on a simplified microservices architecture and Docker containers. +[![Build status (Linux images)](https://msftdevtools.visualstudio.com/eShopOnContainers/_apis/build/status/All%20Microservices%20Linux)](https://msftdevtools.visualstudio.com/eShopOnContainers/_build/latest?definitionId=184) + + ## IMPORTANT NOTES! **You can use either the latest version of Visual Studio or simply Docker CLI and .NET CLI for Windows, Mac and Linux**. diff --git a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs index ef80f77cf..0da18f581 100644 --- a/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs +++ b/src/BuildingBlocks/WebHostCustomization/WebHost.Customization/WebHostExtensions.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using Polly; @@ -10,8 +11,17 @@ namespace Microsoft.AspNetCore.Hosting { public static class IWebHostExtensions { + public static bool IsInKubernetes(this IWebHost webHost) + { + var cfg = webHost.Services.GetService(); + var orchestratorType = cfg.GetValue("OrchestratorType"); + return orchestratorType?.ToUpper() == "K8S"; + } + public static IWebHost MigrateDbContext(this IWebHost webHost, Action seeder) where TContext : DbContext { + var underK8s = webHost.IsInKubernetes(); + using (var scope = webHost.Services.CreateScope()) { var services = scope.ServiceProvider; @@ -24,36 +34,47 @@ namespace Microsoft.AspNetCore.Hosting { logger.LogInformation($"Migrating database associated with context {typeof(TContext).Name}"); - var retry = Policy.Handle() - .WaitAndRetry(new TimeSpan[] - { + if (underK8s) + { + InvokeSeeder(seeder, context, services); + } + else + { + var retry = Policy.Handle() + .WaitAndRetry(new TimeSpan[] + { TimeSpan.FromSeconds(3), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(8), - }); + }); - retry.Execute(() => - { //if the sql server container is not created on run docker compose this //migration can't fail for network related exception. The retry options for DbContext only - //apply to transient exceptions. - - context.Database - .Migrate(); - - seeder(context, services); - }); - + //apply to transient exceptions + // Note that this is NOT applied when running some orchestrators (let the orchestrator to recreate the failing service) + retry.Execute(() => InvokeSeeder(seeder, context, services)); + } logger.LogInformation($"Migrated database associated with context {typeof(TContext).Name}"); } catch (Exception ex) { logger.LogError(ex, $"An error occurred while migrating the database used on context {typeof(TContext).Name}"); + if (underK8s) + { + throw; // Rethrow under k8s because we rely on k8s to re-run the pod + } } } return webHost; } + + private static void InvokeSeeder(Action seeder, TContext context, IServiceProvider services) + where TContext : DbContext + { + context.Database.Migrate(); + seeder(context, services); + } } } diff --git a/src/Services/Ordering/Ordering.API/web.config b/src/Services/Ordering/Ordering.API/web.config index dc0514fca..3d49211e5 100644 --- a/src/Services/Ordering/Ordering.API/web.config +++ b/src/Services/Ordering/Ordering.API/web.config @@ -1,14 +1,14 @@  - - - + - + + + - + \ No newline at end of file From a4f169ddce46ef5e37a866b5b850db4e89921038 Mon Sep 17 00:00:00 2001 From: eiximenis Date: Tue, 29 Jan 2019 12:25:02 +0100 Subject: [PATCH 4/5] added port configuration for liveness/readiness probes in helm charts --- k8s/helm/apigwmm/templates/deployment.yaml | 2 ++ k8s/helm/apigwmm/values.yaml | 2 ++ k8s/helm/apigwms/templates/deployment.yaml | 2 ++ k8s/helm/apigwms/values.yaml | 4 +++- k8s/helm/apigwwm/templates/deployment.yaml | 2 ++ k8s/helm/apigwwm/values.yaml | 4 +++- k8s/helm/apigwws/templates/deployment.yaml | 2 ++ k8s/helm/apigwws/values.yaml | 2 ++ k8s/helm/basket-api/templates/deployment.yaml | 4 +++- k8s/helm/basket-api/values.yaml | 2 ++ k8s/helm/catalog-api/templates/deployment.yaml | 2 ++ k8s/helm/catalog-api/values.yaml | 2 ++ k8s/helm/identity-api/templates/deployment.yaml | 2 ++ k8s/helm/identity-api/values.yaml | 4 +++- k8s/helm/locations-api/templates/deployment.yaml | 2 ++ k8s/helm/locations-api/values.yaml | 2 ++ k8s/helm/marketing-api/templates/deployment.yaml | 2 ++ k8s/helm/marketing-api/values.yaml | 2 ++ k8s/helm/mobileshoppingagg/templates/deployment.yaml | 2 ++ k8s/helm/mobileshoppingagg/values.yaml | 2 ++ k8s/helm/ordering-api/templates/deployment.yaml | 2 ++ k8s/helm/ordering-api/values.yaml | 2 ++ k8s/helm/ordering-backgroundtasks/templates/deployment.yaml | 2 ++ k8s/helm/ordering-backgroundtasks/values.yaml | 2 ++ k8s/helm/payment-api/templates/deployment.yaml | 2 ++ k8s/helm/payment-api/values.yaml | 2 ++ k8s/helm/webshoppingagg/templates/deployment.yaml | 2 ++ k8s/helm/webshoppingagg/values.yaml | 2 ++ 28 files changed, 60 insertions(+), 4 deletions(-) diff --git a/k8s/helm/apigwmm/templates/deployment.yaml b/k8s/helm/apigwmm/templates/deployment.yaml index 14b450c62..170868890 100644 --- 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 index ff3a7ab43..5903e4b85 100644 --- 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 index 55dc06772..22295843f 100644 --- 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 index 1ee17ee79..e2df1128b 100644 --- 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 \ No newline at end of file + periodSeconds: 15 + port: 80 \ No newline at end of file diff --git a/k8s/helm/apigwwm/templates/deployment.yaml b/k8s/helm/apigwwm/templates/deployment.yaml index f37e1030d..bd37dc16e 100644 --- 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 index d108cbf70..3096a800e 100644 --- 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 \ No newline at end of file + periodSeconds: 15 + port: 80 \ No newline at end of file diff --git a/k8s/helm/apigwws/templates/deployment.yaml b/k8s/helm/apigwws/templates/deployment.yaml index b82f39ae7..9d00589d4 100644 --- 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 index 688278276..e50fb9f96 100644 --- 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 index 972e4032e..37b718eb8 100644 --- 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 index 472855f7d..afd00835d 100644 --- 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 index a221ef1d3..d7f95542d 100644 --- 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 index 4fa2594ae..bb4d5c98f 100644 --- 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 index 2da87ab1f..5758ac60d 100644 --- 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 index 4ac314118..065818a09 100644 --- 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 \ No newline at end of file + periodSeconds: 15 + port: 80 \ No newline at end of file diff --git a/k8s/helm/locations-api/templates/deployment.yaml b/k8s/helm/locations-api/templates/deployment.yaml index 8e8327459..fbfadbafc 100644 --- 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 index 210ba0e8f..34264c2f2 100644 --- 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 index debdb19f2..6818aea84 100644 --- 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 index 909288971..48a34dfd9 100644 --- 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 index 355ffce7e..9dedd60d6 100644 --- 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 index 9c72dd963..7b6ea2e73 100644 --- 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 index 583485674..4dde9e351 100644 --- 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 index e9f82c53d..1907c82d1 100644 --- 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 index 85c8848bb..f89481143 100644 --- 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 index f10c39e01..8e8ee14ce 100644 --- 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 index aa36ae035..621705765 100644 --- 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 index 673621538..f2c5d1528 100644 --- 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 index 64d372f17..2b9d81c53 100644 --- 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 index ce7f72549..bca28294d 100644 --- 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 From e759459c54a59f0ef48fd7f56fcd223207c263b5 Mon Sep 17 00:00:00 2001 From: eiximenis Date: Tue, 29 Jan 2019 15:22:57 +0100 Subject: [PATCH 5/5] updated helm charts for final probes config on k8s --- k8s/helm/apigwmm/templates/deployment.yaml | 9 +++++---- k8s/helm/apigwmm/values.yaml | 3 ++- k8s/helm/apigwms/templates/deployment.yaml | 9 +++++---- k8s/helm/apigwms/values.yaml | 3 ++- k8s/helm/apigwwm/templates/deployment.yaml | 9 +++++---- k8s/helm/apigwwm/values.yaml | 3 ++- k8s/helm/apigwws/templates/deployment.yaml | 9 +++++---- k8s/helm/apigwws/values.yaml | 3 ++- k8s/helm/basket-api/templates/deployment.yaml | 9 +++++---- k8s/helm/basket-api/values.yaml | 3 ++- k8s/helm/catalog-api/templates/deployment.yaml | 9 +++++---- k8s/helm/catalog-api/values.yaml | 3 ++- k8s/helm/identity-api/templates/deployment.yaml | 9 +++++---- k8s/helm/identity-api/values.yaml | 3 ++- k8s/helm/locations-api/templates/deployment.yaml | 9 +++++---- k8s/helm/locations-api/values.yaml | 3 ++- k8s/helm/marketing-api/templates/deployment.yaml | 9 +++++---- k8s/helm/marketing-api/values.yaml | 3 ++- k8s/helm/mobileshoppingagg/templates/deployment.yaml | 9 +++++---- k8s/helm/mobileshoppingagg/values.yaml | 3 ++- k8s/helm/ordering-api/templates/deployment.yaml | 9 +++++---- k8s/helm/ordering-api/values.yaml | 3 ++- .../ordering-backgroundtasks/templates/deployment.yaml | 9 +++++---- k8s/helm/ordering-backgroundtasks/values.yaml | 3 ++- k8s/helm/payment-api/templates/deployment.yaml | 9 +++++---- k8s/helm/payment-api/values.yaml | 3 ++- k8s/helm/webshoppingagg/templates/deployment.yaml | 9 +++++---- k8s/helm/webshoppingagg/values.yaml | 3 ++- 28 files changed, 98 insertions(+), 70 deletions(-) diff --git a/k8s/helm/apigwmm/templates/deployment.yaml b/k8s/helm/apigwmm/templates/deployment.yaml index 170868890..6dc58bf50 100644 --- a/k8s/helm/apigwmm/templates/deployment.yaml +++ b/k8s/helm/apigwmm/templates/deployment.yaml @@ -42,8 +42,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -52,8 +52,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/apigwmm/values.yaml b/k8s/helm/apigwmm/values.yaml index 5903e4b85..501266780 100644 --- a/k8s/helm/apigwmm/values.yaml +++ b/k8s/helm/apigwmm/values.yaml @@ -58,6 +58,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/apigwms/templates/deployment.yaml b/k8s/helm/apigwms/templates/deployment.yaml index 22295843f..8a4fd8942 100644 --- a/k8s/helm/apigwms/templates/deployment.yaml +++ b/k8s/helm/apigwms/templates/deployment.yaml @@ -42,8 +42,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -52,8 +52,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/apigwms/values.yaml b/k8s/helm/apigwms/values.yaml index e2df1128b..58377ec5b 100644 --- a/k8s/helm/apigwms/values.yaml +++ b/k8s/helm/apigwms/values.yaml @@ -58,6 +58,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 \ No newline at end of file diff --git a/k8s/helm/apigwwm/templates/deployment.yaml b/k8s/helm/apigwwm/templates/deployment.yaml index bd37dc16e..5cbce9f22 100644 --- a/k8s/helm/apigwwm/templates/deployment.yaml +++ b/k8s/helm/apigwwm/templates/deployment.yaml @@ -42,8 +42,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -52,8 +52,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/apigwwm/values.yaml b/k8s/helm/apigwwm/values.yaml index 3096a800e..68cbb89c4 100644 --- a/k8s/helm/apigwwm/values.yaml +++ b/k8s/helm/apigwwm/values.yaml @@ -58,6 +58,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 \ No newline at end of file diff --git a/k8s/helm/apigwws/templates/deployment.yaml b/k8s/helm/apigwws/templates/deployment.yaml index 9d00589d4..4912d12bb 100644 --- a/k8s/helm/apigwws/templates/deployment.yaml +++ b/k8s/helm/apigwws/templates/deployment.yaml @@ -41,8 +41,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -51,8 +51,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/apigwws/values.yaml b/k8s/helm/apigwws/values.yaml index e50fb9f96..94b8a203f 100644 --- a/k8s/helm/apigwws/values.yaml +++ b/k8s/helm/apigwws/values.yaml @@ -58,6 +58,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/basket-api/templates/deployment.yaml b/k8s/helm/basket-api/templates/deployment.yaml index 37b718eb8..d96c0cacf 100644 --- a/k8s/helm/basket-api/templates/deployment.yaml +++ b/k8s/helm/basket-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/basket-api/values.yaml b/k8s/helm/basket-api/values.yaml index afd00835d..6c264afba 100644 --- a/k8s/helm/basket-api/values.yaml +++ b/k8s/helm/basket-api/values.yaml @@ -49,6 +49,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/catalog-api/templates/deployment.yaml b/k8s/helm/catalog-api/templates/deployment.yaml index d7f95542d..d7a424a99 100644 --- a/k8s/helm/catalog-api/templates/deployment.yaml +++ b/k8s/helm/catalog-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/catalog-api/values.yaml b/k8s/helm/catalog-api/values.yaml index bb4d5c98f..836db6125 100644 --- a/k8s/helm/catalog-api/values.yaml +++ b/k8s/helm/catalog-api/values.yaml @@ -52,7 +52,8 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/identity-api/templates/deployment.yaml b/k8s/helm/identity-api/templates/deployment.yaml index 5758ac60d..0a4ee2722 100644 --- a/k8s/helm/identity-api/templates/deployment.yaml +++ b/k8s/helm/identity-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/identity-api/values.yaml b/k8s/helm/identity-api/values.yaml index 065818a09..515dc5b9e 100644 --- a/k8s/helm/identity-api/values.yaml +++ b/k8s/helm/identity-api/values.yaml @@ -69,6 +69,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 \ No newline at end of file diff --git a/k8s/helm/locations-api/templates/deployment.yaml b/k8s/helm/locations-api/templates/deployment.yaml index fbfadbafc..9667eb967 100644 --- a/k8s/helm/locations-api/templates/deployment.yaml +++ b/k8s/helm/locations-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/locations-api/values.yaml b/k8s/helm/locations-api/values.yaml index 34264c2f2..4718f2a0b 100644 --- a/k8s/helm/locations-api/values.yaml +++ b/k8s/helm/locations-api/values.yaml @@ -60,6 +60,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/marketing-api/templates/deployment.yaml b/k8s/helm/marketing-api/templates/deployment.yaml index 6818aea84..c49026c1b 100644 --- a/k8s/helm/marketing-api/templates/deployment.yaml +++ b/k8s/helm/marketing-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/marketing-api/values.yaml b/k8s/helm/marketing-api/values.yaml index 48a34dfd9..00bebf27f 100644 --- a/k8s/helm/marketing-api/values.yaml +++ b/k8s/helm/marketing-api/values.yaml @@ -64,6 +64,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/mobileshoppingagg/templates/deployment.yaml b/k8s/helm/mobileshoppingagg/templates/deployment.yaml index 9dedd60d6..0f23b3be6 100644 --- a/k8s/helm/mobileshoppingagg/templates/deployment.yaml +++ b/k8s/helm/mobileshoppingagg/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/mobileshoppingagg/values.yaml b/k8s/helm/mobileshoppingagg/values.yaml index 7b6ea2e73..fd26c7794 100644 --- a/k8s/helm/mobileshoppingagg/values.yaml +++ b/k8s/helm/mobileshoppingagg/values.yaml @@ -72,6 +72,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/ordering-api/templates/deployment.yaml b/k8s/helm/ordering-api/templates/deployment.yaml index 4dde9e351..a99ccdc28 100644 --- a/k8s/helm/ordering-api/templates/deployment.yaml +++ b/k8s/helm/ordering-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/ordering-api/values.yaml b/k8s/helm/ordering-api/values.yaml index 1907c82d1..c717d2793 100644 --- a/k8s/helm/ordering-api/values.yaml +++ b/k8s/helm/ordering-api/values.yaml @@ -58,6 +58,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml index f89481143..017f9f3dd 100644 --- a/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml +++ b/k8s/helm/ordering-backgroundtasks/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/ordering-backgroundtasks/values.yaml b/k8s/helm/ordering-backgroundtasks/values.yaml index 8e8ee14ce..d065f0345 100644 --- a/k8s/helm/ordering-backgroundtasks/values.yaml +++ b/k8s/helm/ordering-backgroundtasks/values.yaml @@ -64,6 +64,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/payment-api/templates/deployment.yaml b/k8s/helm/payment-api/templates/deployment.yaml index 621705765..8b01f7394 100644 --- a/k8s/helm/payment-api/templates/deployment.yaml +++ b/k8s/helm/payment-api/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/payment-api/values.yaml b/k8s/helm/payment-api/values.yaml index f2c5d1528..341e4e1a9 100644 --- a/k8s/helm/payment-api/values.yaml +++ b/k8s/helm/payment-api/values.yaml @@ -50,6 +50,7 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80 diff --git a/k8s/helm/webshoppingagg/templates/deployment.yaml b/k8s/helm/webshoppingagg/templates/deployment.yaml index 2b9d81c53..8007c74c8 100644 --- a/k8s/helm/webshoppingagg/templates/deployment.yaml +++ b/k8s/helm/webshoppingagg/templates/deployment.yaml @@ -34,8 +34,8 @@ spec: httpGet: port: {{ .Values.probes.liveness.port }} path: {{ .Values.probes.liveness.path }} - initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.liveness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.liveness.periodSeconds }} {{- end -}} {{- end -}} {{- if .Values.probes -}} @@ -44,8 +44,9 @@ spec: httpGet: port: {{ .Values.probes.readiness.port }} path: {{ .Values.probes.readiness.path }} - initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} - periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }} + periodSeconds: {{ .Values.probes.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }} {{- end -}} {{- end }} image: "{{ template "fqdn-image" . }}:{{ .Values.image.tag }}" diff --git a/k8s/helm/webshoppingagg/values.yaml b/k8s/helm/webshoppingagg/values.yaml index bca28294d..f4f2c5fd7 100644 --- a/k8s/helm/webshoppingagg/values.yaml +++ b/k8s/helm/webshoppingagg/values.yaml @@ -72,7 +72,8 @@ probes: port: 80 readiness: path: /hc + timeoutSeconds: 5 initialDelaySeconds: 90 - periodSeconds: 15 + periodSeconds: 60 port: 80