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

support kubesphere release version 

Signed-off-by: pixiake <guofeng@yunify.com>
This commit is contained in:
pixiake 2021-10-29 11:15:57 +08:00
parent 9c5bd42316
commit f7cefcca6a
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cluster.go
View File

@ -47,7 +47,7 @@ func init() {
clusterCmd.Flags().StringVarP(&opt.ClusterCfgFile, "filename", "f", "", "Path to a configuration file")
clusterCmd.Flags().StringVarP(&opt.Kubernetes, "with-kubernetes", "", v1alpha1.DefaultKubeVersion, "Specify a supported version of kubernetes")
clusterCmd.Flags().BoolVarP(&opt.LocalStorage, "with-local-storage", "", false, "Deploy a local PV provisioner")
clusterCmd.Flags().BoolVarP(&opt.Kubesphere, "with-kubesphere", "", false, "Deploy a specific version of kubesphere (default v3.1.0)")
clusterCmd.Flags().BoolVarP(&opt.Kubesphere, "with-kubesphere", "", false, "Deploy a specific version of kubesphere (default v3.2.0)")
clusterCmd.Flags().BoolVarP(&opt.SkipCheck, "yes", "y", false, "Skip pre-check of the installation")
clusterCmd.Flags().BoolVarP(&opt.SkipPullImages, "skip-pull-images", "", false, "Skip pre pull images")
clusterCmd.Flags().StringVarP(&opt.ContainerManager, "container-manager", "", "docker", "Container runtime: docker, crio, containerd and isula.")

2
pkg/cluster/upgrade/precheck.go
View File

@ -176,7 +176,7 @@ func getClusterInfo(mgr *manager.Manager, _ *kubekeyapiv1alpha1.HostCfg) error {
} else {
if mgr.Cluster.KubeSphere.Enabled {
var version string
if strings.Contains(mgr.Cluster.KubeSphere.Version, "latest") || strings.Contains(mgr.Cluster.KubeSphere.Version, "nightly") {
if strings.Contains(mgr.Cluster.KubeSphere.Version, "latest") || strings.Contains(mgr.Cluster.KubeSphere.Version, "nightly") || strings.Contains(mgr.Cluster.KubeSphere.Version, "release") {
version = "v3.2.0"
} else {
r := regexp.MustCompile("v(\\d+\\.)?(\\d+\\.)?(\\*|\\d+)")

2
pkg/config/generate.go
View File

@ -130,7 +130,7 @@ func GenerateClusterObj(k8sVersion, ksVersion, name, kubeconfig, clusterCfgPath
case "v2.1.1":
opt.KubeSphereConfigMap = kubesphere.V2_1_1
default:
if strings.Contains(ksVersion, "alpha") || strings.Contains(ksVersion, "rc") {
if strings.Contains(ksVersion, "alpha") || strings.Contains(ksVersion, "rc") || strings.Contains(ksVersion, "release") {
opt.KubeSphereConfigMap = kubesphere.GenerateAlphaYaml(ksVersion)
} else {
return errors.New(fmt.Sprintf("Unsupported version: %s", strings.TrimSpace(ksVersion)))

8
pkg/config/parse.go
View File

@ -125,7 +125,7 @@ func ParseCfg(clusterCfgPath, k8sVersion, ksVersion string, ksEnabled bool) (*ku
clusterCfg.Spec.KubeSphere.Version = "v2.1.1"
default:
if strings.Contains(labels["version"].(string), "alpha") ||
strings.Contains(labels["version"].(string), "rc") {
strings.Contains(labels["version"].(string), "rc") || strings.Contains(labels["version"].(string), "release") {
clusterCfg.Spec.KubeSphere.Configurations = "---\n" + string(content)
clusterCfg.Spec.KubeSphere.Version = labels["version"].(string)
} else {
@ -159,7 +159,8 @@ func ParseCfg(clusterCfgPath, k8sVersion, ksVersion string, ksEnabled bool) (*ku
if strings.HasPrefix(ksVersion, "nightly-") ||
ksVersion == "latest" ||
strings.Contains(ksVersion, "alpha") ||
strings.Contains(ksVersion, "rc") {
strings.Contains(ksVersion, "rc") ||
strings.Contains(ksVersion, "release") {
// this is not the perfect solution here, but it's not necessary to track down the exact version between the
// nightly build and a released. So please keep update it with the latest release here.
clusterCfg.Spec.KubeSphere.Version = ksVersion
@ -251,7 +252,8 @@ func AllinoneCfg(user *user.User, k8sVersion, ksVersion string, ksEnabled bool,
if strings.HasPrefix(ksVersion, "nightly-") ||
ksVersion == "latest" ||
strings.Contains(ksVersion, "alpha") ||
strings.Contains(ksVersion, "rc") {
strings.Contains(ksVersion, "rc") ||
strings.Contains(ksVersion, "release") {
// this is not the perfect solution here, but it's not necessary to track down the exact version between the
// nightly build and a released. So please keep update it with the latest release here.
allinoneCfg.Spec.KubeSphere.Version = ksVersion

3
pkg/kubesphere/kubesphere.go
View File

@ -118,7 +118,8 @@ EOF
default:
if strings.HasPrefix(ksVersion, "nightly-") ||
strings.Contains(ksVersion, "alpha") ||
strings.Contains(ksVersion, "rc") {
strings.Contains(ksVersion, "rc") ||
strings.Contains(ksVersion, "release") {
if err := generateKubeSphereManifests(mgr, ksVersion); err != nil {
return err
}

3
pkg/kubesphere/manifests.go
View File

@ -900,7 +900,8 @@ func GenerateKubeSphereYaml(repo, version string) (string, error) {
if strings.Contains(version, "latest") ||
strings.HasPrefix(version, "nightly-") ||
strings.Contains(version, "alpha") ||
strings.Contains(version, "rc") {
strings.Contains(version, "rc") ||
strings.Contains(version, "release") {
repo = "kubespheredev"
} else {
repo = "kubesphere"