Skip to content
代码片段 群组 项目
提交 93bb2711 编辑于 作者: Russell Dickenson's avatar Russell Dickenson
浏览文件

Merge branch 'allow-override-url-bitnami-chart' into 'master'

Bump Auto Deploy Image to v2.30.0

See merge request gitlab-org/gitlab!89208
No related branches found
No related tags found
无相关合并请求
......@@ -467,6 +467,8 @@ The following table lists CI/CD variables related to the database.
| `POSTGRES_VERSION` | Tag for the [`postgres` Docker image](https://hub.docker.com/_/postgres) to use. Defaults to `9.6.16` for tests and deployments as of GitLab 13.0 (previously `9.6.2`). If `AUTO_DEVOPS_POSTGRES_CHANNEL` is set to `1`, deployments uses the default version `9.6.2`. |
| `POSTGRES_HELM_UPGRADE_VALUES_FILE` | In GitLab 13.8 and later, and when using [auto-deploy-image v2](upgrading_auto_deploy_dependencies.md), this variable allows the `helm upgrade` values file for PostgreSQL to be overridden. Defaults to `.gitlab/auto-deploy-postgres-values.yaml`. |
| `POSTGRES_HELM_UPGRADE_EXTRA_ARGS` | In GitLab 13.8 and later, and when using [auto-deploy-image v2](upgrading_auto_deploy_dependencies.md), this variable allows extra PostgreSQL options in `helm upgrade` commands when deploying the application. Note that using quotes doesn't prevent word splitting. |
| `POSTGRES_CHART_REPOSITORY` | Helm Chart repository used to search for PostgreSQL chart. Defaults to `https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami`. |
| `POSTGRES_CHART_VERSION` | Helm Chart version used for PostgreSQL chart. Defaults to `8.2.1`. |
### Disable jobs
......
variables:
DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.30.0'
.dast-auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${DAST_AUTO_DEPLOY_IMAGE_VERSION}"
......
variables:
AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
AUTO_DEPLOY_IMAGE_VERSION: 'v2.30.0'
.auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
......
variables:
AUTO_DEPLOY_IMAGE_VERSION: 'v2.28.2'
AUTO_DEPLOY_IMAGE_VERSION: 'v2.30.0'
.auto-deploy:
image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册