diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-02-20 21:02:24 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-03-03 16:09:49 +0000 |
| commit | ba4a2c546982b1b615be5ed9c8b96361de3f3545 (patch) | |
| tree | 7e5845cbe3567520a80876a4d525a5e0a1225cca /app/models/project_services/kubernetes_service.rb | |
| parent | df63d9db40e568bcca87cf7946cf518684538a31 (diff) | |
| download | gitlab-ce-ba4a2c546982b1b615be5ed9c8b96361de3f3545.tar.gz | |
Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
Diffstat (limited to 'app/models/project_services/kubernetes_service.rb')
| -rw-r--r-- | app/models/project_services/kubernetes_service.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index 9819e723fe8..f2e1c906dac 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -94,7 +94,12 @@ class KubernetesService < DeploymentService { key: 'KUBE_TOKEN', value: token, public: false }, { key: 'KUBE_NAMESPACE', value: namespace, public: true } ] - variables << { key: 'KUBE_CA_PEM', value: ca_pem, public: true } if ca_pem.present? + + if ca_pem.present? + variables << { key: 'KUBE_CA_PEM', value: ca_pem, public: true } + variables << { key: 'KUBE_CA_PEM_FILE', value: ca_pem, public: true, file: true } + end + variables end |