diff options
| author | walkafwalka <aaron.walker@goldenhippo.com> | 2019-01-04 10:50:52 -0800 |
|---|---|---|
| committer | walkafwalka <aaron.walker@goldenhippo.com> | 2019-01-04 10:50:52 -0800 |
| commit | f650f9a4b214ae9e36efdc65d05d26a01f8dbbb9 (patch) | |
| tree | 6362dff3e741f3aa171f524d3a45a2c5f27e9f3b | |
| parent | 2ab68a2341ba0925e434dd0270ef2b0e9934be4e (diff) | |
| download | gitlab-ce-f650f9a4b214ae9e36efdc65d05d26a01f8dbbb9.tar.gz | |
Added feature to specify a custom Auto DevOps chart repository
| -rw-r--r-- | changelogs/unreleased/custom-helm-chart-repo.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/custom-helm-chart-repo.yml b/changelogs/unreleased/custom-helm-chart-repo.yml new file mode 100644 index 00000000000..592d2f60ca2 --- /dev/null +++ b/changelogs/unreleased/custom-helm-chart-repo.yml @@ -0,0 +1,5 @@ +--- +title: Added feature to specify a custom Auto DevOps chart repository +merge_request: 24162 +author: walkafwalka +type: added diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index e937d372384..73b67c6f7e2 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -609,7 +609,7 @@ repo or by specifying a project variable: one](https://gitlab.com/charts/auto-deploy-app). This can be a great way to control exactly how your application is deployed. - **Project variable** - Create a [project variable](../../ci/variables/README.md#variables) - `AUTO_DEVOPS_CHART` with the URL of a custom chart to use. + `AUTO_DEVOPS_CHART` with the URL of a custom chart to use or create two project variables `AUTO_DEVOPS_CHART_REPOSITORY` with the URL of a custom chart repository and `AUTO_DEVOPS_CHART` with the path to the chart. ### Customizing `.gitlab-ci.yml` diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index b5350f56f9c..e292641da2b 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -793,7 +793,7 @@ rollout 100%: fi helm init --client-only - helm repo add gitlab https://charts.gitlab.io + helm repo add gitlab ${AUTO_DEVOPS_CHART_REPOSITORY:-https://charts.gitlab.io} if [[ ! -d "$auto_chart" ]]; then helm fetch ${auto_chart} --untar fi |