Browse Source

Added missing entries for k8s

pull/816/head
Unai Zorrilla Castro 7 years ago
parent
commit
7d4ddca393
3 changed files with 16 additions and 2 deletions
  1. +3
    -0
      k8s/deploy.ps1
  2. +11
    -1
      k8s/deployments.yaml
  3. +2
    -1
      src/Web/WebMVC/appsettings.json

+ 3
- 0
k8s/deploy.ps1 View File

@ -147,6 +147,7 @@ ExecKube -cmd 'create configmap urls `
--from-literal=MvcClientCatalogUrl=http://catalog ` --from-literal=MvcClientCatalogUrl=http://catalog `
--from-literal=MvcClientBasketUrl=http://basket ` --from-literal=MvcClientBasketUrl=http://basket `
--from-literal=MvcClientMarketingUrl=http://marketing ` --from-literal=MvcClientMarketingUrl=http://marketing `
--from-literal=MvcClientLocationsUrl=http://locations'
--from-literal=MarketingHealthCheckUrl=http://marketing/hc ` --from-literal=MarketingHealthCheckUrl=http://marketing/hc `
--from-literal=WebSpaHealthCheckUrl=http://webspa/hc ` --from-literal=WebSpaHealthCheckUrl=http://webspa/hc `
--from-literal=SpaClientMarketingExternalUrl=http://$($externalDns)/marketing-api ` --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=SpaClientCatalogExternalUrl=http://$($externalDns)/catalog-api `
--from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api ` --from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api `
--from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity ` --from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity `
--from-literal=SpaClientLocationsUrl=http://$($externalDns)/locations-api'
--from-literal=LocationsHealthCheckUrl=http://locations/hc ` --from-literal=LocationsHealthCheckUrl=http://locations/hc `
--from-literal=SpaClientExternalUrl=http://$($externalDns) ` --from-literal=SpaClientExternalUrl=http://$($externalDns) `
--from-literal=LocationApiClient=http://$($externalDns)/locations-api ` --from-literal=LocationApiClient=http://$($externalDns)/locations-api `
--from-literal=MarketingApiClient=http://$($externalDns)/marketing-api ` --from-literal=MarketingApiClient=http://$($externalDns)/marketing-api `
--from-literal=BasketApiClient=http://$($externalDns)/basket-api ` --from-literal=BasketApiClient=http://$($externalDns)/basket-api `
--from-literal=OrderingApiClient=http://$($externalDns)/ordering-api' --from-literal=OrderingApiClient=http://$($externalDns)/ordering-api'
ExecKube -cmd 'label configmap urls app=eshop' ExecKube -cmd 'label configmap urls app=eshop'


+ 11
- 1
k8s/deployments.yaml View File

@ -384,6 +384,11 @@ spec:
configMapKeyRef: configMapKeyRef:
name: urls name: urls
key: MvcClientExternalUrl key: MvcClientExternalUrl
- name: LocationsUrl
valueFrom:
configMapKeyRef:
name: urls
key: MvcClientLocationsUrl
- name: CatalogUrl - name: CatalogUrl
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
@ -528,7 +533,12 @@ spec:
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:
name: urls name: urls
key: SpaClientMarketingExternalUrl
key: SpaClientMarketingExternalUrl
- name: LocationsUrl
valueFrom:
configMapKeyRef:
name: urls
key: SpaClientLocationsUrl
- name: BasketUrlHC - name: BasketUrlHC
valueFrom: valueFrom:
configMapKeyRef: configMapKeyRef:


+ 2
- 1
src/Web/WebMVC/appsettings.json View File

@ -5,9 +5,10 @@
"MarketingUrl": "http://localhost:5110", "MarketingUrl": "http://localhost:5110",
"IdentityUrl": "http://localhost:5105", "IdentityUrl": "http://localhost:5105",
"CallBackUrl": "http://localhost:5100/", "CallBackUrl": "http://localhost:5100/",
"LocationsUrl": "http://localhost:5109/",
"IsClusterEnv": "False", "IsClusterEnv": "False",
"UseResilientHttp": "True", "UseResilientHttp": "True",
"UseLoadTest": false,
"UseLoadTest": false,
"ActivateCampaignDetailFunction": "False", "ActivateCampaignDetailFunction": "False",
"UseCustomizationData": false, "UseCustomizationData": false,
"Logging": { "Logging": {


Loading…
Cancel
Save