Merge branch 'main' into dev2

.github/workflows/ci.yml

@@ -9,7 +9,8 @@ concurrency:
 jobs:
   verify:
     name: verify
-    runs-on: [self-hosted, ecs]
+    runs-on: ubuntu-22.04
+#    runs-on: [self-hosted, ecs]
     if: ${{ always() }}
     env:
       #GOPATH: ${{ github.workspace }}
@@ -27,6 +28,8 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: '1.20'
+      - name: Set up GOPROXY for Go
+        run: go env -w GOPROXY=https://goproxy.cn,direct
       - name: lint
         run: hack/verify-staticcheck.sh
       - name: vendor

.github/workflows/release_binaries.yml

@@ -30,6 +30,9 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
 
+      - name: Set up GOPROXY for Go
+        run: go env -w GOPROXY=https://goproxy.cn,direct
+
       # step3: make binaries
       - name: Make binaries
         run: make release

.gitignore

@@ -36,4 +36,6 @@ cmd/kubenest/node-agent/cert.pem
 cmd/kubenest/node-agent/key.pem
 cmd/kubenest/node-agent/agent.env
 hack/k8s-in-k8s/nodes.txt
-develop
+develop
+
+cmd/kubenest/node-agent/app/client/app.log

.golangci.yml

@@ -1,25 +1,33 @@
 run:
   timeout: 10m
   modules-download-mode: vendor
+  skip-dirs:
+    - (^|/)vendor($|/)
+    - pkg/utils/lifted
+    - pkg/scheduler/lifted
 linters:
   disable-all: true
   enable:
-    - whitespace
-    - bodyclose
-    - dupl
-    - errcheck
-    - gci
+    # linters maintained by golang.org
     - gofmt
+    - govet
     - goimports
-    - misspell
-    - unused
+    # linters default enabled by golangci-lint .
+    - errcheck
+    - gosimple
     - typecheck
     - staticcheck
-    - gosimple
-    - govet
     - ineffassign
-    - typecheck
+    - unused
+    # other linters supported by golangci-lint.
+    - gci
+    - misspell
+    - bodyclose
+    - gocyclo
     - gosec
+    - dupl
+    - revive
+    - whitespace
 linters-settings:
   goimports:
     local-prefixes: github.com/kosmos.io/kosmos
@@ -31,6 +39,9 @@ linters-settings:
       - Standard
       - Default
       - Prefix(github.com/kosmos.io/kosmos)
+  gocyclo:
+    # minimal cyclomatic complexity to report
+    min-complexity: 40 # The recommended value is 15
 output:
   sort-results: true
 

Makefile

@@ -151,7 +151,7 @@ lint-fix: golangci-lint
 
 golangci-lint:
 ifeq (, $(shell which golangci-lint))
-	GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54.2
+	GO111MODULE=on go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
 GOLANGLINT_BIN=$(shell go env GOPATH)/bin/golangci-lint
 else
 GOLANGLINT_BIN=$(shell which golangci-lint)

cmd/clusterlink/agent/app/agent.go

@@ -37,10 +37,7 @@ func NewAgentCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {

cmd/clusterlink/clusterlink-operator/app/operator.go

@@ -36,10 +36,7 @@ func NewLinkOperatorCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := Run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return Run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {

cmd/clusterlink/controller-manager/app/controller-manager.go

@@ -110,7 +110,7 @@ func Run(ctx context.Context, opts *options.ControllerManagerOptions) error {
 	return nil
 }
 
-func setupControllers(mgr ctrl.Manager, opts *options.ControllerManagerOptions, ctx context.Context) []ctrlcontext.CleanFunc {
+func setupControllers(ctx context.Context, mgr ctrl.Manager, opts *options.ControllerManagerOptions) []ctrlcontext.CleanFunc {
 	controlPanelConfig, err := clientcmd.BuildConfigFromFlags("", opts.ControlPanelConfig)
 	if err != nil {
 		klog.Fatalf("build controlpanel config err: %v", err)

cmd/clusterlink/controller-manager/app/controllerstarter.go

@@ -98,7 +98,7 @@ func (c *Controller) OnAdd(obj interface{}) {
 }
 
 // OnUpdate handles object update event and push the object to queue.
-func (c *Controller) OnUpdate(oldObj, newObj interface{}) {
+func (c *Controller) OnUpdate(_, newObj interface{}) {
 	runtimeObj, ok := newObj.(runtime.Object)
 	if !ok {
 		return
@@ -111,7 +111,7 @@ func (c *Controller) OnDelete(obj interface{}) {
 	c.OnAdd(obj)
 }
 
-func (c *Controller) Reconcile(key lifted.QueueKey) error {
+func (c *Controller) Reconcile(_ lifted.QueueKey) error {
 	cluster, err := c.clusterLister.Get(c.opts.ClusterName)
 	if err != nil {
 		return err
@@ -180,7 +180,7 @@ func (c *Controller) removeFinalizer(cluster *clusterlinkv1alpha1.Cluster) error
 }
 func (c *Controller) setupControllers() {
 	subCtx, cancelFunc := context.WithCancel(c.ctx)
-	cleanFuns := setupControllers(c.mgr, c.opts, subCtx)
+	cleanFuns := setupControllers(subCtx, c.mgr, c.opts)
 	c.cancelFunc = cancelFunc
 	c.cleanFuncs = cleanFuns
 }

cmd/clusterlink/controller-manager/app/core.go

@@ -81,7 +81,7 @@ func startCalicoPoolController(ctx ctrlcontext.Context) (bool, ctrlcontext.Clean
 func startNodeCIDRController(ctx ctrlcontext.Context) (bool, ctrlcontext.CleanFunc, error) {
 	mgr := ctx.Mgr
 
-	nodeCIDRCtl := nodecidr.NewNodeCIDRController(mgr.GetConfig(), ctx.Opts.ClusterName, ctx.ClusterLinkClient, ctx.Opts.RateLimiterOpts, ctx.Ctx)
+	nodeCIDRCtl := nodecidr.NewNodeCIDRController(ctx.Ctx, mgr.GetConfig(), ctx.Opts.ClusterName, ctx.ClusterLinkClient, ctx.Opts.RateLimiterOpts)
 	if err := mgr.Add(nodeCIDRCtl); err != nil {
 		klog.Fatalf("Failed to setup node CIDR Controller: %v", err)
 		return true, nil, nil

cmd/clusterlink/elector/app/elector.go

@@ -37,10 +37,7 @@ func NewElectorCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {

cmd/clusterlink/floater/app/floater.go

@@ -33,10 +33,7 @@ func NewFloaterCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := Run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return Run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {

cmd/clusterlink/floater/app/options/options.go

@@ -19,5 +19,5 @@ func NewOptions() *Options {
 }
 
 // AddFlags adds flags of agent to the specified FlagSet
-func (o *Options) AddFlags(fs *pflag.FlagSet) {
+func (o *Options) AddFlags(_ *pflag.FlagSet) {
 }

cmd/clusterlink/network-manager/app/manager.go

@@ -26,10 +26,7 @@ func NewNetworkManagerCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return run(ctx, opts)
 		},
 	}
 

cmd/clusterlink/proxy/app/clusterlink-proxy.go

@@ -26,10 +26,7 @@ func NewClusterLinkProxyCommand(ctx context.Context) *cobra.Command {
 					return errs.ToAggregate()
 				}
 			*/
-			if err := run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {

cmd/clusterlink/proxy/app/options/options.go

@@ -166,9 +166,5 @@ func (o *Options) genericOptionsApplyTo(config *genericapiserver.RecommendedConf
 	if err := o.CoreAPI.ApplyTo(config); err != nil {
 		return err
 	}
-	if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, config.ClientConfig, o.FeatureGate); err != nil {
-		return err
-	}
-
-	return nil
+	return o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, config.ClientConfig, o.FeatureGate)
 }

cmd/clustertree/cluster-manager/app/manager.go

@@ -45,10 +45,7 @@ func NewClusterManagerCommand(ctx context.Context) (*cobra.Command, error) {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := leaderElectionRun(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return leaderElectionRun(ctx, opts)
 		},
 	}
 

cmd/kubenest/node-agent/app/client/client.go

@@ -67,7 +67,7 @@ var (
 	operation string   // operation for client to execute
 )
 
-func cmdCheckRun(cmd *cobra.Command, args []string) error {
+func cmdCheckRun(cmd *cobra.Command, _ []string) error {
 	if len(params) != 1 {
 		log.Errorf("port list is required and port list size must not be greater than 1")
 		return fmt.Errorf("port list is required and port list size must not be greater than 1")
@@ -143,7 +143,7 @@ func init() {
 	ClientCmd.AddCommand(checkCmd)
 }
 
-func cmdTtyRun(cmd *cobra.Command, args []string) error {
+func cmdTtyRun(cmd *cobra.Command, _ []string) error {
 	auth, err := getAuth(cmd)
 	if err != nil {
 		return err
@@ -242,7 +242,7 @@ func connectTty(wsURL string, headers http.Header) error {
 	}
 }
 
-func cmdCmdRun(cmd *cobra.Command, args []string) error {
+func cmdCmdRun(cmd *cobra.Command, _ []string) error {
 	if len(operation) == 0 {
 		log.Errorf("operation is required")
 		return fmt.Errorf("operation is required")
@@ -255,7 +255,7 @@ func cmdCmdRun(cmd *cobra.Command, args []string) error {
 	return executeWebSocketCommand(auth)
 }
 
-func cmdUploadRun(cmd *cobra.Command, args []string) error {
+func cmdUploadRun(cmd *cobra.Command, _ []string) error {
 	auth, err := getAuth(cmd)
 	if err != nil {
 		return err
@@ -316,7 +316,7 @@ func uploadFile(filePath, fileName, auth string) error {
 			defer wg.Done()
 			wsURL := fmt.Sprintf("wss://%s/upload/?file_name=%s&file_path=%s", addr, url.QueryEscape(filepath.Base(fileName)), url.QueryEscape(filePath))
 			fmt.Println("Uploading file:", fileName, "from", filePath, "to", addr)
-			err := connectAndSendFile(wsURL, headers, filePath, fileName)
+			err := connectAndSendFile(wsURL, headers, fileName)
 			if err != nil {
 				log.Errorf("failed to upload file: %v on %s: %v\n", err, addr, fileName)
 			}
@@ -344,7 +344,7 @@ func connectAndHandleMessages(wsURL string, headers http.Header) error {
 	return nil
 }
 
-func connectAndSendFile(wsURL string, headers http.Header, filePath, fileName string) error {
+func connectAndSendFile(wsURL string, headers http.Header, fileName string) error {
 	ws, resp, err := dialer.Dial(wsURL, headers)
 	if err != nil {
 		return fmt.Errorf("WebSocket dial error: %v", err)

cmd/kubenest/node-agent/app/client/client_test.go

@@ -45,7 +45,7 @@ func init() {
 	time.Sleep(10 * time.Second)
 }
 
-func TestCmd(t *testing.T) {
+func TestCmd(_ *testing.T) {
 	fmt.Println("Command test")
 	command := url.QueryEscape("ls -l")
 	ws, resp, err := dialer.Dial("wss://"+testAddr+"/cmd/?command="+command, headers)
@@ -59,7 +59,7 @@ func TestCmd(t *testing.T) {
 	handleMessages(ws)
 }
 
-func TestUpload(t *testing.T) {
+func TestUpload(_ *testing.T) {
 	fmt.Println("Upload file test")
 	fileName := url.QueryEscape("app.go")
 	filePath := url.QueryEscape("/tmp/websocket")
@@ -76,7 +76,7 @@ func TestUpload(t *testing.T) {
 	handleMessages(ws)
 }
 
-func TestShellScript(t *testing.T) {
+func TestShellScript(_ *testing.T) {
 	fmt.Println("Shell script test")
 
 	ws, resp, err := dialer.Dial("wss://"+testAddr+"/sh/?args=10&&args=10", headers)
@@ -91,7 +91,7 @@ func TestShellScript(t *testing.T) {
 	handleMessages(ws)
 }
 
-func TestPyScript(t *testing.T) {
+func TestPyScript(_ *testing.T) {
 	fmt.Println("Python script test")
 	ws, resp, err := dialer.Dial("wss://"+testAddr+"/py/?args=10&&args=10", headers)
 	if err != nil {

cmd/kubenest/node-agent/app/serve/serve.go

@@ -54,7 +54,7 @@ func init() {
 	ServeCmd.PersistentFlags().StringVarP(&keyFile, "key", "k", "key.pem", "SSL key file")
 }
 
-func serveCmdRun(cmd *cobra.Command, args []string) error {
+func serveCmdRun(_ *cobra.Command, _ []string) error {
 	user := viper.GetString("WEB_USER")
 	password := viper.GetString("WEB_PASS")
 	if len(user) == 0 || len(password) == 0 {

cmd/kubenest/operator/app/operator.go

@@ -38,10 +38,7 @@ func NewVirtualClusterOperatorCommand(ctx context.Context) *cobra.Command {
 		Use:  "virtual-cluster-operator",
 		Long: `create virtual kubernetes control plane with VirtualCluster`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := runCommand(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return runCommand(ctx, opts)
 		},
 	}
 
@@ -89,7 +86,7 @@ func SetupConfig(opts *options.Options) (*config.Config, error) {
 		ko.KubeInKubeConfig.ETCDStorageClass = opts.DeprecatedOptions.KubeInKubeConfig.ETCDStorageClass
 		ko.KubeInKubeConfig.AdmissionPlugins = opts.DeprecatedOptions.KubeInKubeConfig.AdmissionPlugins
 		ko.KubeInKubeConfig.AnpMode = opts.DeprecatedOptions.KubeInKubeConfig.AnpMode
-		ko.KubeInKubeConfig.ApiServerReplicas = opts.DeprecatedOptions.KubeInKubeConfig.ApiServerReplicas
+		ko.KubeInKubeConfig.APIServerReplicas = opts.DeprecatedOptions.KubeInKubeConfig.APIServerReplicas
 		ko.KubeInKubeConfig.ClusterCIDR = opts.DeprecatedOptions.KubeInKubeConfig.ClusterCIDR
 
 		koc = *ko
@@ -125,12 +122,12 @@ func SetupConfig(opts *options.Options) (*config.Config, error) {
 }
 
 // TODO
-func printKubeNestConfiguration(koc v1alpha1.KubeNestConfiguration) {
+func printKubeNestConfiguration(_ v1alpha1.KubeNestConfiguration) {
 
 }
 
 // TODO
-func fillInForDefault(c *config.Config, koc v1alpha1.KubeNestConfiguration) {
+func fillInForDefault(_ *config.Config, _ v1alpha1.KubeNestConfiguration) {
 
 }
 
@@ -201,13 +198,13 @@ func startEndPointsControllers(mgr manager.Manager) error {
 		return fmt.Errorf("error starting %s: %v", endpointscontroller.KonnectivitySyncControllerName, err)
 	}
 
-	ApiServerExternalSyncController := endpointscontroller.ApiServerExternalSyncController{
+	APIServerExternalSyncController := endpointscontroller.APIServerExternalSyncController{
 		Client:        mgr.GetClient(),
 		EventRecorder: mgr.GetEventRecorderFor(constants.GlobalNodeControllerName),
 	}
 
-	if err := ApiServerExternalSyncController.SetupWithManager(mgr); err != nil {
-		return fmt.Errorf("error starting %s: %v", endpointscontroller.ApiServerExternalSyncControllerName, err)
+	if err := APIServerExternalSyncController.SetupWithManager(mgr); err != nil {
+		return fmt.Errorf("error starting %s: %v", endpointscontroller.APIServerExternalSyncControllerName, err)
 	}
 
 	return nil