Merge remote-tracking branch 'origin/master' into release-3.1

kubesphere · Apr 16, 2024 · 7a184f7 · 7a184f7
2 parents 54b5d7a + e43b507
commit 7a184f7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/cmd/kk/apis/kubekey/v1alpha2/default.go b/cmd/kk/apis/kubekey/v1alpha2/default.go
@@ -47,7 +47,7 @@ const (
 	DefaultRuncVersion             = "v1.1.12"
 	DefaultCrictlVersion           = "v1.29.0"
 	DefaultKubeVersion             = "v1.23.15"
-	DefaultCalicoVersion           = "v3.27.2"
+	DefaultCalicoVersion           = "v3.27.3"
 	DefaultFlannelVersion          = "v0.21.3"
 	DefaultFlannelCniPluginVersion = "v1.1.2"
 	DefaultCniVersion              = "v1.2.0"

diff --git a/cmd/kk/pkg/bootstrap/confirm/tasks.go b/cmd/kk/pkg/bootstrap/confirm/tasks.go
@@ -81,7 +81,7 @@ func (i *InstallationConfirm) Execute(runtime connector.Runtime) error {
 	table.OutputA(results)
 	reader := bufio.NewReader(os.Stdin)
 
-	if i.KubeConf.Arg.Artifact == "" {
+	if !i.KubeConf.Arg.InstallPackages {
 		for _, host := range results {
 			if host.Sudo == "" {
 				logger.Log.Errorf("%s: sudo is required.", host.Name)

diff --git a/cmd/kk/pkg/bootstrap/os/templates/init_script.go b/cmd/kk/pkg/bootstrap/os/templates/init_script.go
@@ -245,11 +245,14 @@ func GenerateHosts(runtime connector.ModuleRuntime, kubeConf *common.KubeConf) [
 				host.GetName(),
 				kubeConf.Cluster.Kubernetes.ClusterName,
 				host.GetName()))
-			hostsList = append(hostsList, fmt.Sprintf("%s  %s.%s %s",
-				host.GetInternalIPv6Address(),
-				host.GetName(),
-				kubeConf.Cluster.Kubernetes.ClusterName,
-				host.GetName()))
+
+			if host.GetInternalIPv6Address() != "" {
+				hostsList = append(hostsList, fmt.Sprintf("%s  %s.%s %s",
+					host.GetInternalIPv6Address(),
+					host.GetName(),
+					kubeConf.Cluster.Kubernetes.ClusterName,
+					host.GetName()))
+			}
 		}
 	}
 

diff --git a/version/components.json b/version/components.json
@@ -1049,12 +1049,14 @@
         "amd64": {
             "v3.23.2": "3784200cdfc0106c9987df2048d219bb91147f0cc3fa365b36279ac82ea37c7a",
             "v3.26.1": "c8f61c1c8e2504410adaff4a7255c65785fe7805eebfd63340ccd3c472aa42cf",
-            "v3.27.2": "692f69dc656e41cd35e23e24f56c98c4aeeb723fed129985b46f71e6eb5e1594"
+            "v3.27.2": "692f69dc656e41cd35e23e24f56c98c4aeeb723fed129985b46f71e6eb5e1594",
+            "v3.27.3": "e22b8bb41684f8ffb5143b50bf3b2ab76985604d774d397cfb6fb11d8a19f326"
         },
         "arm64": {
             "v3.23.2": "232b992e6767c68c8c832cc7027a0d9aacb29901a9b5e8871e25baedbbb9c64c",
             "v3.26.1": "bba2fbdd6d2998bca144ae12c2675d65c4fbf51c0944d69b1b2f20e08cd14c22",
-            "v3.27.2": "0fd1f65a511338cf9940835987d420c94ab95b5386288ba9673b736a4d347463"
+            "v3.27.2": "0fd1f65a511338cf9940835987d420c94ab95b5386288ba9673b736a4d347463",
+            "v3.27.3": "1fc5f58a18d8b1c487b4663fc5cbe23b45bd9d31617debd309f6dfac7c11a8ef"
         }
     }
 }