Merge pull request #7 from beclab/feat/apps

feat: integrate installation shell scripts into the installer cli

.github/workflows/release.yaml

@@ -23,14 +23,6 @@ jobs:
         with:
           fallback: latest
 
-      - name: Setup Node
-        uses: actions/setup-node@v1
-        with:
-          node-version: "18"
-
-      - name: Build
-        run: cd frontend;npm install;npm i -g @quasar/cli;quasar build;rm -rf ./package-lock.json;
-
       - name: Set up Go
         uses: actions/setup-go@v3
         with:

.goreleaser.yaml

@@ -30,17 +30,7 @@ archives:
       linux: linux
       amd64: amd64
       arm: arm64
-    files:
-      - none*
 checksum:
   name_template: "checksums.txt"
 changelog:
   skip: true
-  sort: asc
-  filters:
-    exclude:
-      - "^docs:"
-      - "^test:"
-release:
-  prerelease: true
-  draft: false

apis/kubekey/v1alpha2/default.go

@@ -115,12 +115,12 @@ const (
 	DefaultKubeVipMode = "ARP"
 )
 
-func (cfg *ClusterSpec) SetDefaultClusterSpec(incluster bool, minikube bool) (*ClusterSpec, map[string][]*KubeHost) {
+func (cfg *ClusterSpec) SetDefaultClusterSpec(incluster bool, macos bool) (*ClusterSpec, map[string][]*KubeHost) {
 	clusterCfg := ClusterSpec{}
 
 	clusterCfg.Hosts = SetDefaultHostsCfg(cfg)
 	clusterCfg.RoleGroups = cfg.RoleGroups
-	clusterCfg.Etcd = SetDefaultEtcdCfg(cfg, minikube)
+	clusterCfg.Etcd = SetDefaultEtcdCfg(cfg, macos)
 	roleGroups := clusterCfg.GroupHosts()
 	clusterCfg.ControlPlaneEndpoint = SetDefaultLBCfg(cfg, roleGroups[Master], incluster)
 	clusterCfg.Network = SetDefaultNetworkCfg(cfg)
@@ -339,8 +339,8 @@ func SetDefaultClusterCfg(cfg *ClusterSpec) Kubernetes {
 	return defaultClusterCfg
 }
 
-func SetDefaultEtcdCfg(cfg *ClusterSpec, minikube bool) EtcdCluster {
-	if minikube {
+func SetDefaultEtcdCfg(cfg *ClusterSpec, macos bool) EtcdCluster {
+	if macos {
 		cfg.Etcd.Type = MiniKube
 	} else if cfg.Etcd.Type == "" || ((cfg.Kubernetes.Type == "k3s" || (len(strings.Split(cfg.Kubernetes.Version, "-")) > 1) && strings.Split(cfg.Kubernetes.Version, "-")[1] == "k3s") && cfg.Etcd.Type == Kubeadm) {
 		cfg.Etcd.Type = KubeKey

cmd/ctl/info/main.go

@@ -3,7 +3,7 @@ package info
 import (
 	"fmt"
 
-	"bytetrade.io/web3os/installer/pkg/constants"
+	"bytetrade.io/web3os/installer/pkg/core/connector"
 	"github.com/spf13/cobra"
 )
 
@@ -24,13 +24,15 @@ func showInfoCommand() *cobra.Command {
 		Short: "Print os information",
 		Long:  "help for printing os info",
 		Run: func(cmd *cobra.Command, args []string) {
+			systemInfo := connector.GetSystemInfo()
+			host := systemInfo.HostInfo
 			fmt.Printf(`OS_TYPE=%s
 OS_PLATFORM=%s
 OS_ARCH=%s
 OS_VERSION=%s
 OS_KERNEL=%s
 OS_INFO=%s
-`, constants.OsType, constants.OsPlatform, constants.OsArch, constants.OsVersion, constants.OsKernel, constants.OsInfo)
+`, host.OsType, host.OsPlatformFamily, host.OsArch, host.OsVersion, host.OsKernel, host.OsInfo)
 		},
 	}
 	return cmd