diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2018-10-23 23:52:34 +1300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-10-23 23:52:34 +1300 |
| commit | a5419138fd1dd766713a3754c8406133b3d9b99b (patch) | |
| tree | 563efbb8e705745f63148821e92e930bc4eb3286 /app | |
| parent | 170071e365040e6a802918f23f80f7850d1f4bb5 (diff) | |
| download | gitlab-ce-a5419138fd1dd766713a3754c8406133b3d9b99b.tar.gz | |
Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_client
This removes the ability to pass in a different version. We can instead
create a new entry in the SUPPORTED_API_GROUPS hash for a different
version if need be.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/clusters/platforms/kubernetes.rb | 3 | ||||
| -rw-r--r-- | app/models/project_services/kubernetes_service.rb | 3 | ||||
| -rw-r--r-- | app/services/clusters/gcp/finalize_creation_service.rb | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index fb11143d5a6..f0f791742f4 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -136,7 +136,7 @@ module Clusters Gitlab::NamespaceSanitizer.sanitize(slug) end - def build_kube_client!(api_version: 'v1') + def build_kube_client! raise "Incomplete settings" unless api_url && actual_namespace unless (username && password) || token @@ -145,7 +145,6 @@ module Clusters Gitlab::Kubernetes::KubeClient.new( api_url, - api_version, auth_options: kubeclient_auth_options, ssl_options: kubeclient_ssl_options, http_proxy_uri: ENV['http_proxy'] diff --git a/app/models/project_services/kubernetes_service.rb b/app/models/project_services/kubernetes_service.rb index 66b07aea1c2..798944d0c06 100644 --- a/app/models/project_services/kubernetes_service.rb +++ b/app/models/project_services/kubernetes_service.rb @@ -182,12 +182,11 @@ class KubernetesService < DeploymentService slug.gsub(/[^-a-z0-9]/, '-').gsub(/^-+/, '') end - def build_kube_client!(api_version: 'v1') + def build_kube_client! raise "Incomplete settings" unless api_url && actual_namespace && token Gitlab::Kubernetes::KubeClient.new( api_url, - api_version, auth_options: kubeclient_auth_options, ssl_options: kubeclient_ssl_options, http_proxy_uri: ENV['http_proxy'] diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb index 78b6a5cf7cb..6ee63db8eb9 100644 --- a/app/services/clusters/gcp/finalize_creation_service.rb +++ b/app/services/clusters/gcp/finalize_creation_service.rb @@ -64,12 +64,11 @@ module Clusters ) end - def build_kube_client!(api_url, ca_pem, username, password, api_version: 'v1') + def build_kube_client!(api_url, ca_pem, username, password) raise "Incomplete settings" unless api_url && username && password Gitlab::Kubernetes::KubeClient.new( api_url, - api_version, auth_options: { username: username, password: password }, ssl_options: kubeclient_ssl_options(ca_pem), http_proxy_uri: ENV['http_proxy'] |