Merge pull request kubernetes#74700 from SataQiu/fix-golint-20190228

k8s-ci-robot · web-flow · commit 5756eea8043d · 2019-03-04T13:25:26.000-08:00
Fix golint failures in test/e2e/instrumentation, test/e2e_node/environment
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -647,7 +647,6 @@ test/e2e/common
 test/e2e/framework
 test/e2e/framework/providers/gce
 test/e2e/framework/providers/kubemark
-test/e2e/instrumentation
 test/e2e/instrumentation/logging
 test/e2e/instrumentation/monitoring
 test/e2e/lifecycle
@@ -665,7 +664,6 @@ test/e2e/windows
 test/e2e_kubeadm
 test/e2e_node
 test/e2e_node/builder
-test/e2e_node/environment
 test/e2e_node/remote
 test/e2e_node/runner/remote
 test/e2e_node/services
diff --git a/test/e2e/instrumentation/imports.go b/test/e2e/instrumentation/imports.go
@@ -17,6 +17,7 @@ limitations under the License.
 package instrumentation
 
 import (
+	// ensure libs have a chance to perform initialization
 	_ "k8s.io/kubernetes/test/e2e/instrumentation/logging"
 	_ "k8s.io/kubernetes/test/e2e/instrumentation/monitoring"
 )
diff --git a/test/e2e_node/environment/conformance.go b/test/e2e_node/environment/conformance.go
@@ -119,12 +119,12 @@ func containerRuntime() error {
 	return printSuccess("Container Runtime Check: %s", success)
 }
 
-const kubeletClusterDnsRegexStr = `\/kubelet.*--cluster-dns=(\S+) `
+const kubeletClusterDNSRegexStr = `\/kubelet.*--cluster-dns=(\S+) `
 const kubeletClusterDomainRegexStr = `\/kubelet.*--cluster-domain=(\S+)`
 
 // dns checks that cluster dns has been properly configured and can resolve the kubernetes.default service
 func dns() error {
-	dnsRegex, err := regexp.Compile(kubeletClusterDnsRegexStr)
+	dnsRegex, err := regexp.Compile(kubeletClusterDNSRegexStr)
 	if err != nil {
 		// This should never happen and can only be fixed by changing the code
 		panic(err)

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ limitations under the License.`
`17`	`17`	`package instrumentation`
`18`	`18`
`19`	`19`	`import (`
	`20`	`+ // ensure libs have a chance to perform initialization`
`20`	`21`	`_ "k8s.io/kubernetes/test/e2e/instrumentation/logging"`
`21`	`22`	`_ "k8s.io/kubernetes/test/e2e/instrumentation/monitoring"`
`22`	`23`	`)`