diff options
| author | Dylan Griffith <dyl.griffith@gmail.com> | 2019-02-23 02:22:35 +0300 |
|---|---|---|
| committer | Dylan Griffith <dyl.griffith@gmail.com> | 2019-02-23 02:26:43 +0300 |
| commit | 2f599abab08fb262ce185b4f4edbd7eb930bd432 (patch) | |
| tree | 11c3f84f15b07207a3f19de37337e502a7d710b4 | |
| parent | 459276846372d8309220a5667cb4389dcfc66281 (diff) | |
Allow configuring POSTGRES_VERSION in Auto DevOps
We set the default value to 9.6.2 since this was the previous default
being used by `stable/postgresql --version=0.7.1` which is used in
auto-deploy-app.
| -rw-r--r-- | changelogs/unreleased/58098-auto-devops-postgres-version-variable.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 1 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/changelogs/unreleased/58098-auto-devops-postgres-version-variable.yml b/changelogs/unreleased/58098-auto-devops-postgres-version-variable.yml new file mode 100644 index 00000000000..a7a87f60c28 --- /dev/null +++ b/changelogs/unreleased/58098-auto-devops-postgres-version-variable.yml @@ -0,0 +1,5 @@ +--- +title: Allow configuring POSTGRES_VERSION in Auto DevOps +merge_request: 25500 +author: +type: added diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 04d3b5cb277..43d21ab0a02 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -697,6 +697,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac | `POSTGRES_USER` | The PostgreSQL user; defaults to `user`. Set it to use a custom username. | | `POSTGRES_PASSWORD` | The PostgreSQL password; defaults to `testing-password`. Set it to use a custom password. | | `POSTGRES_DB` | The PostgreSQL database name; defaults to the value of [`$CI_ENVIRONMENT_SLUG`](../../ci/variables/README.md#predefined-environment-variables). Set it to use a custom database name. | +| `POSTGRES_VERSION` | The PostgreSQL version; defaults to `9.6.2` | | `BUILDPACK_URL` | The buildpack's full URL. It can point to either Git repositories or a tarball URL. For Git repositories, it is possible to point to a specific `ref`, for example `https://github.com/heroku/heroku-buildpack-ruby.git#v142` | | `SAST_CONFIDENCE_LEVEL` | The minimum confidence level of security issues you want to be reported; `1` for Low, `2` for Medium, `3` for High; defaults to `3`.| | `DEP_SCAN_DISABLE_REMOTE_CHECKS` | Whether remote Dependency Scanning checks are disabled; defaults to `"false"`. Set to `"true"` to disable checks that send data to GitLab central servers. [Read more about remote checks](https://gitlab.com/gitlab-org/security-products/dependency-scanning#remote-checks).| diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index 527a432d72d..328a5be6e4c 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -48,6 +48,7 @@ variables: POSTGRES_PASSWORD: testing-password POSTGRES_ENABLED: "true" POSTGRES_DB: $CI_ENVIRONMENT_SLUG + POSTGRES_VERSION: 9.6.2 KUBERNETES_VERSION: 1.11.6 HELM_VERSION: 2.12.2 @@ -700,6 +701,7 @@ rollout 100%: --set postgresql.postgresUser="$POSTGRES_USER" \ --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \ + --set postgresql.imageTag="$POSTGRES_VERSION" \ --set application.initializeCommand="$DB_INITIALIZE" \ --namespace="$KUBE_NAMESPACE" \ "$name" \ |