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

bugfix : fix --with-kubernetes not affect (#2759) 

bugfix : fix --with-kubernetes config not effect



bugfix : fix --with-kubernetes config not effect

Signed-off-by: xuesongzuo@yunify.com <xuesongzuo@yunify.com>
This commit is contained in:
zuoxuesong-worker 2025-09-11 14:47:39 +08:00 committed by GitHub
parent 32aba628e9
commit a86f7fc33c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,8 +102,8 @@ 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 _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kube_version"); err != nil {
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kubernetes", "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kubernetes", "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}

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

@ -95,8 +95,8 @@ func (o *CreateClusterOptions) Complete(cmd *cobra.Command, args []string) (*kkc
}
func (o *CreateClusterOptions) completeConfig() error {
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 {
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kubernetes", "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kubernetes", "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}

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

@ -103,8 +103,8 @@ func (o *DeleteClusterOptions) Complete(cmd *cobra.Command, args []string) (*kkc
// completeConfig updates the configuration with container manager settings
func (o *DeleteClusterOptions) completeConfig() error {
// If kube_version is not set in config, set it to the specified Kubernetes 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 {
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kubernetes", "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kubernetes", "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}
@ -184,8 +184,8 @@ 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 kube_version is not set in config, set it to the specified Kubernetes 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 {
if _, ok, _ := unstructured.NestedFieldNoCopy(o.CommonOptions.Config.Value(), "kubernetes", "kube_version"); !ok {
if err := unstructured.SetNestedField(o.CommonOptions.Config.Value(), o.Kubernetes, "kubernetes", "kube_version"); err != nil {
return errors.Wrapf(err, "failed to set %q to config", "kube_version")
}
}