diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-06-16 22:15:40 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-06-16 22:15:40 +0800 |
commit | 07a65da1d96a71474f6997aed95bac6290d81a42 (patch) | |
tree | eb45df72c20e76d087a0ee4fe8e1bbbe7efb19c9 /app/models | |
parent | bcb7d88504f4f99a4e359730f342e1a88392508a (diff) | |
download | gitlab-ce-07a65da1d96a71474f6997aed95bac6290d81a42.tar.gz |
Generate KUBECONFIG in KubernetesService#predefined_variables
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/project_services/kubernetes_service.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index 48e7802c557..f1b321139d3 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -96,10 +96,14 @@ class KubernetesService < DeploymentService end def predefined_variables + config = YAML.dump(kubeconfig) + variables = [ { key: 'KUBE_URL', value: api_url, public: true }, { key: 'KUBE_TOKEN', value: token, public: false }, - { key: 'KUBE_NAMESPACE', value: actual_namespace, public: true } + { key: 'KUBE_NAMESPACE', value: actual_namespace, public: true }, + { key: 'KUBECONFIG', value: config, public: false }, + { key: 'KUBECONFIG_FILE', value: config, public: false, file: true }, ] if ca_pem.present? @@ -135,6 +139,14 @@ class KubernetesService < DeploymentService private + def kubeconfig + to_kubeconfig( + url: api_url, + namespace: actual_namespace, + token: token, + ca_pem: ca_pem) + end + def namespace_placeholder default_namespace || TEMPLATE_PLACEHOLDER end |