diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index c1b97d7678f..3a439dc02f2 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -99,8 +99,7 @@ readonly KUBE_TEST_TARGETS=($(kube::golang::test_targets)) readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}") readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}") readonly KUBE_TEST_PORTABLE=( - test/images/network-tester/rc.json - test/images/network-tester/service.json + test/e2e/testing-manifests test/kubemark hack/e2e.go hack/e2e-internal diff --git a/test/e2e/kubectl.go b/test/e2e/kubectl.go index e13f3c2b55e..94ec99dc0b0 100644 --- a/test/e2e/kubectl.go +++ b/test/e2e/kubectl.go @@ -170,8 +170,8 @@ var _ = Describe("Kubectl client", func() { var podPath string BeforeEach(func() { - podPath = filepath.Join(testContext.RepoRoot, "docs/user-guide/pod.yaml") - By("creating the pod") + podPath = filepath.Join(testContext.RepoRoot, "test", "e2e", "testing-manifests", "kubectl", "pod-with-readiness-probe.yaml") + By(fmt.Sprintf("creating the pod from %v", podPath)) runKubectlOrDie("create", "-f", podPath, fmt.Sprintf("--namespace=%v", ns)) checkPodsRunningReady(c, ns, []string{simplePodName}, podStartTimeout) }) diff --git a/test/e2e/serviceloadbalancers.go b/test/e2e/serviceloadbalancers.go index 4b773c28e8b..c27fe90df35 100644 --- a/test/e2e/serviceloadbalancers.go +++ b/test/e2e/serviceloadbalancers.go @@ -38,7 +38,7 @@ func getLoadBalancerControllers(repoRoot string, client *client.Client) []LBCTes return []LBCTester{ &haproxyControllerTester{ name: "haproxy", - cfg: filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "haproxyrc.yaml"), + cfg: filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "serviceloadbalancer", "haproxyrc.yaml"), client: client, }, } @@ -49,8 +49,8 @@ func getIngManagers(repoRoot string, client *client.Client) []*ingManager { return []*ingManager{ { name: "netexec", - rcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "netexecrc.yaml")}, - svcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "netexecsvc.yaml")}, + rcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "serviceloadbalancer", "netexecrc.yaml")}, + svcCfgPaths: []string{filepath.Join(repoRoot, "test", "e2e", "testing-manifests", "serviceloadbalancer", "netexecsvc.yaml")}, svcNames: []string{}, client: client, }, diff --git a/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml new file mode 100644 index 00000000000..a2a368d7e3f --- /dev/null +++ b/test/e2e/testing-manifests/kubectl/pod-with-readiness-probe.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Pod +metadata: + name: nginx + labels: + name: nginx +spec: + containers: + - name: nginx + image: nginx + ports: + - containerPort: 80 + readinessProbe: + httpGet: + path: / + port: 80 + initialDelaySeconds: 5 + timeoutSeconds: 5 diff --git a/test/e2e/testing-manifests/haproxyrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml similarity index 100% rename from test/e2e/testing-manifests/haproxyrc.yaml rename to test/e2e/testing-manifests/serviceloadbalancer/haproxyrc.yaml diff --git a/test/e2e/testing-manifests/netexecrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml similarity index 100% rename from test/e2e/testing-manifests/netexecrc.yaml rename to test/e2e/testing-manifests/serviceloadbalancer/netexecrc.yaml diff --git a/test/e2e/testing-manifests/netexecsvc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/netexecsvc.yaml similarity index 100% rename from test/e2e/testing-manifests/netexecsvc.yaml rename to test/e2e/testing-manifests/serviceloadbalancer/netexecsvc.yaml diff --git a/test/e2e/testing-manifests/nginxrc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/nginxrc.yaml similarity index 100% rename from test/e2e/testing-manifests/nginxrc.yaml rename to test/e2e/testing-manifests/serviceloadbalancer/nginxrc.yaml diff --git a/test/e2e/testing-manifests/nginxsvc.yaml b/test/e2e/testing-manifests/serviceloadbalancer/nginxsvc.yaml similarity index 100% rename from test/e2e/testing-manifests/nginxsvc.yaml rename to test/e2e/testing-manifests/serviceloadbalancer/nginxsvc.yaml