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: CSIStorageCapacity cause the cluster to fail to start normally 

Signed-off-by: pixiake <guofeng@yunify.com>
This commit is contained in:
pixiake 2022-02-18 14:54:38 +08:00
parent b643854b14
commit 81dec49fca
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubernetes/templates/v1beta2/kubeadm_config.go
View File

@ -18,6 +18,7 @@ package v1beta2
import (
"fmt"
versionutil "k8s.io/apimachinery/pkg/util/version"
"regexp"
"strings"
"text/template"
@ -155,6 +156,11 @@ var (
)
func UpdateFeatureGatesConfiguration(args map[string]string, kubeConf *common.KubeConf) map[string]string {
// When kubernetes version is less than 1.21,`CSIStorageCapacity` should not be set.
cmp, _ := versionutil.MustParseSemantic(kubeConf.Cluster.Kubernetes.Version).Compare("v1.21.0")
if cmp == -1 {
delete(FeatureGatesDefaultConfiguration, "CSIStorageCapacity")
}
var featureGates []string
@ -174,6 +180,12 @@ func UpdateFeatureGatesConfiguration(args map[string]string, kubeConf *common.Ku
}
func GetKubeletConfiguration(runtime connector.Runtime, kubeConf *common.KubeConf, criSock string) map[string]interface{} {
// When kubernetes version is less than 1.21,`CSIStorageCapacity` should not be set.
cmp, _ := versionutil.MustParseSemantic(kubeConf.Cluster.Kubernetes.Version).Compare("v1.21.0")
if cmp == -1 {
delete(FeatureGatesDefaultConfiguration, "CSIStorageCapacity")
}
defaultKubeletConfiguration := map[string]interface{}{
"clusterDomain": kubeConf.Cluster.Kubernetes.DNSDomain,
"clusterDNS": []string{kubeConf.Cluster.ClusterDNS()},