Browse Source

Add missing environment variables in k8s scripts

pull/255/head
Eduard Tomas 7 years ago
parent
commit
23a759f740
2 changed files with 56 additions and 4 deletions
  1. +11
    -4
      k8s/deploy.ps1
  2. +45
    -0
      k8s/deployments.yaml

+ 11
- 4
k8s/deploy.ps1 View File

@ -136,7 +136,8 @@ ExecKube -cmd 'create configmap urls `
--from-literal=BasketHealthCheckUrl=http://basket/hc `
--from-literal=CatalogUrl=http://$($externalDns)/catalog-api `
--from-literal=CatalogHealthCheckUrl=http://catalog/hc `
--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/catalog/items/[0]/pic/ `
--from-literal=PicBaseUrl=http://$($externalDns)/catalog-api/api/v1/catalog/items/[0]/pic/ `
--from-literal=Marketing_PicBaseUrl=http://$($externalDns)/marketing-api/api/v1/campaigns/[0]/pic/ `
--from-literal=IdentityUrl=http://$($externalDns)/identity `
--from-literal=IdentityHealthCheckUrl=http://identity/hc `
--from-literal=OrderingUrl=http://ordering `
@ -146,15 +147,21 @@ ExecKube -cmd 'create configmap urls `
--from-literal=MvcClientOrderingUrl=http://ordering `
--from-literal=MvcClientCatalogUrl=http://catalog `
--from-literal=MvcClientBasketUrl=http://basket `
--from-literal=WebSpaHealthCheckUrl=http://webspa/hc `
--from-literal=MvcClientMarketingUrl=http://marketing `
--from-literal=MarketingHealthCheckUrl=http://marketing/hc `
--from-literal=WebSpaHealthCheckUrl=http://webspa/hc `
--from-literal=SpaClientMarketingExternalUrl=http://$($externalDns)/marketing-api `
--from-literal=SpaClientOrderingExternalUrl=http://$($externalDns)/ordering-api `
--from-literal=SpaClientCatalogExternalUrl=http://$($externalDns)/catalog-api `
--from-literal=SpaClientBasketExternalUrl=http://$($externalDns)/basket-api `
--from-literal=SpaClientIdentityExternalUrl=http://$($externalDns)/identity `
--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=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'
Write-Host "Deploying configuration from $configFile" -ForegroundColor Yellow


+ 45
- 0
k8s/deployments.yaml View File

@ -127,6 +127,26 @@ spec:
configMapKeyRef:
name: urls
key: SpaClientExternalUrl
- name: LocationApiClient
valueFrom:
configMapKeyRef:
name: urls
key: LocationApiClient
- name: MarketingApiClient
valueFrom:
configMapKeyRef:
name: urls
key: MarketingApiClient
- name: BasketApiClient
valueFrom:
configMapKeyRef:
name: urls
key: BasketApiClient
- name: OrderingApiClient
valueFrom:
configMapKeyRef:
name: urls
key: OrderingApiClient
ports:
- containerPort: 80
imagePullSecrets:
@ -267,6 +287,11 @@ spec:
configMapKeyRef:
name: urls
key: IdentityUrl
- name: IdentityUrlExternal
valueFrom:
configMapKeyRef:
name: urls
key: IdentityUrl
ports:
- containerPort: 80
imagePullSecrets:
@ -321,6 +346,16 @@ spec:
configMapKeyRef:
name: urls
key: IdentityUrl
- name: IdentityUrlExternal
valueFrom:
configMapKeyRef:
name: urls
key: IdentityUrl
- name: PicBaseUrl
valueFrom:
configMapKeyRef:
name: urls
key: Marketing_PicBaseUrl
ports:
- containerPort: 80
imagePullSecrets:
@ -411,6 +446,11 @@ spec:
configMapKeyRef:
name: urls
key: MvcClientOrderingUrl
- name: MarketingUrl
valueFrom:
configMapKeyRef:
name: urls
key: MvcClientMarketingUrl
ports:
- containerPort: 80
imagePullSecrets:
@ -531,6 +571,11 @@ spec:
configMapKeyRef:
name: urls
key: SpaClientOrderingExternalUrl
- name: MarketingUrl
valueFrom:
configMapKeyRef:
name: urls
key: SpaClientMarketingExternalUrl
- name: BasketUrlHC
valueFrom:
configMapKeyRef:


Loading…
Cancel
Save