summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2019-01-08 09:04:32 +0000
committerSean McGivern <sean@gitlab.com>2019-01-08 09:04:32 +0000
commitffb384cb125a85c77184a6fda7bbbdbaf89207eb (patch)
tree3e2ae2385d1d656302983733ec35da75abdcbc68
parent63f6ea2013ba739b73a5ad8b63ade7b5e41122e1 (diff)
parent33d488dc6fd71b2e256a0df6b57e19a22d888b85 (diff)
downloadgitlab-ce-ffb384cb125a85c77184a6fda7bbbdbaf89207eb.tar.gz
Merge branch 'feature/custom-helm-chart-repo' into 'master'
Added feature to specify a custom Auto DevOps chart repository Closes #55791 See merge request gitlab-org/gitlab-ce!24162
-rw-r--r--changelogs/unreleased/custom-helm-chart-repo.yml5
-rw-r--r--doc/topics/autodevops/index.md3
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml2
3 files changed, 8 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 008791d5ef6..da2ecd631bb 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -632,7 +632,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`
@@ -678,6 +678,7 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac
| ------------ | --------------- |
| `AUTO_DEVOPS_DOMAIN` | The [Auto DevOps domain](#auto-devops-domain); by default set automatically by the [Auto DevOps setting](#enabling-auto-devops). |
| `AUTO_DEVOPS_CHART` | The Helm Chart used to deploy your apps; defaults to the one [provided by GitLab](https://gitlab.com/charts/auto-deploy-app). |
+| `AUTO_DEVOPS_CHART_REPOSITORY` | The Helm Chart repository used to search for charts; defaults to `https://charts.gitlab.io`. |
| `REPLICAS` | The number of replicas to deploy; defaults to 1. |
| `PRODUCTION_REPLICAS` | The number of replicas to deploy in the production environment. This takes precedence over `REPLICAS`; defaults to 1. |
| `CANARY_REPLICAS` | The number of canary replicas to deploy for [Canary Deployments](https://docs.gitlab.com/ee/user/project/canary_deployments.html); defaults to 1 |
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