diff options
| author | Brad Downey <brad@magic7s.com> | 2019-03-01 13:41:01 -0800 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-03-05 15:18:10 -0600 |
| commit | 6d226fdc6a6f7164e70592748ff81293960ac1e7 (patch) | |
| tree | e7776d5d691be00868274c8eb1e859c9259bf5ff | |
| parent | 3991cb658f810d7c5a64ae8a7a3ce5b016f55c05 (diff) | |
| download | gitlab-ce-mc-gitlab-ce-magic7s-update-Auto-DevOps-template.tar.gz | |
Update Auto-DevOps-template Environment Variablesmc-gitlab-ce-magic7s-update-Auto-DevOps-template
Added two new ENV vars to template:
- HELM_EXTERNAL_PORT map to helm parameter service.externalPort
- HELM_EXTERNAL_PORT map to helm parameter service.internalPort
This will allow users to set the TCP port that the container listens on internally and externally when deploying to Kubernetes.
Currently the static default is 5000 and can only be changed by adding additional `--set service.externalPort` and `--set service.internalPort` to AutoDevOps .gitlab-ci.yml file.
| -rw-r--r-- | changelogs/unreleased/magic7s-update-Auto-DevOps-template.yml | 5 | ||||
| -rw-r--r-- | doc/topics/autodevops/index.md | 2 | ||||
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 12 |
3 files changed, 13 insertions, 6 deletions
diff --git a/changelogs/unreleased/magic7s-update-Auto-DevOps-template.yml b/changelogs/unreleased/magic7s-update-Auto-DevOps-template.yml new file mode 100644 index 00000000000..02fc799d866 --- /dev/null +++ b/changelogs/unreleased/magic7s-update-Auto-DevOps-template.yml @@ -0,0 +1,5 @@ +--- +title: Add Variables to Auto-DevOps template to support helm chart options +merge_request: 25531 +author: +type: changed diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index 2e1df9d50d4..b961e5235f8 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -716,6 +716,8 @@ also be customized, and you can easily use a [custom buildpack](#custom-buildpac | `PERFORMANCE_DISABLED` | From GitLab 11.0, this variable can be used to disable the `performance` job. If the variable is present, the job will not be created. | | `K8S_SECRET_*` | From GitLab 11.7, any variable prefixed with [`K8S_SECRET_`](#application-secret-variables) will be made available by Auto DevOps as environment variables to the deployed application. | | `KUBE_INGRESS_BASE_DOMAIN` | From GitLab 11.8, this variable can be used to set a domain per cluster. See [cluster domains](../../user/project/clusters/index.md#base-domain) for more information. | +| `HELM_EXTERNAL_PORT` | Helm Chart [provided by GitLab](https://gitlab.com/charts/auto-deploy-app) external TCP port [exposed](https://gitlab.com/charts/auto-deploy-app/blob/master/templates/service.yaml#L14). +| `HELM_INTERNAL_PORT` | Helm Chart [provided by GitLab](https://gitlab.com/charts/auto-deploy-app) internal TCP port [within container](https://gitlab.com/charts/auto-deploy-app/blob/master/templates/service.yaml#L15). TIP: **Tip:** Set up the replica variables using a diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index e5eea0a9af9..2d7bc39f9a2 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -52,8 +52,8 @@ variables: KUBERNETES_VERSION: 1.11.7 HELM_VERSION: 2.12.3 - HELM_PARAMETER_service.externalPort: 5000 - HELM_PARAMETER_service.internalPort: 5000 + HELM_EXTERNAL_PORT: 5000 + HELM_INTERNAL_PORT: 5000 DOCKER_DRIVER: overlay2 @@ -703,8 +703,8 @@ rollout 100%: --set postgresql.postgresDatabase="$POSTGRES_DB" \ --set postgresql.imageTag="$POSTGRES_VERSION" \ --set application.initializeCommand="$DB_INITIALIZE" \ - --set service.externalPort="$HELM_PARAMETER_service.externalPort" \ - --set service.internalPort="$HELM_PARAMETER_service.internalPort" \ + --set service.externalPort="$HELM_EXTERNAL_PORT" \ + --set service.internalPort="$HELM_INTERNAL_PORT" \ --namespace="$KUBE_NAMESPACE" \ "$name" \ chart/ @@ -741,8 +741,8 @@ rollout 100%: --set postgresql.postgresPassword="$POSTGRES_PASSWORD" \ --set postgresql.postgresDatabase="$POSTGRES_DB" \ --set application.migrateCommand="$DB_MIGRATE" \ - --set service.externalPort="$HELM_PARAMETER_service.externalPort" \ - --set service.internalPort="$HELM_PARAMETER_service.internalPort" \ + --set service.externalPort="$HELM_EXTERNAL_PORT" \ + --set service.internalPort="$HELM_INTERNAL_PORT" \ --namespace="$KUBE_NAMESPACE" \ "$name" \ chart/ |