|
39 | 39 | containers:
|
40 | 40 | - name: installer
|
41 | 41 | # This will normally be the release tag
|
42 |
| - image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-conditional-psp-removal.4" |
| 42 | + image: "eu.gcr.io/gitpod-core-dev/build/installer:release-2022.08.0.0" |
43 | 43 | volumeMounts:
|
44 | 44 | - mountPath: /config-patch
|
45 | 45 | name: config-patch
|
@@ -301,6 +301,10 @@ spec:
|
301 | 301 |
|
302 | 302 | # Apply the customization property - if something else is set, this will be ignored
|
303 | 303 | yq e -i ".customization = $(echo "${CUSTOMIZATION}" | base64 -d | yq e -o json '.customization' - | jq -rc) // []" "${CONFIG_FILE}"
|
| 304 | +
|
| 305 | + # Delete any old resources |
| 306 | + echo "Gitpod: Deleting old Gitpod resources" |
| 307 | + kubectl delete all -n {{repl Namespace }} -l app=gitpod,component!=gitpod-installer,component!=gitpod-installer-status --wait || true |
304 | 308 | fi
|
305 | 309 | else
|
306 | 310 | echo "Gitpod: No advanced configuration applied"
|
@@ -369,9 +373,23 @@ spec:
|
369 | 373 | echo "Gitpod: Escape any Golang template values"
|
370 | 374 | sed -i -r 's/(.*\{\{.*)/{{`\1`}}/' "${GITPOD_OBJECTS}/templates/gitpod.yaml"
|
371 | 375 |
|
| 376 | + # This is to overcome upgrade problems with PodSecurityPolicy removal |
| 377 | + echo "Gitpod: Delete Minio deployment" |
| 378 | + kubectl delete deployments.apps --wait -n {{repl Namespace }} minio || true |
| 379 | +
|
| 380 | + echo "Gitpod: Delete RabbitMQ statefulset" |
| 381 | + kubectl delete statefulsets.apps --wait -n {{repl Namespace }} messagebus || true |
| 382 | +
|
| 383 | + echo "Gitpod: Delete MySQL statefulset" |
| 384 | + kubectl delete statefulsets.apps --wait -n {{repl Namespace }} mysql || true |
| 385 | +
|
| 386 | + echo "Gitpod: Delete container-registry secret" |
| 387 | + kubectl delete secret --wait -n {{repl Namespace }} container-registry || true |
| 388 | + # End of PSP removal fixes |
| 389 | +
|
372 | 390 | # If certificate secret already exists, set the timeout to 5m
|
373 | 391 | CERT_SECRET=$(kubectl get secrets -n {{repl Namespace }} https-certificates -o jsonpath='{.metadata.name}' || echo '')
|
374 |
| - HELM_TIMEOUT="5m" |
| 392 | + HELM_TIMEOUT="10m" |
375 | 393 | if [ "${CERT_SECRET}" = "" ]; then
|
376 | 394 | HELM_TIMEOUT="1h"
|
377 | 395 | fi
|
|
0 commit comments