github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-01 06:10:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29813 from jayunit100/kill-repo-root-slb-2

Browse Source 
Automatic merge from submit-queue

[minor] couple of quick cleanups for kill reporoot

quick fixes from last one,  cc @spxtr @ixdy follow on to  https://github.com/kubernetes/kubernetes/pull/25584
This commit is contained in:
k8s-merge-robot
2016-07-29 21:42:42 -07:00
committed by GitHub
parent 7291a43990 4cd6bf42af
commit f0fa9e588f
3 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/framework/util.go
View File

@@ -652,11 +652,6 @@ func podFromManifest(filename string) (*api.Pod, error) {
// Run a test container to try and contact the Kubernetes api-server from a pod, wait for it
// to flip to Ready, log its output and delete it.
func RunKubernetesServiceTestContainer(c *client.Client, ns string) {
c, err := LoadClient()
if err != nil {
Logf("Failed to load client")
return
}
path := "test/images/clusterapi-tester/pod.yaml"
p, err := podFromManifest(path)
if err != nil {