From 7d4ddca393b51fce24fe00b30f276d92483aac6b Mon Sep 17 00:00:00 2001 From: Unai Zorrilla Castro Date: Tue, 19 Sep 2017 15:50:51 +0200 Subject: [PATCH] Added missing entries for k8s --- k8s/deploy.ps1 | 3 +++ k8s/deployments.yaml | 12 +++++++++++- src/Web/WebMVC/appsettings.json | 3 ++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/k8s/deploy.ps1 b/k8s/deploy.ps1 index 5d184dab5..a460dc7c5 100644 --- a/k8s/deploy.ps1 +++ b/k8s/deploy.ps1 @@ -147,6 +147,7 @@ ExecKube -cmd 'create configmap urls ` --from-literal=MvcClientCatalogUrl=http://catalog ` --from-literal=MvcClientBasketUrl=http://basket ` --from-literal=MvcClientMarketingUrl=http://marketing ` + --from-literal=MvcClientLocationsUrl=http://locations' --from-literal=MarketingHealthCheckUrl=http://marketing/hc ` --from-literal=WebSpaHealthCheckUrl=http://webspa/hc ` --from-literal=SpaClientMarketingExternalUrl=http://$($externalDns)/marketing-api ` @@ -154,12 +155,14 @@ ExecKube -cmd 'create configmap urls ` --from-literal=SpaClientCatalogExternalUrl=http://$($externalDns)/catalog-api ` --from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api ` --from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity ` + --from-literal=SpaClientLocationsUrl=http://$($externalDns)/locations-api' --from-literal=LocationsHealthCheckUrl=http://locations/hc ` --from-literal=SpaClientExternalUrl=http://$($externalDns) ` --from-literal=LocationApiClient=http://$($externalDns)/locations-api ` --from-literal=MarketingApiClient=http://$($externalDns)/marketing-api ` --from-literal=BasketApiClient=http://$($externalDns)/basket-api ` --from-literal=OrderingApiClient=http://$($externalDns)/ordering-api' + ExecKube -cmd 'label configmap urls app=eshop' diff --git a/k8s/deployments.yaml b/k8s/deployments.yaml index e542e8924..b39ba1fbe 100644 --- a/k8s/deployments.yaml +++ b/k8s/deployments.yaml @@ -384,6 +384,11 @@ spec: configMapKeyRef: name: urls key: MvcClientExternalUrl + - name: LocationsUrl + valueFrom: + configMapKeyRef: + name: urls + key: MvcClientLocationsUrl - name: CatalogUrl valueFrom: configMapKeyRef: @@ -528,7 +533,12 @@ spec: valueFrom: configMapKeyRef: name: urls - key: SpaClientMarketingExternalUrl + key: SpaClientMarketingExternalUrl + - name: LocationsUrl + valueFrom: + configMapKeyRef: + name: urls + key: SpaClientLocationsUrl - name: BasketUrlHC valueFrom: configMapKeyRef: diff --git a/src/Web/WebMVC/appsettings.json b/src/Web/WebMVC/appsettings.json index e4b4041bc..a9a73120f 100644 --- a/src/Web/WebMVC/appsettings.json +++ b/src/Web/WebMVC/appsettings.json @@ -5,9 +5,10 @@ "MarketingUrl": "http://localhost:5110", "IdentityUrl": "http://localhost:5105", "CallBackUrl": "http://localhost:5100/", + "LocationsUrl": "http://localhost:5109/", "IsClusterEnv": "False", "UseResilientHttp": "True", - "UseLoadTest": false, + "UseLoadTest": false, "ActivateCampaignDetailFunction": "False", "UseCustomizationData": false, "Logging": {