github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-12 13:18:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix error collides with imported package name

Browse Source 
Fix error collides with imported package name

fix

fix
This commit is contained in:
moriadry
2019-08-04 02:28:25 +08:00
parent 4d337d2d32
commit 4b8080dda8
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/framework.go
View File

@@ -569,7 +569,7 @@ func (f *Framework) CreateServiceForSimpleApp(contPort, svcPort int, appName str
// CreatePodsPerNodeForSimpleApp creates pods w/ labels. Useful for tests which make a bunch of pods w/o any networking.
func (f *Framework) CreatePodsPerNodeForSimpleApp(appName string, podSpec func(n v1.Node) v1.PodSpec, maxCount int) map[string]string {
nodes := GetReadySchedulableNodesOrDie(f.ClientSet)
labels := map[string]string{
podLabels := map[string]string{
"app": appName + "-pod",
}
for i, node := range nodes.Items {
@@ -579,14 +579,14 @@ func (f *Framework) CreatePodsPerNodeForSimpleApp(appName string, podSpec func(n
_, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(&v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf(appName+"-pod-%v", i),
Labels: labels,
Labels: podLabels,
},
Spec: podSpec(node),
})
ExpectNoError(err)
}
}
return labels
return podLabels
}
// KubeUser is a struct for managing kubernetes user info.