Skip to content
This repository was archived by the owner on Nov 17, 2023. It is now read-only.

Commit e3c85ba

Browse files
Merge pull request #321 from SychevIgor/SychevIgor/GracePeriodRudement
Grace period rudement fix
2 parents e72e36b + 783dd03 commit e3c85ba

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

docker-compose.override.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ services:
6767
- EventBusPassword=${ESHOP_SERVICE_BUS_PASSWORD}
6868
- UseCustomizationData=True
6969
- AzureServiceBusEnabled=False
70-
- GracePeriodTime=1
7170
- CheckUpdateTime=30000
7271
ports:
7372
- "5102:80"

k8s/deploy.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ if ($buildImages) {
6262
docker-compose -p .. -f ../docker-compose.yml build
6363

6464
Write-Host "Pushing images to $registry/$dockerOrg..." -ForegroundColor Yellow
65-
$services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus", "graceperiodmanager")
65+
$services = ("basket.api", "catalog.api", "identity.api", "ordering.api", "marketing.api","payment.api","locations.api", "webmvc", "webspa", "webstatus")
6666

6767
foreach ($service in $services) {
6868
$imageFqdn = if ($useDockerHub) {"$dockerOrg/${service}"} else {"$registry/$dockerOrg/${service}"}
@@ -188,7 +188,6 @@ ExecKube -cmd 'set image deployments/payment payment=${registryPath}${dockerOrg}
188188
ExecKube -cmd 'set image deployments/webmvc webmvc=${registryPath}${dockerOrg}/webmvc:$imageTag'
189189
ExecKube -cmd 'set image deployments/webstatus webstatus=${registryPath}${dockerOrg}/webstatus:$imageTag'
190190
ExecKube -cmd 'set image deployments/webspa webspa=${registryPath}${dockerOrg}/webspa:$imageTag'
191-
ExecKube -cmd 'set image deployments/graceperiodmanager graceperiodmanager=${registryPath}${dockerOrg}/graceperiodmanager:$imageTag'
192191

193192
Write-Host "Execute rollout..." -ForegroundColor Yellow
194193
ExecKube -cmd 'rollout resume deployments/basket'
@@ -201,7 +200,6 @@ ExecKube -cmd 'rollout resume deployments/payment'
201200
ExecKube -cmd 'rollout resume deployments/webmvc'
202201
ExecKube -cmd 'rollout resume deployments/webstatus'
203202
ExecKube -cmd 'rollout resume deployments/webspa'
204-
ExecKube -cmd 'rollout resume deployments/graceperiodmanager'
205203

206204
Write-Host "WebSPA is exposed at http://$externalDns, WebMVC at http://$externalDns/webmvc, WebStatus at http://$externalDns/webstatus" -ForegroundColor Yellow
207205

0 commit comments

Comments
 (0)