Commit 7834f63c authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' into 'master'

Enable "Legacy Authorization" by default when creating a Cluster on GCP

Closes #41619

See merge request gitlab-org/gitlab-ce!17302
parents e037854a 14978ddc
...@@ -30,10 +30,10 @@ module Clusters ...@@ -30,10 +30,10 @@ module Clusters
ca_cert: Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate), ca_cert: Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate),
username: gke_cluster.master_auth.username, username: gke_cluster.master_auth.username,
password: gke_cluster.master_auth.password, password: gke_cluster.master_auth.password,
token: request_kuberenetes_token) token: request_kubernetes_token)
end end
def request_kuberenetes_token def request_kubernetes_token
Ci::FetchKubernetesTokenService.new( Ci::FetchKubernetesTokenService.new(
'https://' + gke_cluster.endpoint, 'https://' + gke_cluster.endpoint,
Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate), Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate),
......
---
title: Enable Legacy Authorization by default on Cluster creations
merge_request: 17302
author:
type: fixed
...@@ -76,9 +76,13 @@ module GoogleApi ...@@ -76,9 +76,13 @@ module GoogleApi
"initial_node_count": cluster_size, "initial_node_count": cluster_size,
"node_config": { "node_config": {
"machine_type": machine_type "machine_type": machine_type
},
"legacy_abac": {
"enabled": true
} }
} }
} ) }
)
service.create_cluster(project_id, zone, request_body, options: user_agent_header) service.create_cluster(project_id, zone, request_body, options: user_agent_header)
end end
......
...@@ -115,6 +115,9 @@ describe GoogleApi::CloudPlatform::Client do ...@@ -115,6 +115,9 @@ describe GoogleApi::CloudPlatform::Client do
"initial_node_count": cluster_size, "initial_node_count": cluster_size,
"node_config": { "node_config": {
"machine_type": machine_type "machine_type": machine_type
},
"legacy_abac": {
"enabled": true
} }
} }
} ) } )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment