Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c0a0471b
Commit
c0a0471b
authored
Feb 28, 2019
by
SataQiu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix golint failures in test/e2e/instrumentation, test/e2e_node/environment
parent
218642e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
4 deletions
+3
-4
.golint_failures
hack/.golint_failures
+0
-2
imports.go
test/e2e/instrumentation/imports.go
+1
-0
conformance.go
test/e2e_node/environment/conformance.go
+2
-2
No files found.
hack/.golint_failures
View file @
c0a0471b
...
...
@@ -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
...
...
test/e2e/instrumentation/imports.go
View file @
c0a0471b
...
...
@@ -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"
)
test/e2e_node/environment/conformance.go
View file @
c0a0471b
...
...
@@ -119,12 +119,12 @@ func containerRuntime() error {
return
printSuccess
(
"Container Runtime Check: %s"
,
success
)
}
const
kubeletClusterD
ns
RegexStr
=
`\/kubelet.*--cluster-dns=(\S+) `
const
kubeletClusterD
NS
RegexStr
=
`\/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
(
kubeletClusterD
ns
RegexStr
)
dnsRegex
,
err
:=
regexp
.
Compile
(
kubeletClusterD
NS
RegexStr
)
if
err
!=
nil
{
// This should never happen and can only be fixed by changing the code
panic
(
err
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment