Skip to content

Commit 8d794a2

Browse files
author
Ramón Tomás
committed
Updated Helm scripts to include healthcheck url env vars
Updated Webstatus docker-compose to include HealthCheck url env vars
1 parent 0f6f4e6 commit 8d794a2

19 files changed

Lines changed: 265 additions & 104 deletions

File tree

‎docker-compose.override.yml‎

Lines changed: 37 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -301,50 +301,41 @@ services:
301301
environment:
302302
- ASPNETCORE_ENVIRONMENT=Development
303303
- ASPNETCORE_URLS=http://0.0.0.0:80
304-
- CatalogUrl=http://catalog.api/hc
305-
- HealthChecks-UI__HealthChecks__0__Name=Ordering HTTP Check
306-
- HealthChecks-UI__HealthChecks__0__Uri=http://ordering.api/hc
307-
- HealthChecks-UI__HealthChecks__1__Name=Ordering HTTP Background Check
308-
- HealthChecks-UI__HealthChecks__1__Uri=http://ordering.backgroundtasks/hc
309-
- HealthChecks-UI__HealthChecks__2__Name=Basket HTTP Background Check
310-
- HealthChecks-UI__HealthChecks__2__Uri=http://basket.api/hc
311-
- HealthChecks-UI__HealthChecks__3__Name=Catalog HTTP Check
312-
- HealthChecks-UI__HealthChecks__3__Uri=http://catalog.api/hc
313-
- HealthChecks-UI__HealthChecks__4__Name=Identity HTTP Check
314-
- HealthChecks-UI__HealthChecks__4__Uri=http://identity.api/hc
315-
- HealthChecks-UI__HealthChecks__5__Name=Marketing HTTP Check
316-
- HealthChecks-UI__HealthChecks__5__Uri=http://marketing.api/hc
317-
- HealthChecks-UI__HealthChecks__6__Name=Locations HTTP Check
318-
- HealthChecks-UI__HealthChecks__6__Uri=http://locations.api/hc
319-
- HealthChecks-UI__HealthChecks__7__Name=Payments HTTP Check
320-
- HealthChecks-UI__HealthChecks__7__Uri=http://payment.api/hc
321-
- HealthChecks-UI__HealthChecks__8__Name=Ordering SignalRHub HTTP Check
322-
- HealthChecks-UI__HealthChecks__8__Uri=http://ordering.signalrhub/hc
323-
- HealthChecks-UI__HealthChecks__9__Name=WebMVC HTTP Check
324-
- HealthChecks-UI__HealthChecks__9__Uri=http://webmvc/hc
325-
- HealthChecks-UI__HealthChecks__10__Name=WebSPA HTTP Check
326-
- HealthChecks-UI__HealthChecks__10__Uri=http://webspa/hc
327-
- HealthChecks-UI__HealthChecks__11__Name=Mobile Shopping API GW HTTP Check
328-
- HealthChecks-UI__HealthChecks__11__Uri=http://mobileshoppingapigw/hc
329-
- HealthChecks-UI__HealthChecks__12__Name=Mobile Marketing API GW HTTP Check
330-
- HealthChecks-UI__HealthChecks__12__Uri=http://mobilemarketingapigw/hc
331-
- HealthChecks-UI__HealthChecks__13__Name=Web Shopping API GW HTTP Check
332-
- HealthChecks-UI__HealthChecks__13__Uri=http://webshoppingapigw/hc
333-
- HealthChecks-UI__HealthChecks__14__Name=Web Marketing API GW HTTP Check
334-
- HealthChecks-UI__HealthChecks__14__Uri=http://webmarketingapigw/hc
335-
- HealthChecks-UI__HealthChecks__15__Name=Mobile Shopping Aggregator HTTP Check
336-
- HealthChecks-UI__HealthChecks__15__Uri=http://mobileshoppingagg/hc
337-
- HealthChecks-UI__HealthChecks__16__Name=Web Shopping API GW HTTP Check
338-
- HealthChecks-UI__HealthChecks__16__Uri=http://webshoppingagg/hc
339-
304+
- HealthChecks-UI__HealthChecks__1__Name=WebMVC HTTP Check
305+
- HealthChecks-UI__HealthChecks__1__Uri=http://webmvc/hc
306+
- HealthChecks-UI__HealthChecks__2__Name=WebSPA HTTP Check
307+
- HealthChecks-UI__HealthChecks__2__Uri=http://webspa/hc
308+
- HealthChecks-UI__HealthChecks__3__Name=Web Shopping Aggregator GW HTTP Check
309+
- HealthChecks-UI__HealthChecks__3__Uri=http://webshoppingagg/hc
310+
- HealthChecks-UI__HealthChecks__4__Name=Mobile Shopping Aggregator HTTP Check
311+
- HealthChecks-UI__HealthChecks__4__Uri=http://mobileshoppingagg/hc
312+
- HealthChecks-UI__HealthChecks__5__Name=Mobile Shopping API GW HTTP Check
313+
- HealthChecks-UI__HealthChecks__5__Uri=http://mobileshoppingapigw/hc
314+
- HealthChecks-UI__HealthChecks__6__Name=Mobile Marketing API GW HTTP Check
315+
- HealthChecks-UI__HealthChecks__6__Uri=http://mobilemarketingapigw/hc
316+
- HealthChecks-UI__HealthChecks__7__Name=Web Shopping API GW HTTP Check
317+
- HealthChecks-UI__HealthChecks__7__Uri=http://webshoppingapigw/hc
318+
- HealthChecks-UI__HealthChecks__8__Name=Web Marketing API GW HTTP Check
319+
- HealthChecks-UI__HealthChecks__8__Uri=http://webmarketingapigw/hc
320+
- HealthChecks-UI__HealthChecks__9__Name=Ordering HTTP Check
321+
- HealthChecks-UI__HealthChecks__9__Uri=http://ordering.api/hc
322+
- HealthChecks-UI__HealthChecks__10__Name=Ordering HTTP Background Check
323+
- HealthChecks-UI__HealthChecks__10__Uri=http://ordering.backgroundtasks/hc
324+
- HealthChecks-UI__HealthChecks__11__Name=Basket HTTP Check
325+
- HealthChecks-UI__HealthChecks__11__Uri=http://basket.api/hc
326+
- HealthChecks-UI__HealthChecks__12__Name=Catalog HTTP Check
327+
- HealthChecks-UI__HealthChecks__12__Uri=http://catalog.api/hc
328+
- HealthChecks-UI__HealthChecks__13__Name=Identity HTTP Check
329+
- HealthChecks-UI__HealthChecks__13__Uri=http://identity.api/hc
330+
- HealthChecks-UI__HealthChecks__14__Name=Marketing HTTP Check
331+
- HealthChecks-UI__HealthChecks__14__Uri=http://marketing.api/hc
332+
- HealthChecks-UI__HealthChecks__15__Name=Locations HTTP Check
333+
- HealthChecks-UI__HealthChecks__15__Uri=http://locations.api/hc
334+
- HealthChecks-UI__HealthChecks__16__Name=Payments HTTP Check
335+
- HealthChecks-UI__HealthChecks__16__Uri=http://payment.api/hc
336+
- HealthChecks-UI__HealthChecks__17__Name=Ordering SignalRHub HTTP Check
337+
- HealthChecks-UI__HealthChecks__17__Uri=http://ordering.signalrhub/hc
340338
- OrderingBackgroundTasksUrl=http://ordering.backgroundtasks/hc
341-
- BasketUrl=http://basket.api/hc
342-
- IdentityUrl=http://identity.api/hc
343-
- LocationsUrl=http://locations.api/hc
344-
- MarketingUrl=http://marketing.api/hc
345-
- PaymentUrl=http://payment.api/hc
346-
- mvc=http://webmvc/hc
347-
- spa=http://webspa/hc
348339
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
349340
- OrchestratorType=${ORCHESTRATOR_TYPE}
350341
ports:
@@ -357,12 +348,9 @@ services:
357348
- IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105.
358349
- PurchaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5202
359350
- MarketingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5203
360-
- CatalogUrlHC=http://catalog.api/hc
361-
- OrderingUrlHC=http://ordering.api/hc
362-
- IdentityUrlHC=http://identity.api/hc #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser.
363-
- BasketUrlHC=http://basket.api/hc
364-
- MarketingUrlHC=http://marketing.api/hc
365-
- PaymentUrlHC=http://payment.api/hc
351+
- PurchaseUrlHC=http://webshoppingapigw/hc
352+
- MarketingUrlHC=http://webmarketingapigw/hc
353+
- IdentityUrlHC=http://identity.api/hc
366354
- UseCustomizationData=True
367355
- ApplicationInsights__InstrumentationKey=${INSTRUMENTATION_KEY}
368356
- OrchestratorType=${ORCHESTRATOR_TYPE}

‎k8s/helm/apigwmm/templates/configmap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@ metadata:
1111
heritage: {{ .Release.Service }}
1212
data:
1313
internalurls__identity: http://{{ .Values.app.svc.identity }}
14+
internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
15+
internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
16+
internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
17+
internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
18+
internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
19+
internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
20+
internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
1421

‎k8s/helm/apigwmm/values.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ env:
3232
configmap:
3333
- name: IdentityUrl
3434
key: internalurls__identity
35+
- name: CatalogUrlHC
36+
key: internalurls__catalog__hc
37+
- name: BasketUrlHC
38+
key: internalurls__basket__hc
39+
- name: IdentityUrlHC
40+
key: internalurls__identity__hc
41+
- name: OrderingUrlHC
42+
key: internalurls__ordering__hc
43+
- name: MarketingUrlHC
44+
key: internalurls__marketing__hc
45+
- name: PaymentUrlHC
46+
key: internalurls__payment__hc
47+
- name: LocationUrlHC
48+
key: internalurls__location__hc
3549
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
3650
values:
3751
- name: ASPNETCORE_ENVIRONMENT

‎k8s/helm/apigwms/templates/configmap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@ metadata:
1111
heritage: {{ .Release.Service }}
1212
data:
1313
internalurls__identity: http://{{ .Values.app.svc.identity }}
14+
internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
15+
internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
16+
internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
17+
internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
18+
internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
19+
internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
20+
internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
1421

‎k8s/helm/apigwms/values.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ env:
3232
configmap:
3333
- name: IdentityUrl
3434
key: internalurls__identity
35+
- name: CatalogUrlHC
36+
key: internalurls__catalog__hc
37+
- name: BasketUrlHC
38+
key: internalurls__basket__hc
39+
- name: IdentityUrlHC
40+
key: internalurls__identity__hc
41+
- name: OrderingUrlHC
42+
key: internalurls__ordering__hc
43+
- name: MarketingUrlHC
44+
key: internalurls__marketing__hc
45+
- name: PaymentUrlHC
46+
key: internalurls__payment__hc
47+
- name: LocationUrlHC
48+
key: internalurls__location__hc
3549
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
3650
values:
3751
- name: ASPNETCORE_ENVIRONMENT

‎k8s/helm/apigwwm/templates/configmap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@ metadata:
1111
heritage: {{ .Release.Service }}
1212
data:
1313
internalurls__identity: http://{{ .Values.app.svc.identity }}
14+
internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
15+
internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
16+
internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
17+
internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
18+
internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
19+
internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
20+
internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
1421

‎k8s/helm/apigwwm/values.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ env:
3232
configmap:
3333
- name: IdentityUrl
3434
key: internalurls__identity
35+
- name: CatalogUrlHC
36+
key: internalurls__catalog__hc
37+
- name: BasketUrlHC
38+
key: internalurls__basket__hc
39+
- name: IdentityUrlHC
40+
key: internalurls__identity__hc
41+
- name: OrderingUrlHC
42+
key: internalurls__ordering__hc
43+
- name: MarketingUrlHC
44+
key: internalurls__marketing__hc
45+
- name: PaymentUrlHC
46+
key: internalurls__payment__hc
47+
- name: LocationUrlHC
48+
key: internalurls__location__hc
3549
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
3650
values:
3751
- name: ASPNETCORE_ENVIRONMENT

‎k8s/helm/apigwws/templates/configmap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,11 @@ metadata:
1111
heritage: {{ .Release.Service }}
1212
data:
1313
internalurls__identity: http://{{ .Values.app.svc.identity }}
14+
internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
15+
internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
16+
internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
17+
internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
18+
internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
19+
internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
20+
internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc
1421

‎k8s/helm/apigwws/values.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ env:
3232
configmap:
3333
- name: IdentityUrl
3434
key: internalurls__identity
35+
- name: CatalogUrlHC
36+
key: internalurls__catalog__hc
37+
- name: BasketUrlHC
38+
key: internalurls__basket__hc
39+
- name: IdentityUrlHC
40+
key: internalurls__identity__hc
41+
- name: OrderingUrlHC
42+
key: internalurls__ordering__hc
43+
- name: MarketingUrlHC
44+
key: internalurls__marketing__hc
45+
- name: PaymentUrlHC
46+
key: internalurls__payment__hc
47+
- name: LocationUrlHC
48+
key: internalurls__location__hc
3549
# values define environment variables with a fixed value (no configmap involved) (name is name of var, and value is its value)
3650
values:
3751
- name: ASPNETCORE_ENVIRONMENT

‎k8s/helm/mobileshoppingagg/templates/configmap.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,10 @@ data:
1717
internalurls__catalog: http://{{ .Values.app.svc.catalog }}
1818
internalurls__identity: http://{{ .Values.app.svc.identity }}
1919
internalurls__ordering: http://{{ .Values.app.svc.ordering }}
20+
internalurls__basket__hc: http://{{ .Values.app.svc.basket }}/hc
21+
internalurls__catalog__hc: http://{{ .Values.app.svc.catalog }}/hc
22+
internalurls__identity__hc: http://{{ .Values.app.svc.identity }}/hc
23+
internalurls__ordering__hc: http://{{ .Values.app.svc.ordering }}/hc
24+
internalurls__marketing__hc: http://{{ .Values.app.svc.marketing }}/hc
25+
internalurls__payment__hc: http://{{ .Values.app.svc.payment }}/hc
26+
internalurls__location__hc: http://{{ .Values.app.svc.locations }}/hc

0 commit comments

Comments
 (0)