merge master into release-1.0

Signed-off-by: pixiake <guofeng@yunify.com>
kubesphere · Sep 2, 2020 · ab0dc4a · ab0dc4a
2 parents f5e60cf + 77f63df
commit ab0dc4a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -68,14 +68,8 @@ There are three scenarios to use KubeKey.
 
 ### Get the Installer Excutable File
 
-* Download Binary
-
-    ```shell script
-    wget https://github.com/kubesphere/kubekey/releases/download/v1.0.0/kubekey-v1.0.0-linux-amd64.tar.gz
-    tar -zxvf kubekey-v1.0.0-linux-amd64.tar.gz
-    ```
-
-or
+* Binary downloads of the KubeKey can be found on the [Releases page](https://github.com/kubesphere/kubekey/releases).
+  Unpack the binary and you are good to go!
 
 * Build Binary from Source Code
 

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -68,14 +68,9 @@
 
 ### 获取安装程序可执行文件
 
-* 下载二进制文件
+* 下载KubeKey可执行文件 [Releases page](https://github.com/kubesphere/kubekey/releases) 
 
-    ```shell script
-    wget https://github.com/kubesphere/kubekey/releases/download/v1.0.0/kubekey-v1.0.0-linux-amd64.tar.gz
-    tar -zxvf kubekey-v1.0.0-linux-amd64.tar.gz
-    ```
-
-或者
+  下载解压后可直接使用。
 
 * 从源代码生成二进制文件
 

diff --git a/docs/glusterfs.yaml b/docs/glusterfs.yaml
@@ -24,11 +24,11 @@ parameters:
   resturl: SHOULD_BE_REPLACED
   # e.g. glusterfs_provisioner_clusterid: 6a6792ed25405eaa6302da99f2f5e24b
   clusterid: SHOULD_BE_REPLACED
-  restauthenabled: true
+  restauthenabled: "true"
   restuser: admin
   secretNamespace: "kube-system"
   secretName: heketi-secret
-  gidMin: 40000
-  gidMax: 50000
-  volumetype: replicate:2
+  gidMin: "40000"
+  gidMax: "50000"
+  volumetype: "replicate:2"
 allowVolumeExpansion: true
diff --git a/pkg/upgrade/kubernetes.go b/pkg/upgrade/kubernetes.go
@@ -52,7 +52,7 @@ func getCurrentVersion(mgr *manager.Manager, node *kubekeyapi.HostCfg) error {
 	mu.Unlock()
 
 	if node.IsMaster {
-		apiserverVersionStr, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"cat /etc/kubernetes/manifests/kube-apiserver.yaml | grep 'image:' | cut -d ':' -f 3\"", 3, false)
+		apiserverVersionStr, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"cat /etc/kubernetes/manifests/kube-apiserver.yaml | grep 'image:' | rev | cut -d ':' -f1 | rev\"", 3, false)
 		if err != nil {
 			return errors.Wrap(err, "Failed to get current kube-apiserver version")
 		}
@@ -101,7 +101,7 @@ func upgradeKubeMasters(mgr *manager.Manager, node *kubekeyapi.HostCfg) error {
 	if err != nil {
 		return errors.Wrap(err, "Failed to get current kubelet version")
 	}
-	kubeApiserverVersion, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"cat /etc/kubernetes/manifests/kube-apiserver.yaml | grep 'image:' | cut -d ':' -f 3\"", 3, false)
+	kubeApiserverVersion, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"cat /etc/kubernetes/manifests/kube-apiserver.yaml | grep 'image:' | rev | cut -d ':' -f1 | rev\"", 3, false)
 	if err != nil {
 		return errors.Wrap(err, "Failed to get current kubelet version")
 	}

diff --git a/pkg/upgrade/precheck.go b/pkg/upgrade/precheck.go
@@ -53,6 +53,14 @@ var versionCheck = map[string]map[string]map[string]bool{
 			"v2.1.1": true,
 		},
 	},
+	"other": {
+		"k8s": {
+			"v1.18": true,
+			"v1.17": true,
+			"v1.16": true,
+			"v1.15": true,
+		},
+	},
 }
 
 func GetClusterInfo(mgr *manager.Manager) error {
@@ -75,7 +83,7 @@ func getClusterInfo(mgr *manager.Manager, _ *kubekeyapi.HostCfg) error {
 		if err := getKubeConfig(mgr); err != nil {
 			return err
 		}
-		k8sVersionStr, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"cat /etc/kubernetes/manifests/kube-apiserver.yaml | grep 'image:' | cut -d ':' -f 3\"", 1, false)
+		k8sVersionStr, err := mgr.Runner.ExecuteCmd("sudo -E /bin/sh -c \"cat /etc/kubernetes/manifests/kube-apiserver.yaml | grep 'image:' | rev | cut -d ':' -f1 | rev\"", 1, false)
 		if err != nil {
 			return errors.Wrap(err, "Failed to get current kube-apiserver version")
 		}
@@ -84,6 +92,11 @@ func getClusterInfo(mgr *manager.Manager, _ *kubekeyapi.HostCfg) error {
 		if err != nil {
 			if mgr.Cluster.KubeSphere.Enabled {
 				return errors.New("Failed to get kubesphere version")
+			} else {
+				K8sTargetVersion := versionutil.MustParseSemantic(mgr.Cluster.Kubernetes.Version)
+				if _, ok := versionCheck["other"]["k8s"][fmt.Sprintf("v%v.%v", K8sTargetVersion.Major(), K8sTargetVersion.Minor())]; !ok {
+					return errors.New(fmt.Sprintf("does not support running on Kubernetes %s", fmt.Sprintf("v%v.%v", K8sTargetVersion.Major(), K8sTargetVersion.Minor())))
+				}
 			}
 		} else {
 			if mgr.Cluster.KubeSphere.Enabled {