diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50e9608367d60945979830b4f754f91c28396a61..4014bae9e87bb63b3d0efe05f88116ae8f7edcf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,8 @@ stages: - integrationtest - cleanup +.auto-deploy: + image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v1.0.6" build: services: @@ -163,4 +165,4 @@ integrationtest: - sed -i "s#^APP_URL=.*#APP_URL=$URL#g" .env - sed -i "s#^BRANCH_NAME=.*#BRANCH_NAME=$CI_COMMIT_REF_NAME#g" .env - sed -i "s#^COMMIT_NAME=.*#COMMIT_NAME=$CI_COMMIT_REF_SLUG#g" .env - - php artisan dusk \ No newline at end of file + - php artisan dusk diff --git a/.gitlab/development-values.yaml b/.gitlab/development-values.yaml index 8a5e39a311ff68f7f9f9c973677b4546edbe08cc..2a9382f2e426f7ccff44295c19791d77a19d7b53 100644 --- a/.gitlab/development-values.yaml +++ b/.gitlab/development-values.yaml @@ -1,3 +1,5 @@ +postgresql: + enabled: false service: externalPort: 80 internalPort: 80 diff --git a/.gitlab/production-values.yaml b/.gitlab/production-values.yaml index 130b7dc1e15d5fec3419374b390413c3ad14e833..798cc5f559ec68f6ac92778a4c3b3560575f9a55 100644 --- a/.gitlab/production-values.yaml +++ b/.gitlab/production-values.yaml @@ -1,3 +1,5 @@ +postgresql: + enabled: false service: externalPort: 80 internalPort: 80 diff --git a/.gitlab/review-apps-values.yaml b/.gitlab/review-apps-values.yaml index 8c4d37f43474dd7b4c48be7dea6b9df228c51d26..917ab1db980f75a0a74bbaa958759d7a20cefab9 100644 --- a/.gitlab/review-apps-values.yaml +++ b/.gitlab/review-apps-values.yaml @@ -1,4 +1,5 @@ ---- +postgresql: + enabled: false hpa: enabled: false ingress: @@ -20,4 +21,4 @@ service: commonName: "" externalPort: 80 internalPort: 80 -deploymentApiVersion: apps/v1 +deploymentApiVersion: apps/v1 \ No newline at end of file diff --git a/chart/requirements.lock b/chart/requirements.lock index c92fba599d5440f06d9929ac994ed1d1da7c8ab8..ac41574152ad6f9507d5529e29c9a1bfe25e23ee 100644 --- a/chart/requirements.lock +++ b/chart/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: postgresql - repository: https://kubernetes-charts.storage.googleapis.com/ + repository: https://gitlab-org.gitlab.io/cluster-integration/helm-stable-archive version: 0.7.1 -digest: sha256:358ce85fe4d3461ea6bb96713470a80de9c1324214a2e6f97d800298c02530e2 -generated: 2017-08-28T15:22:30.690341342-05:00 +digest: sha256:0a7e2f279e3b8063cfe6365a56601227ff8934fa70a0434df0485bce9590be56 +generated: "2020-10-21T09:35:20.464079556+07:00" diff --git a/chart/requirements.yaml b/chart/requirements.yaml index 8d8838411e3d3f67a9e64109787ddb205681f33f..736a82d7a59ee10d505301f1f7a959119d9a4f57 100644 --- a/chart/requirements.yaml +++ b/chart/requirements.yaml @@ -1,5 +1,7 @@ dependencies: + # This is a legacy in-cluster PostgreSQL dependency that is no longer used for newer installations. + # We can remove this dependency when we drop support for the legacy instances. - name: postgresql version: "0.7.1" - repository: "https://kubernetes-charts.storage.googleapis.com/" + repository: "@stable-archive" condition: postgresql.enabled