[pull] main from labring:main (#302)

* Update go1.18 to support workspace (labring#1350)

* Update go1.18 to support workspace

Signed-off-by: zzjin <[email protected]>

* fix linter vendor

Signed-off-by: zzjin <[email protected]>

* update develop guide about workspace. (labring#1352)

Signed-off-by: zzjin <[email protected]>

* refactor: clean flag of lvscare (labring#1354)

* refactor: clean flag of lvscare

Signed-off-by: fengxsong <[email protected]>

* fix: ci lints

Signed-off-by: fengxsong <[email protected]>

* docs: remove badges for lvscare (labring#1358)

Signed-off-by: Mercurio <[email protected]>

* ci: fix sync_code trigger paths (labring#1360)

Signed-off-by: Mercurio <[email protected]>

* fix(main): delete logger for isLocal (labring#1359)

Signed-off-by: cuisongliu <[email protected]>

* fix(main): sync is exists (labring#1361)

Signed-off-by: cuisongliu <[email protected]>

* add & init sealos desktop frontend project (labring#1357)

* init frontend project

* impl part of  dashboard page layout

* logger support fulltext color (labring#1362)

* support service modules: auth (labring#1347)

1. add first auth service
2. update workspace to support service/auth
3. move soem code to auth pkg and auth service

Signed-off-by: zzjin <[email protected]>

* feature(main): local ip not ping (labring#1363)

Signed-off-by: cuisongliu <[email protected]>

* feat: auto create dummy link if needed (labring#1367)

* feat: auto create dummy link if needed

Signed-off-by: fengxsong <[email protected]>

* fix: make iface arg defaults to empty

Signed-off-by: fengxsong <[email protected]>

* fix(main): unexpected end of file (labring#1372)

* update pull request template to supress showing (labring#1371)

Signed-off-by: zzjin <[email protected]>

* perf: singleton just fine (labring#1374)

Signed-off-by: fengxsong <[email protected]>

Co-authored-by: zzjin <[email protected]>
Co-authored-by: fengxsong <[email protected]>
Co-authored-by: Mercurio <[email protected]>
Co-authored-by: cuisongliu <[email protected]>
Co-authored-by: 马斯洛 <[email protected]>
Co-authored-by: xuehaipeng <[email protected]>

Author: 7 people

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.238.1/containers/go/.devcontainer/base.Dockerfile
 
 # [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.16, 1.17, 1-bullseye, 1.16-bullseye, 1.17-bullseye, 1-buster, 1.16-buster, 1.17-buster
-ARG VARIANT="1.18-bullseye"
+ARG VARIANT="1-bullseye"
 FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
 
 # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,6 @@
-// If you are developing a feature, please provide documentation, 
-// if you are solving a bug, please associate the corresponding issue
-// Please standardize the title and introduction information of the PR, 
-// because it will be placed in the release note
+<!-- 
+If you are developing a feature, please provide documentation.
+If you are solving a bug, please associate the corresponding issue.
+Please standardize the title and introduction information of the PR, 
+because it will be placed in the release note
+-->

.github/workflows/ci.yml

@@ -2,11 +2,11 @@ name: CI
 
 env:
   # Common versions
-  GO_VERSION: "1.17"
+  GO_VERSION: "1.18"
 
 on:
   push:
-    branches: main
+    branches: ["main"]
     paths-ignore:
       - "docs/**"
       - "**/*.md"

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 
 env:
   # Common versions
-  GO_VERSION: "1.17"
+  GO_VERSION: "1.18"
 
 on:
   workflow_dispatch:

.github/workflows/sync_code.yml

@@ -4,7 +4,7 @@ on:
     branches:
       - main
     paths:
-      - staging/src/github.com/labring
+      - staging/src/github.com/labring/**
   workflow_dispatch:
 jobs:
   sync:

.gitignore

@@ -16,3 +16,4 @@ tools
 coverage.out
 tmp
 ./pkg/infra/controller/bin
+desktop/.DS_Store

.golangci.yml

@@ -8,7 +8,7 @@ run:
   # default is true. Enables skipping of directories:
   #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
   skip-dirs-use-default: true
-  modules-download-mode: mod
+  modules-download-mode: readonly
 
 linters:
   # please, do not use `enable-all`: it's deprecated and will be removed soon.

DEVELOPGUIDE.md

@@ -27,3 +27,7 @@ Then test it locally.
 All the binaries except `sealos` can be built anywhere since they have `CGO_ENABLED=0`. However, `sealos` needs to support overlay driver when running some subcommands like `images`, which relies on CGO. Therefore CGO is switched on when building `sealos`, making it impossible to build `sealos` binaries on platforms other than Linux.
 
 > Both Makefile and GoReleaser in this project have this setting.
+
+## Notes about go workspace
+
+As sealos is using go1.18's workspace feature, once you add a new module, you need to run `go work usr -r .` at root directry to update the workspace synced.

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM --platform=$BUILDPLATFORM golang:1.17-buster as builder
+FROM --platform=$BUILDPLATFORM golang:1-bullseye as builder
 ARG GITHUB_TOKEN=$GITHUB_TOKEN
 ARG TARGETARCH
 ARG ACTION=build-pack

cmd/desktop/cmd/root.go

@@ -15,33 +15,34 @@
 package cmd
 
 import (
+	"github.com/spf13/cobra"
+
 	"github.com/labring/lvscare/care"
+	"github.com/labring/sealos/pkg/utils/flags"
 	"github.com/labring/sealos/pkg/utils/logger"
-	"github.com/spf13/cobra"
 )
 
 // careCmd represents the care command
 var careCmd = &cobra.Command{
 	Use:   "care",
 	Short: "A lightweight LVS baby care, support ipvs health check.",
-	Run: func(cmd *cobra.Command, args []string) {
-		care.LVS.VsAndRsCare()
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return care.LVS.VsAndRsCare()
 	},
 	PreRunE: func(cmd *cobra.Command, args []string) error {
-		if err := care.SetTargetIP(); err != nil {
+		flags.PrintFlags(cmd.Flags())
+		if err := care.LVS.ValidateAndSetDefaults(); err != nil {
 			return err
 		}
-		// if target ip is empty, skip sync router
-		if care.LVS.TargetIP == nil {
-			return nil
+		if !care.LVS.Clean {
+			return care.LVS.SyncRouter()
 		}
-		return care.LVS.SyncRouter()
+		return nil
 	},
 }
 
 func init() {
 	cobra.OnInitialize(func() {
-		//TODO: expose showPath flag?
 		switch care.LVS.Logger {
 		case "INFO":
 			logger.CfgConsoleLogger(false, false)
@@ -51,23 +52,6 @@ func init() {
 			logger.CfgConsoleLogger(false, false)
 		}
 	})
+	care.LVS.RegisterFlags(careCmd.Flags())
 	rootCmd.AddCommand(careCmd)
-	// Here you will define your flags and configuration settings.
-
-	// Cobra supports Persistent Flags which will work for this command
-	// and all subcommands, e.g.:
-	// careCmd.PersistentFlags().String("foo", "", "A help for foo")
-	careCmd.Flags().IPVar(&care.LVS.TargetIP, "ip", nil, "target ip")
-	careCmd.Flags().BoolVar(&care.LVS.RunOnce, "run-once", false, "is run once mode")
-	careCmd.Flags().StringVar(&care.LVS.VirtualServer, "vs", "", "virtual server like 10.54.0.2:6443")
-	careCmd.Flags().StringSliceVar(&care.LVS.RealServer, "rs", []string{}, "real server like 192.168.0.2:6443")
-	careCmd.Flags().StringVar(&care.LVS.Logger, "logger", "INFO", "logger level: DEBG/INFO")
-	careCmd.Flags().BoolVar(&care.LVS.Clean, "clean", false, "before run clean ipvs rules")
-
-	careCmd.Flags().StringVar(&care.LVS.HealthPath, "health-path", "/healthz", "health check path")
-	careCmd.Flags().StringVar(&care.LVS.HealthSchem, "health-schem", "https", "health check schem")
-	careCmd.Flags().Int32Var(&care.LVS.Interval, "interval", 5, "health check interval, unit is sec.")
-	// Cobra supports local flags which will only run when this command
-	// is called directly, e.g.:
-	// careCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
 }

cmd/desktop/main.go

@@ -15,71 +15,31 @@
 package cmd
 
 import (
-	"net"
-
-	"github.com/labring/lvscare/pkg/route"
-
-	"github.com/labring/lvscare/care"
 	"github.com/spf13/cobra"
 
-	"github.com/labring/sealos/pkg/constants"
+	"github.com/labring/lvscare/care"
 	"github.com/labring/sealos/pkg/utils/flags"
-	"github.com/labring/sealos/pkg/utils/hosts"
-	"github.com/labring/sealos/pkg/utils/iputils"
-	"github.com/labring/sealos/pkg/utils/logger"
 )
 
 func newIPVSCmd() *cobra.Command {
-	var clean bool
-	var vip string
 	var ipvsCmd = &cobra.Command{
 		Use:   "ipvs",
 		Short: "sealos create or care local ipvs lb",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if clean {
-				lvs := care.BuildLvscare()
-				if err := lvs.DeleteVirtualServer(care.LVS.VirtualServer, false); err != nil {
-					return err
-				}
-				logger.Info("lvscare delete vip: %s success", care.LVS.VirtualServer)
-				routeOperator := route.NewRoute(vip, care.LVS.TargetIP.String())
-				if err := routeOperator.DelRoute(); err != nil {
-					return err
-				}
-				logger.Info("lvscare delete route: %s success", care.LVS.VirtualServer)
-				return nil
-			}
-			care.LVS.VsAndRsCare()
-			return nil
+			return care.LVS.VsAndRsCare()
 		},
 		PreRunE: func(cmd *cobra.Command, args []string) error {
 			flags.PrintFlags(cmd.Flags())
-			if care.LVS.TargetIP == nil {
-				hf := &hosts.HostFile{Path: constants.DefaultHostsPath}
-				if ip, ok := hf.HasDomain(constants.DefaultLvscareDomain); ok {
-					care.LVS.TargetIP = net.ParseIP(ip)
-				}
-				logger.Debug("found target route ip is %s", care.LVS.TargetIP.String())
-				if !clean {
-					if err := care.LVS.SyncRouter(); err != nil {
-						return err
-					}
-				}
+			if err := care.LVS.ValidateAndSetDefaults(); err != nil {
+				return err
+			}
+			if !care.LVS.Clean {
+				return care.LVS.SyncRouter()
 			}
-			care.LVS.Clean = true
-			vip = iputils.GetHostIP(care.LVS.VirtualServer)
 			return nil
 		},
 	}
-	ipvsCmd.Flags().BoolVarP(&clean, "clean", "C", false, "clean ipvs and route")
-	ipvsCmd.Flags().BoolVar(&care.LVS.RunOnce, "run-once", false, "is run once mode")
-	ipvsCmd.Flags().StringVar(&care.LVS.VirtualServer, "vs", "", "virturl server like 10.54.0.2:6443")
-	ipvsCmd.Flags().StringSliceVar(&care.LVS.RealServer, "rs", []string{}, "real server like 192.168.0.2:6443")
-	ipvsCmd.Flags().IPVar(&care.LVS.TargetIP, "ip", nil, "target ip")
-
-	ipvsCmd.Flags().StringVar(&care.LVS.HealthPath, "health-path", "/healthz", "health check path")
-	ipvsCmd.Flags().StringVar(&care.LVS.HealthSchem, "health-schem", "https", "health check schem")
-	ipvsCmd.Flags().Int32Var(&care.LVS.Interval, "interval", 5, "health check interval, unit is sec.")
+	care.LVS.RegisterFlags(ipvsCmd.Flags())
 	return ipvsCmd
 }