diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-12-05 09:13:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-12-05 09:13:12 +0000 |
| commit | a4ff91f794b62b731a4428b41f0f9346a5b9dfa0 (patch) | |
| tree | da85956f2f58fce82545a7d0e1a64289e81c620a /app/models/clusters/platforms | |
| parent | 2cd710732e6b2b6d31b4fd01a6d065c33db066b3 (diff) | |
| parent | ac5c20bd272ff9001eae5949ca2137abc1011b87 (diff) | |
| download | gitlab-ce-a4ff91f794b62b731a4428b41f0f9346a5b9dfa0.tar.gz | |
Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master'
Make KUBECONFIG nil if KUBE_TOKEN is nil
See merge request gitlab-org/gitlab-ce!23414
Diffstat (limited to 'app/models/clusters/platforms')
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index dc8b52105cc..867f0edcb07 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -90,13 +90,11 @@ module Clusters # Clusters::KubernetesNamespace, so once migration has been completed, # this 'else' branch will be removed. For more information, please see # https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22433 - config = YAML.dump(kubeconfig) - 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) + .append(key: 'KUBECONFIG', value: kubeconfig, public: false, file: true) end end end |