ensure override with --kubernetes-version is respected

pull/17909/head
Predrag Rogic 2024-01-13 16:35:39 +00:00
parent a26ebbf18a
commit fb7ae16d9f
No known key found for this signature in database
GPG Key ID: F1FF5748C4855229
2 changed files with 4 additions and 3 deletions

View File

@ -334,8 +334,9 @@ func provisionWithDriver(cmd *cobra.Command, ds registry.DriverState, existing *
rtime := getContainerRuntime(existing)
cc, n, err := generateClusterConfig(cmd, existing, k8sVersion, rtime, driverName)
if err != nil {
return node.Starter{}, errors.Wrap(err, "Failed to generate config")
return node.Starter{}, errors.Wrap(err, "Failed to generate cluster config")
}
klog.Infof("cluster config:\n%+v", cc)
if firewall.IsBootpdBlocked(cc) {
if err := firewall.UnblockBootpd(); err != nil {
@ -1699,6 +1700,8 @@ func configureNodes(cc config.ClusterConfig, existing *config.ClusterConfig) (co
if err != nil {
return cc, config.Node{}, errors.Wrapf(err, "failed getting control-plane node")
}
pcp.KubernetesVersion = kv
pcp.ContainerRuntime = cr
return cc, pcp, nil
}

View File

@ -319,8 +319,6 @@ func generateClusterConfig(cmd *cobra.Command, existing *config.ClusterConfig, k
}
}
klog.Infof("config:\n%+v", cc)
r, err := cruntime.New(cruntime.Config{Type: cc.KubernetesConfig.ContainerRuntime})
if err != nil {
return cc, config.Node{}, errors.Wrap(err, "new runtime manager")