From a2e63ea3043d95da4d38696df102262b69e44dd5 Mon Sep 17 00:00:00 2001 From: cuisongliu Date: Mon, 25 Jul 2022 19:26:26 +0800 Subject: [PATCH] feature(main): single module kubernetes cluster (#1396) Signed-off-by: cuisongliu --- cmd/sealos/cmd/run.go | 12 ++++++++++-- pkg/utils/iputils/iputils_v2.go | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/cmd/sealos/cmd/run.go b/cmd/sealos/cmd/run.go index 8a1e26d36..187b877e5 100644 --- a/cmd/sealos/cmd/run.go +++ b/cmd/sealos/cmd/run.go @@ -15,9 +15,9 @@ package cmd import ( - "github.com/spf13/cobra" - + "github.com/labring/sealos/pkg/utils/iputils" "github.com/labring/sealos/pkg/utils/logger" + "github.com/spf13/cobra" "github.com/labring/sealos/pkg/apply" "github.com/labring/sealos/pkg/apply/processor" @@ -55,12 +55,15 @@ create cluster to your baremetal server, appoint the iplist: Different InfraSSH port numbers exist： sealos run labring/kubernetes:v1.24.0 --masters 192.168.0.2,192.168.0.3:23,192.168.0.4:24 \ --nodes 192.168.0.5:25,192.168.0.6:25,192.168.0.7:27 --passwd xxx + Single kubernetes cluster： + sealos run labring/kubernetes:v1.24.0 --single create a cluster with custom environment variables: sealos run -e DashBoardPort=8443 mydashboard:latest --masters 192.168.0.2,192.168.0.3,192.168.0.4 \ --nodes 192.168.0.5,192.168.0.6,192.168.0.7 --passwd xxx ` var runArgs apply.RunArgs +var runSingle bool func newRunCmd() *cobra.Command { var runCmd = &cobra.Command{ @@ -69,6 +72,10 @@ func newRunCmd() *cobra.Command { Long: `sealos run labring/kubernetes:v1.24.0 --masters [arg] --nodes [arg]`, Example: exampleRun, RunE: func(cmd *cobra.Command, args []string) error { + if runSingle { + addr, _ := iputils.ListLocalHostAddrs() + runArgs.Masters = iputils.LocalIP(addr) + } applier, err := apply.NewApplierFromArgs(args, &runArgs) if err != nil { return err @@ -88,6 +95,7 @@ func newRunCmd() *cobra.Command { runCmd.Flags().StringVar(&runArgs.PkPassword, "pk-passwd", "", "set baremetal server private key password") runCmd.Flags().StringSliceVar(&runArgs.CustomCMD, "cmd", []string{}, "set cmd for image cmd instruction") runCmd.Flags().StringSliceVarP(&runArgs.CustomEnv, "env", "e", []string{}, "set custom environment variables") + runCmd.Flags().BoolVar(&runSingle, "single", false, "run cluster in single mode") runCmd.Flags().BoolVarP(&processor.ForceOverride, "force", "f", false, "we also can input an --force flag to run app in this cluster by force") runCmd.Flags().StringVar(&runArgs.ClusterName, "name", "default", "set cluster name variables") return runCmd diff --git a/pkg/utils/iputils/iputils_v2.go b/pkg/utils/iputils/iputils_v2.go index 8f6b6eadf..3c9f733e1 100644 --- a/pkg/utils/iputils/iputils_v2.go +++ b/pkg/utils/iputils/iputils_v2.go @@ -128,6 +128,15 @@ func IsLocalIP(ip string, addrs *[]net.Addr) bool { return false } +func LocalIP(addrs *[]net.Addr) string { + for _, address := range *addrs { + if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() && ipnet.IP.To4() != nil { + return ipnet.IP.String() + } + } + return "" +} + func AssemblyIPList(args *string) error { var result string var ips = strings.Split(*args, "-")