Skip to content

Commit

Permalink
fix: return converted component configs (#4121) (#4126)
Browse files Browse the repository at this point in the history
  • Loading branch information
sealos-ci-robot committed Oct 20, 2023
1 parent 0de99c5 commit fa88777
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions pkg/runtime/kubernetes/types/kubeadm_config.go
Expand Up @@ -50,8 +50,17 @@ func NewKubeadmConfig() *KubeadmConfig {
}

func (k *KubeadmConfig) GetComponents() []any {
converted, err := k.ToConvertedKubeadmConfig()
if err != nil {
logger.Error("failed to convert kubeadmConfig: %v", err)
return nil
}
return []any{
k.InitConfiguration, k.ClusterConfiguration, k.JoinConfiguration, k.KubeProxyConfiguration, k.KubeletConfiguration,
converted.InitConfiguration,
converted.ClusterConfiguration,
converted.JoinConfiguration,
converted.KubeProxyConfiguration,
converted.KubeletConfiguration,
}
}

Expand Down Expand Up @@ -146,8 +155,7 @@ func (k *KubeadmConfig) ToConvertedKubeadmConfig() (*ConvertedKubeadmConfig, err
conversion.InitConfiguration = v1beta2InitConfiguration
conversion.ClusterConfiguration = v1beta2ClusterConfiguration
conversion.JoinConfiguration = v1beta2JoinConfiguration

case KubeadmV1beta3:
case KubeadmV1beta3, "": // defaults to v1beta3
var v1beta3InitConfiguration v1beta3.InitConfiguration
var v1beta3ClusterConfiguration v1beta3.ClusterConfiguration
var v1beta3JoinConfiguration v1beta3.JoinConfiguration
Expand All @@ -169,7 +177,7 @@ func (k *KubeadmConfig) ToConvertedKubeadmConfig() (*ConvertedKubeadmConfig, err
conversion.InitConfiguration = v1beta3InitConfiguration
conversion.ClusterConfiguration = v1beta3ClusterConfiguration
conversion.JoinConfiguration = v1beta3JoinConfiguration
default:
default: // unknown version
conversion.JoinConfiguration = k.JoinConfiguration
conversion.InitConfiguration = k.InitConfiguration
conversion.ClusterConfiguration = k.ClusterConfiguration
Expand Down

0 comments on commit fa88777

Please sign in to comment.