Skip to content

Commit cb546c9

Browse files
committed
Fix errors when setting container images and rolling out deployments in deploy script
1 parent 8b9456d commit cb546c9

1 file changed

Lines changed: 18 additions & 11 deletions

File tree

k8s/deploy.ps1

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ if(-not $useDockerHub) {
5050

5151
# Removing previous services & deployments
5252
Write-Host "Removing existing services & deployments.." -ForegroundColor Yellow
53-
ExecKube -cmd 'delete -f sql-data.yaml -f rabbitmq.yaml -f basket-data.yaml'
54-
ExecKube -cmd 'delete -f services.yaml -f frontend.yaml -f deployments.yaml'
53+
ExecKube -cmd 'delete deployments --all'
54+
ExecKube -cmd 'delete services --all'
5555
ExecKube -cmd 'delete configmap config-files'
5656
ExecKube -cmd 'delete configmap urls'
5757

@@ -117,17 +117,24 @@ ExecKube -cmd 'create -f deployments.yaml'
117117
if(-not $deployCI) {
118118
# update deployments with the private registry before k8s tries to pull images
119119
# (deployment templating, or Helm, would obviate this)
120-
ExecKube -cmd 'set image -f deployments.yaml `
121-
basket=$registry/eshop/basket.api `
122-
catalog=$registry/eshop/catalog.api `
123-
identity=$registry/eshop/identity.api `
124-
ordering=$registry/eshop/ordering.api `
125-
webmvc=$registry/eshop/webmvc `
126-
webstatus=$registry/eshop/webstatus `
127-
webspa=$registry/eshop/webspa'
120+
Write-Host "Update Image containers..." -ForegroundColor Yellow
121+
ExecKube -cmd 'set image deployments/basket basket=$registry/eshop/basket.api'
122+
ExecKube -cmd 'set image deployments/catalog catalog=$registry/eshop/catalog.api'
123+
ExecKube -cmd 'set image deployments/identity identity=$registry/eshop/identity.api'
124+
ExecKube -cmd 'set image deployments/ordering ordering=$registry/eshop/ordering.api'
125+
ExecKube -cmd 'set image deployments/webmvc webmvc=$registry/eshop/webmvc'
126+
ExecKube -cmd 'set image deployments/webstatus webstatus=$registry/eshop/webstatus'
127+
ExecKube -cmd 'set image deployments/webspa webspa=$registry/eshop/webspa'
128128
}
129129

130-
ExecKube -cmd 'rollout resume -f deployments.yaml'
130+
Write-Host "Execute rollout..." -ForegroundColor Yellow
131+
ExecKube -cmd 'rollout resume deployments/basket'
132+
ExecKube -cmd 'rollout resume deployments/catalog'
133+
ExecKube -cmd 'rollout resume deployments/identity'
134+
ExecKube -cmd 'rollout resume deployments/ordering'
135+
ExecKube -cmd 'rollout resume deployments/webmvc'
136+
ExecKube -cmd 'rollout resume deployments/webstatus'
137+
ExecKube -cmd 'rollout resume deployments/webspa'
131138

132139
Write-Host "WebSPA is exposed at http://$frontendUrl, WebMVC at http://$frontendUrl/webmvc, WebStatus at http://$frontendUrl/webstatus" -ForegroundColor Yellow
133140

0 commit comments

Comments
 (0)