resolve merge conflict due to rebase-needed
parent
b1e785c40b
commit
d45ff8f1ea
|
@ -605,7 +605,6 @@ func generateNewConfigFromFlags(cmd *cobra.Command, k8sVersion string, rtime str
|
|||
CNI: getCNIConfig(cmd),
|
||||
},
|
||||
MultiNodeRequested: viper.GetInt(nodes) > 1 || viper.GetBool(ha),
|
||||
AutoPauseInterval: viper.GetDuration(autoPauseInterval),
|
||||
GPUs: viper.GetString(gpus),
|
||||
}
|
||||
cc.VerifyComponents = interpretWaitFlag(*cmd)
|
||||
|
|
Loading…
Reference in New Issue