15308555518/ kubekey
1
0
Fork 0
mirror of https://github.com/kubesphere/kubekey.git synced 2025-12-26 01:22:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Only set the kube_version if it is not already defined in the config file. (#2608) 

Signed-off-by: joyceliu <joyceliu@yunify.com>
This commit is contained in:
liujian 2025-06-11 17:11:26 +08:00 committed by GitHub
parent c7a42e53a1
commit cfb83de1db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kk/app/options/builtin/add.go
View File

@ -106,8 +106,10 @@ func (o *AddNodeOptions) Complete(cmd *cobra.Command, args []string) (*kkcorev1.
// complete updates the configuration with container manager and kubernetes version settings
func (o *AddNodeOptions) complete() error {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}
var addNodes []string

7
cmd/kk/app/options/builtin/create.go
View File

@ -101,9 +101,10 @@ func (o *CreateClusterOptions) Complete(cmd *cobra.Command, args []string) (*kkc
}
func (o *CreateClusterOptions) completeConfig() error {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}
return nil

12
cmd/kk/app/options/builtin/delete.go
View File

@ -104,8 +104,10 @@ func (o *DeleteClusterOptions) Complete(cmd *cobra.Command, args []string) (*kkc
// completeConfig updates the configuration with container manager settings
func (o *DeleteClusterOptions) completeConfig() error {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}
return nil
@ -184,8 +186,10 @@ func (o *DeleteNodesOptions) Complete(cmd *cobra.Command, args []string) (*kkcor
// completeConfig updates the configuration with container manager settings
func (o *DeleteNodesOptions) completeConfig(nodes []string) error {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}
if err := unstructured.SetNestedStringSlice(o.CommonOptions.Config.Value(), nodes, "delete_nodes"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "delete_nodes")