golang lint

Signed-off-by: changluyi <clyi@alauda.io>
kubeovn · Jan 8, 2024 · 9bdb45c · 9bdb45c
1 parent 21fb49b
commit 9bdb45c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/ovn_ic_client/ovn_ic_client.go b/pkg/ovn_ic_client/ovn_ic_client.go
@@ -85,7 +85,6 @@ func (c *Controller) setAutoRoute(autoRoute bool) {
 
 func (c *Controller) getICState(cmData, lastcmData map[string]string) int {
  isCMEqual := reflect.DeepEqual(cmData, lastcmData)
- isTsEqual := true
  if icEnabled != "true" && len(lastcmData) == 0 && cmData["enable-ic"] == "true" {
  return icFirstEstablish
  }
@@ -98,7 +97,7 @@ func (c *Controller) getICState(cmData, lastcmData map[string]string) int {
  klog.Errorf("failed to get Transit_Switch, %v", err)
  return icNoAction
  }
- isTsEqual = reflect.DeepEqual(lastTSs, curTSs)
+ isTsEqual := reflect.DeepEqual(lastTSs, curTSs)
  if isTsEqual {
  return icNoAction
  }

diff --git a/test/e2e/ovn-ic/e2e_test.go b/test/e2e/ovn-ic/e2e_test.go
@@ -273,7 +273,7 @@ var _ = framework.SerialDescribe("[group:ovn-ic]", func() {
  gws := strings.Split(gwNodes[i], ",")
  newGatewayStr := strings.Join(gws[0:len(gws)-2], ",")
 
- configMapPatchPayload, err := json.Marshal(corev1.ConfigMap{
+ configMapPatchPayload, _ := json.Marshal(corev1.ConfigMap{
  Data: map[string]string{
  "gw-nodes": newGatewayStr,
  },
@@ -284,17 +284,16 @@ var _ = framework.SerialDescribe("[group:ovn-ic]", func() {
  fnCheckPodHTTP()
 
  ginkgo.By("case 3: recover two clusters from 1 gateway to 3 gateway")
- gwNodes = make([]string, len(clusters))
  for i := range clusters {
  ginkgo.By("fetching the ConfigMap in cluster " + clusters[i])
 
- configMapPatchPayload, err := json.Marshal(corev1.ConfigMap{
+ configMapPatchPayload, _ := json.Marshal(corev1.ConfigMap{
  Data: map[string]string{
  "gw-nodes": oldGatewayStr[i],
  },
  })
 
- _, err = clientSets[i].CoreV1().ConfigMaps(framework.KubeOvnNamespace).Patch(context.TODO(), util.InterconnectionConfig, k8stypes.StrategicMergePatchType, []byte(configMapPatchPayload), metav1.PatchOptions{})
+ _, err := clientSets[i].CoreV1().ConfigMaps(framework.KubeOvnNamespace).Patch(context.TODO(), util.InterconnectionConfig, k8stypes.StrategicMergePatchType, []byte(configMapPatchPayload), metav1.PatchOptions{})
  framework.ExpectNoError(err, "patch ovn-ic-config failed")
  }
  fnCheckPodHTTP()
@@ -305,13 +304,13 @@ var _ = framework.SerialDescribe("[group:ovn-ic]", func() {
  framework.ExpectNoError(err, "switch to kube-ovn cluster failed")
 
  patchCmd := "kubectl patch deployment ovn-ic-server -n kube-system --type='json' -p=\"[{'op': 'replace', 'path': '/spec/template/spec/containers/0/env/1/value', 'value': '5'}]\""
- _, err = exec.Command("bash", "-c", patchCmd).CombinedOutput()
+ _, _ = exec.Command("bash", "-c", patchCmd).CombinedOutput()
  checkECMPCount(5)
  fnCheckPodHTTP()
 
  ginkgo.By("case 5: reduce ecmp path from 5 to 3 ")
  patchCmd = "kubectl patch deployment ovn-ic-server -n kube-system --type='json' -p=\"[{'op': 'replace', 'path': '/spec/template/spec/containers/0/env/1/value', 'value': '3'}]\""
- _, err = exec.Command("bash", "-c", patchCmd).CombinedOutput()
+ _, _ = exec.Command("bash", "-c", patchCmd).CombinedOutput()
  checkECMPCount(3)
  fnCheckPodHTTP()