From 29b3811eead178600c2e3834d46bd5b2f0fb392b Mon Sep 17 00:00:00 2001 From: Igor Sychev Date: Wed, 6 Sep 2017 13:49:36 +0300 Subject: [PATCH 1/2] Grace period rudement fix --- docker-compose.override.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 892db9b52..b5fda6ff2 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -67,7 +67,6 @@ services: - EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD} - UseCustomizationData=True - AzureServiceBusEnabled=False - - GracePeriodTime=1 - CheckUpdateTime=30000 ports: - "5102:80" From 783dd0396b491d826ca6e072f899fb2c070e6bc1 Mon Sep 17 00:00:00 2001 From: Igor Sychev Date: Wed, 6 Sep 2017 17:45:51 +0300 Subject: [PATCH 2/2] k8 grace period --- k8s/deploy.ps1 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/k8s/deploy.ps1 b/k8s/deploy.ps1 index 6b6318aca..2856cd853 100644 --- a/k8s/deploy.ps1 +++ b/k8s/deploy.ps1 @@ -62,7 +62,7 @@ if ($buildImages) { docker-compose -p .. -f ../docker-compose.yml build Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow - $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "graceperiodmanager") + $services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus") foreach ($service in $services) { $imageFqdn = if ($useDockerHub) {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"} @@ -188,7 +188,6 @@ ExecKube -cmd 'set image deployments/payment payment=${registryPath}${dockerOrg} ExecKube -cmd 'set image deployments/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag' ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$imageTag' ExecKube -cmd 'set image deployments/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag' -ExecKube -cmd 'set image deployments/graceperiodmanager graceperiodmanager=${registryPath}${dockerOrg}/graceperiodmanager:$imageTag' Write-Host "Execute rollout..." -ForegroundColor Yellow ExecKube -cmd 'rollout resume deployments/basket' @@ -201,7 +200,6 @@ ExecKube -cmd 'rollout resume deployments/payment' ExecKube -cmd 'rollout resume deployments/webmvc' ExecKube -cmd 'rollout resume deployments/webstatus' ExecKube -cmd 'rollout resume deployments/webspa' -ExecKube -cmd 'rollout resume deployments/graceperiodmanager' Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow