diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-01-23 10:28:19 -0600 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-02-04 11:43:34 -0600 |
| commit | 8ff73614a1466ffc39e4464462719e7456c03e29 (patch) | |
| tree | 8573da7dc5ea258c1aa7bd373b757b4b0e6cf996 /app/models/clusters/platforms | |
| parent | 280b6f6f8d038c4c28b32c5965e8a052adf4a052 (diff) | |
| download | gitlab-ce-8ff73614a1466ffc39e4464462719e7456c03e29.tar.gz | |
Moves domain setting to Cluster setting
Changes domain field to be on the Cluster page show, removing it from
Auto DevOps setting. Also injects the new environment variable
KUBE_INGRESS_BASE_DOMAIN into kubernetes#predefined_variables.
Migration to move the information from ProjectAutoDevops#domain
to Clusters::Cluster#domain. As well as necessary modifications to qa
selectors
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/52363
Diffstat (limited to 'app/models/clusters/platforms')
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 8f3424db295..c8969351ed9 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -98,6 +98,8 @@ module Clusters .append(key: 'KUBE_NAMESPACE', value: actual_namespace) .append(key: 'KUBECONFIG', value: kubeconfig, public: false, file: true) end + + variables.concat(cluster.predefined_variables) end end |