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
This commit is contained in:
commit
7834f63c07
|
@ -30,10 +30,10 @@ module Clusters
|
|||
ca_cert: Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate),
|
||||
username: gke_cluster.master_auth.username,
|
||||
password: gke_cluster.master_auth.password,
|
||||
token: request_kuberenetes_token)
|
||||
token: request_kubernetes_token)
|
||||
end
|
||||
|
||||
def request_kuberenetes_token
|
||||
def request_kubernetes_token
|
||||
Ci::FetchKubernetesTokenService.new(
|
||||
'https://' + gke_cluster.endpoint,
|
||||
Base64.decode64(gke_cluster.master_auth.cluster_ca_certificate),
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Enable Legacy Authorization by default on Cluster creations
|
||||
merge_request: 17302
|
||||
author:
|
||||
type: fixed
|
|
@ -76,9 +76,13 @@ module GoogleApi
|
|||
"initial_node_count": cluster_size,
|
||||
"node_config": {
|
||||
"machine_type": machine_type
|
||||
},
|
||||
"legacy_abac": {
|
||||
"enabled": true
|
||||
}
|
||||
}
|
||||
} )
|
||||
}
|
||||
)
|
||||
|
||||
service.create_cluster(project_id, zone, request_body, options: user_agent_header)
|
||||
end
|
||||
|
|
|
@ -115,6 +115,9 @@ describe GoogleApi::CloudPlatform::Client do
|
|||
"initial_node_count": cluster_size,
|
||||
"node_config": {
|
||||
"machine_type": machine_type
|
||||
},
|
||||
"legacy_abac": {
|
||||
"enabled": true
|
||||
}
|
||||
}
|
||||
} )
|
||||
|
|
Loading…
Reference in New Issue