From 0f9a83433a0ca02e3aafc2a9aea71e7735f4f025 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 15 Jan 2020 22:22:11 +0000 Subject: [PATCH 1/6] Document how to customize Auto DevOps values By using the .gitlab/auto-deploy-values.yaml file --- doc/topics/autodevops/index.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index c52c5832591ac8..92d500167a92c5 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -877,8 +877,17 @@ repo or by specifying a project variable: - **Project variable** - Create a [project variable](../../ci/variables/README.md#gitlab-cicd-environment-variables) `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. -You can also make use of the `HELM_UPGRADE_EXTRA_ARGS` environment variable to override the default values in the `values.yaml` file in the [default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app). -To apply your own `values.yaml` file to all Helm upgrade commands in Auto Deploy set `HELM_UPGRADE_EXTRA_ARGS` to `--values my-values.yaml`. +### Customize values for Helm Chart + +> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/30628) in GitLab 12.6, `.gitlab/auto-deploy-values.yaml` will be used by default for Helm upgrades. + +You can also override the default values in the `values.yaml` file in the [default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app). +This can be achieved by: + + - Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will + be automatically used if found. + - Adding a file with a different name or path to the repository, and override the value of the + `HELM_UPGRADE_VALUES_FILE` variable with the path and name. ### Custom Helm chart per environment -- GitLab From 61836d5c6d442582815f1d49d1ab3f7f0747daa3 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 15 Jan 2020 22:40:50 +0000 Subject: [PATCH 2/6] Apply suggestion to doc/topics/autodevops/index.md --- doc/topics/autodevops/index.md | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 92d500167a92c5..66711b25be7b24 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -883,11 +883,10 @@ repo or by specifying a project variable: You can also override the default values in the `values.yaml` file in the [default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app). This can be achieved by: - - - Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will - be automatically used if found. - - Adding a file with a different name or path to the repository, and override the value of the - `HELM_UPGRADE_VALUES_FILE` variable with the path and name. +- Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will + be automatically used if found. +- Adding a file with a different name or path to the repository, and override the value of the + `HELM_UPGRADE_VALUES_FILE` variable with the path and name. ### Custom Helm chart per environment -- GitLab From ee13d7f3cadaaf8849ce3222e88b16e0a82520cc Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Thu, 16 Jan 2020 01:10:44 +0000 Subject: [PATCH 3/6] Apply suggestion to doc/topics/autodevops/index.md --- doc/topics/autodevops/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 66711b25be7b24..95821825f074f0 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -883,6 +883,7 @@ repo or by specifying a project variable: You can also override the default values in the `values.yaml` file in the [default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app). This can be achieved by: + - Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will be automatically used if found. - Adding a file with a different name or path to the repository, and override the value of the -- GitLab From 599eefae26ae845875a1b76aeaf850c7b51422b7 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 22 Jan 2020 02:00:52 +0000 Subject: [PATCH 4/6] Apply suggestion to doc/topics/autodevops/index.md --- doc/topics/autodevops/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 95821825f074f0..900625d69aa217 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -881,7 +881,7 @@ repo or by specifying a project variable: > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/30628) in GitLab 12.6, `.gitlab/auto-deploy-values.yaml` will be used by default for Helm upgrades. -You can also override the default values in the `values.yaml` file in the [default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app). +You can override the default values in the `values.yaml` file in the [default Helm chart](https://gitlab.com/gitlab-org/charts/auto-deploy-app). This can be achieved by: - Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will -- GitLab From f1c7138aa79a39aa969a5fec0968d4ef1f105e7d Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 22 Jan 2020 02:01:06 +0000 Subject: [PATCH 5/6] Apply suggestion to doc/topics/autodevops/index.md --- doc/topics/autodevops/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 900625d69aa217..d8667ec97193d8 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -886,7 +886,7 @@ This can be achieved by: - Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will be automatically used if found. -- Adding a file with a different name or path to the repository, and override the value of the +- Adding a file with a different name or path to the repository, and set the `HELM_UPGRADE_VALUES_FILE` variable with the path and name. ### Custom Helm chart per environment -- GitLab From eebca83ef7026fee50bbf73e39b0220c295bd2b0 Mon Sep 17 00:00:00 2001 From: Thong Kuah Date: Wed, 22 Jan 2020 02:01:16 +0000 Subject: [PATCH 6/6] Apply suggestion to doc/topics/autodevops/index.md --- doc/topics/autodevops/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index d8667ec97193d8..95f85a613a5710 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -887,7 +887,7 @@ This can be achieved by: - Adding a file named `.gitlab/auto-deploy-values.yaml` to your repository. It will be automatically used if found. - Adding a file with a different name or path to the repository, and set the - `HELM_UPGRADE_VALUES_FILE` variable with the path and name. + `HELM_UPGRADE_VALUES_FILE` [environment variable](https://docs.gitlab.com/ee/topics/autodevops/#environment-variables) with the path and name. ### Custom Helm chart per environment -- GitLab