Merge branch 'kosmos-io:main' into fix_operator_join

Author: ONE7live

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ concurrency:
 jobs:
   verify:
     name: verify
+#    runs-on: ubuntu-22.04
     runs-on: [self-hosted, ecs]
     if: ${{ always() }}
     env:
@@ -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
@@ -40,8 +43,8 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            _output/release/kosmosctl-linux-amd64
-            _output/release/kosmosctl-linux-arm64
-            _output/release/kosmosctl-darwin-amd64
-            _output/release/kosmosctl-darwin-arm64
+            _output/release/kosmosctl/kosmosctl-linux-amd64
+            _output/release/kosmosctl/kosmosctl-linux-arm64
+            _output/release/kosmosctl/kosmosctl-darwin-amd64
+            _output/release/kosmosctl/kosmosctl-darwin-arm64
 

.gitignore

@@ -30,4 +30,12 @@ kube-config
 
 __debug_bin*
 
-ignore_dir
+ignore_dir
+cmd/kubenest/node-agent/app.log
+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
+
+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)

charts/kosmos/Chart.yaml

@@ -0,0 +1,29 @@
+apiVersion: v2
+name: kosmos-charts
+description: A Helm chart for Kosmos
+
+# A chart can be either an 'application' or a 'library' chart.
+#
+# Application charts are a collection of templates that can be packaged into versioned archives
+# to be deployed.
+#
+# Library charts provide useful utilities or functions for the chart developer. They're included as
+# a dependency of application charts to inject those utilities and functions into the rendering
+# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+type: application
+
+# The optional kubeVersion field can define semver constraints on supported Kubernetes versions.
+# Helm will validate the version constraints when installing the chart and fail if the cluster
+# runs an unsupported Kubernetes version.
+kubeVersion: ">= 1.16.0-0"
+
+# This is the chart version. This version number should be incremented each time you make changes
+# to the chart and its templates, including the app version.
+# Versions are expected to follow Semantic Versioning (https://semver.org/)
+version: 0.0.0
+
+# This is the version number of the application being deployed. This version number should be
+# incremented each time you make changes to the application. Versions are not expected to
+# follow Semantic Versioning. They should reflect the version the application is using.
+# It is recommended to use it with quotes.
+appVersion: latest

charts/kosmos/templates/01-serviceaccount.yaml

@@ -0,0 +1,35 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: clustertree
+  namespace: {{ .Values.global.namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kosmos-operator
+  namespace: {{ .Values.global.namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kosmos-scheduler
+  namespace: {{ .Values.global.namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: clusterlink-controller-manager
+  namespace: {{ .Values.global.namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: clusterlink-elector
+  namespace: {{ .Values.global.namespace }}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: clusterlink-network-manager
+  namespace: {{ .Values.global.namespace }}