Commit 46fb2b47 authored by Thong Kuah's avatar Thong Kuah
Browse files

Merge branch 'fix-make-auto-deploy-delete-postgresql-pvc' into 'master' 

fix: Make delete function remove the PostgreSQL PVC

See merge request gitlab-org/cluster-integration/auto-deploy-image!78
parents d9813810 5526b251

.gitlab/ci/test.gitlab-ci.yml

+4 −0
Original line number Diff line number Diff line
@@ -418,9 +418,13 @@ test-delete-postgresql: 
    - auto-deploy deploy

    - helm get production

    - helm get production-postgresql

    - pvc_before_delete=$(kubectl -n $KUBE_NAMESPACE get pvc -l release=production-postgresql)

    - if [[ -z "$pvc_before_delete" ]]; then "expected to find a postgresql pvc"; exit 1; fi

    - auto-deploy delete

    - helm get production && expected_error || failed_as_expected

    - helm get production-postgresql && expected_error || failed_as_expected

    - pvc_after_delete=$(kubectl -n $KUBE_NAMESPACE get pvc -l release=production-postgresql)

    - if [[ -n "$pvc_after_delete" ]]; then echo "no postgresql pvc should be present"; exit 1; fi



test-delete-canary-postgresql:

  extends: test-deploy

src/bin/auto-deploy

+2 −0
Original line number Diff line number Diff line
@@ -387,9 +387,11 @@ function delete_postgresql() { 


  if [[ -n "$(helm ls -q "^$name$")" ]]; then

    helm delete --purge "$name"

    kubectl delete pvc -n "$KUBE_NAMESPACE" -l "release=$POSTGRESQL_RELEASE_NAME"

  fi

}



# This deletes the PVC for the database if the track is stable

function delete() {

  local track="${1-stable}"

  local name