mirror of https://github.com/knative/pkg.git
Moved cluster name check to later so --get can use cluster name in kubeconfig (#918)
This commit is contained in:
parent
891c2876dd
commit
c259ed6f2e
|
|
@ -91,14 +91,6 @@ func (gs *GKEClient) Setup(r GKERequest) ClusterOperations {
|
|||
gc.NeedsCleanup = true
|
||||
}
|
||||
|
||||
if r.ClusterName == "" {
|
||||
var err error
|
||||
r.ClusterName, err = getResourceName(ClusterResource)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed getting cluster name: '%v'", err)
|
||||
}
|
||||
}
|
||||
|
||||
if r.MinNodes == 0 {
|
||||
r.MinNodes = DefaultGKEMinNodes
|
||||
}
|
||||
|
|
@ -192,6 +184,14 @@ func (gc *GKECluster) Acquire() error {
|
|||
request := gc.Request.DeepCopy()
|
||||
// We are going to use request for creating cluster, set its Project
|
||||
request.Project = gc.Project
|
||||
// Set the cluster name if it doesn't exist
|
||||
if request.ClusterName == "" {
|
||||
var err error
|
||||
request.ClusterName, err = getResourceName(ClusterResource)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed getting cluster name: '%v'", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Combine Region with BackupRegions, these will be the regions used for
|
||||
// retrying creation logic
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue