kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'feature/custom-helm-chart-repo' into 'master'

Browse source 
Added feature to specify a custom Auto DevOps chart repository

Closes #55791

See merge request gitlab-org/gitlab-ce!24162
This commit is contained in:
Sean McGivern 2019-01-08 09:04:32 +00:00
commit ffb384cb12
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelogs/unreleased/custom-helm-chart-repo.yml Normal file
View file

@ -0,0 +1,5 @@
---
title: Added feature to specify a custom Auto DevOps chart repository
merge_request: 24162
author: walkafwalka
type: added

3
doc/topics/autodevops/index.md
View file

@ -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 |

2
lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
View file

@ -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