Browse Source

Update k8s deployment and compose files with graceperiodmanager settings missing

pull/816/head
Eduard Tomàs 7 years ago
parent
commit
93e2b9137d
5 changed files with 19 additions and 2 deletions
  1. +1
    -0
      docker-compose.override.yml
  2. +2
    -0
      docker-compose.prod.yml
  3. +2
    -0
      k8s/conf_cloud.yml
  4. +4
    -2
      k8s/conf_local.yml
  5. +10
    -0
      k8s/deployments.yaml

+ 1
- 0
docker-compose.override.yml View File

@ -68,6 +68,7 @@ services:
- UseCustomizationData=True
- AzureServiceBusEnabled=False
- CheckUpdateTime=30000
- GracePeriodTime=1
ports:
- "5102:80"


+ 2
- 0
docker-compose.prod.yml View File

@ -66,6 +66,8 @@ services:
- EventBusConnection=${ESHOP_AZURE_SERVICE_BUS:-rabbitmq}
- UseCustomizationData=True
- AzureServiceBusEnabled=False
- CheckUpdateTime=30000
- GracePeriodTime=1
ports:
- "5102:80"


+ 2
- 0
k8s/conf_cloud.yml View File

@ -25,6 +25,8 @@ data:
# Ordering.API entries
OrderingBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
OrderingSqlDb: Ordering SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
GracePeriodManager_GracePeriodTime: "1"
GracePeriodManager_CheckUpdateTime: "15000"
# Payment.API entries
PaymentBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
# Global entries


+ 4
- 2
k8s/conf_local.yml View File

@ -19,9 +19,11 @@ data:
MarketingNoSqlDbName: MarketingDb
MarketingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.MarketingDb;User Id=sa;Password=Pass@word;
OrderingBus: rabbitmq
GracePeriodManager_GracePeriodTime:"1"
GracePeriodManager_CheckUpdateTime:"15000"
OrderingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
PaymentBus: rabbitmq
UseAzureServiceBus: "False"
keystore: keystore-data
GracePeriodManager_GracePeriodTime: "1"
GracePeriodManager_CheckUpdateTime: "15000"

+ 10
- 0
k8s/deployments.yaml View File

@ -191,6 +191,16 @@ spec:
configMapKeyRef:
name: urls
key: IdentityUrl
- name: CheckUpdateTime
valueFrom:
configMapKeyRef:
name: urls
key: GracePeriodManager_CheckUpdateTime
- name: GracePeriodTime
valueFrom:
configMapKeyRef:
name: urls
key: GracePeriodManager_GracePeriodTime
ports:
- containerPort: 80
imagePullSecrets:


Loading…
Cancel
Save