diff options
author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 13:15:18 +0300 |
---|---|---|
committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-03-14 13:22:16 +0300 |
commit | 33d459aa8da57b701fb3368b40fd10ec98c2e5f4 (patch) | |
tree | 35a24412baf05864f9870846b4e236ea7364ba17 /app/models/project_services | |
parent | 1d57db0d8d9ed0515fb1839e963550a60d86cb70 (diff) |
DRY remaining instances of predefined variables
Diffstat (limited to 'app/models/project_services')
-rw-r--r-- | app/models/project_services/kubernetes_service.rb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index 347c9f34033..b4cd1c1a155 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -105,14 +105,18 @@ class KubernetesService < DeploymentService def predefined_variables config = YAML.dump(kubeconfig) - Gitlab::Ci::Variables::Collection.new.tap do |collection| - collection.append(key: 'KUBE_URL', value: api_url, public: true) - collection.append(key: 'KUBE_TOKEN', value: token, public: false) - collection.append(key: 'KUBE_NAMESPACE', value: actual_namespace, public: true) - collection.append(key: 'KUBECONFIG', value: config, public: false, file: true) - - collection.append(key: 'KUBE_CA_PEM', value: ca_pem, public: true) - collection.append(key: 'KUBE_CA_PEM_FILE', value: ca_pem, public: true, file: true) + Gitlab::Ci::Variables::Collection.new.tap do |variables| + variables + .append(key: 'KUBE_URL', value: api_url) + .append(key: 'KUBE_TOKEN', value: token, public: false) + .append(key: 'KUBE_NAMESPACE', value: actual_namespace) + .append(key: 'KUBECONFIG', value: config, public: false, file: true) + + if ca_pem.present? + variables + .append(key: 'KUBE_CA_PEM', value: ca_pem) + .append(key: 'KUBE_CA_PEM_FILE', value: ca_pem, file: true) + end end end |