github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Fix golint failures in test/e2e/instrumentation, test/e2e_node/environment
pull/564/head
Kubernetes Prow Robot 2019-03-04 13:25:26 -08:00 committed by GitHub
parent d0c3b70802 c0a0471b3b
commit 5756eea804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.golint_failures
View File

@ -647,7 +647,6 @@ test/e2e/common
test/e2e/framework test/e2e/framework
test/e2e/framework/providers/gce test/e2e/framework/providers/gce
test/e2e/framework/providers/kubemark test/e2e/framework/providers/kubemark
test/e2e/instrumentation
test/e2e/instrumentation/logging test/e2e/instrumentation/logging
test/e2e/instrumentation/monitoring test/e2e/instrumentation/monitoring
test/e2e/lifecycle test/e2e/lifecycle
@ -665,7 +664,6 @@ test/e2e/windows
test/e2e_kubeadm test/e2e_kubeadm
test/e2e_node test/e2e_node
test/e2e_node/builder test/e2e_node/builder
test/e2e_node/environment
test/e2e_node/remote test/e2e_node/remote
test/e2e_node/runner/remote test/e2e_node/runner/remote
test/e2e_node/services test/e2e_node/services

1
test/e2e/instrumentation/imports.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package instrumentation package instrumentation
import ( import (
// ensure libs have a chance to perform initialization
_ "k8s.io/kubernetes/test/e2e/instrumentation/logging" _ "k8s.io/kubernetes/test/e2e/instrumentation/logging"
_ "k8s.io/kubernetes/test/e2e/instrumentation/monitoring" _ "k8s.io/kubernetes/test/e2e/instrumentation/monitoring"
) )

4
test/e2e_node/environment/conformance.go
View File

@ -119,12 +119,12 @@ func containerRuntime() error {
return printSuccess("Container Runtime Check: %s", success) 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+)` const kubeletClusterDomainRegexStr = `\/kubelet.*--cluster-domain=(\S+)`
// dns checks that cluster dns has been properly configured and can resolve the kubernetes.default service // dns checks that cluster dns has been properly configured and can resolve the kubernetes.default service
func dns() error { func dns() error {
dnsRegex, err := regexp.Compile(kubeletClusterDnsRegexStr) dnsRegex, err := regexp.Compile(kubeletClusterDNSRegexStr)
if err != nil { if err != nil {
// This should never happen and can only be fixed by changing the code // This should never happen and can only be fixed by changing the code
panic(err) panic(err)