From 5a8343deb9becf718826298c54d5882b8256d333 Mon Sep 17 00:00:00 2001 From: Dominik Hebeler Date: Fri, 30 Oct 2020 11:52:51 +0000 Subject: [PATCH 1/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50e96083..4014bae9 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 -- GitLab From a3ed4b70f7cf3b1afb4907977406c43da645180a Mon Sep 17 00:00:00 2001 From: Dominik Hebeler Date: Fri, 30 Oct 2020 13:43:18 +0100 Subject: [PATCH 2/3] disabeld postgresql --- .gitlab/development-values.yaml | 2 ++ .gitlab/production-values.yaml | 2 ++ .gitlab/review-apps-values.yaml | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab/development-values.yaml b/.gitlab/development-values.yaml index 8a5e39a3..2a9382f2 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 130b7dc1..798cc5f5 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 8c4d37f4..917ab1db 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 -- GitLab From 07a08b3a2a6f97775c60828f68fec8eaaa36b2f1 Mon Sep 17 00:00:00 2001 From: Dominik Hebeler Date: Fri, 30 Oct 2020 13:50:47 +0100 Subject: [PATCH 3/3] fixed postgresql requirement --- chart/requirements.lock | 6 +++--- chart/requirements.yaml | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/chart/requirements.lock b/chart/requirements.lock index c92fba59..ac415741 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 8d883841..736a82d7 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 -- GitLab