Merge pull request kosmos-io#708 from duanmengkk/main

add revive linter and fix the lint error
OrangeBao · Sep 18, 2024 · de8d704 · de8d704
2 parents 20def32 + 323fb31
commit de8d704
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 145 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,8 +9,8 @@ concurrency:
 jobs:
   verify:
     name: verify
-    runs-on: ubuntu-22.04
-#    runs-on: [self-hosted, ecs]
+#    runs-on: ubuntu-22.04
+    runs-on: [self-hosted, ecs]
     if: ${{ always() }}
     env:
       #GOPATH: ${{ github.workspace }}

diff --git a/deploy/crds/kosmos.io_knodes.yaml b/deploy/crds/kosmos.io_knodes.yaml
diff --git a/deploy/crds/kosmos.io_kubenestconfigurations.yaml b/deploy/crds/kosmos.io_kubenestconfigurations.yaml
@@ -77,7 +77,7 @@ spec:
                       type: string
                     type: array
                 type: object
-              useTenantDns:
+              useTenantDNS:
                 default: false
                 type: boolean
             type: object

diff --git a/deploy/crds/kosmos.io_virtualclusters.yaml b/deploy/crds/kosmos.io_virtualclusters.yaml
@@ -98,7 +98,7 @@ spec:
                           type: string
                         type: array
                     type: object
-                  useTenantDns:
+                  useTenantDNS:
                     default: false
                     type: boolean
                 type: object

diff --git a/examples/knode-demo.yaml b/examples/knode-demo.yaml
diff --git a/hack/rune2e.sh b/hack/rune2e.sh
@@ -16,6 +16,7 @@ MEMBER3_CLUSTER_NAME="cluster-member3"
 
 ROOT="$(dirname "${BASH_SOURCE[0]}")"
 REPO_ROOT="$(dirname "${BASH_SOURCE[0]}")/.."
+source "$(dirname "${BASH_SOURCE[0]}")/install_kind_kubectl.sh"
 source "${ROOT}/util.sh"
 source "${ROOT}/cluster.sh"
 mkdir -p "$ARTIFACTS_PATH"

diff --git a/pkg/kubenest/controlplane/etcd.go b/pkg/kubenest/controlplane/etcd.go
@@ -69,15 +69,13 @@ func installEtcd(client clientset.Interface, name, namespace string, kubeNestCon
 			namespace,
 			constants.EtcdListenPeerPort,
 		)
-
 		initialClusters[index] = fmt.Sprintf("%s=%s", memberName, memberPeerURL)
 	}
-	vclabel := util.GetVirtualControllerLabel()
-	IPV6FirstFlag, err := util.IPV6First(constants.APIServerServiceSubnet)
-	if err != nil {
+	vcLabel := util.GetVirtualControllerLabel()
+	IPV6FirstFlag, newErr := util.IPV6First(constants.APIServerServiceSubnet)
+	if newErr != nil {
 		return err
 	}
-
 	etcdStatefulSetBytes, err := util.ParseTemplate(etcd.EtcdStatefulSet, struct {
 		StatefulSetName, Namespace, ImageRepository, Image, EtcdClientService, Version, VirtualControllerLabel string
 		CertsSecretName, EtcdPeerServiceName                                                                   string
@@ -90,7 +88,7 @@ func installEtcd(client clientset.Interface, name, namespace string, kubeNestCon
 		Namespace:              namespace,
 		ImageRepository:        imageRepository,
 		Version:                imageVersion,
-		VirtualControllerLabel: vclabel,
+		VirtualControllerLabel: vcLabel,
 		EtcdClientService:      util.GetEtcdClientServerName(name),
 		CertsSecretName:        util.GetEtcdCertName(name),
 		EtcdPeerServiceName:    util.GetEtcdServerName(name),