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

Add kubectl expose to GCE_PARALLEL_FLAKY_TESTS 

It's essentially the same as Services.*expose, just using kubectl
instead of client lib.

Fixes #14078
pull/6/head
Jeff Lowdermilk 2015-09-16 16:20:40 -07:00
parent df4a007cee
commit 12010e9832
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/jenkins/e2e.sh
View File

@ -160,6 +160,7 @@ GCE_PARALLEL_FLAKY_TESTS=(
"Services.*endpoint" "Services.*endpoint"
"Services.*up\sand\sdown" "Services.*up\sand\sdown"
"Networking\sshould\sfunction\sfor\sintra-pod\scommunication" # possibly causing Ginkgo to get stuck, issue: #13485 "Networking\sshould\sfunction\sfor\sintra-pod\scommunication" # possibly causing Ginkgo to get stuck, issue: #13485
"Kubectl\sexpose"
) )
# Tests that should not run on soak cluster. # Tests that should not run on soak cluster.

16
test/e2e/kubectl.go
View File

@ -364,7 +364,6 @@ var _ = Describe("Kubectl client", func() {
nsFlag := fmt.Sprintf("--namespace=%v", ns) nsFlag := fmt.Sprintf("--namespace=%v", ns)
redisPort := 6379 redisPort := 6379
serviceTimeout := 60 * time.Second
By("creating Redis RC") By("creating Redis RC")
runKubectl("create", "-f", controllerJson, nsFlag) runKubectl("create", "-f", controllerJson, nsFlag)
@ -375,7 +374,10 @@ var _ = Describe("Kubectl client", func() {
endpointFound := false endpointFound := false
for t := time.Now(); time.Since(t) < timeout; time.Sleep(poll) { for t := time.Now(); time.Since(t) < timeout; time.Sleep(poll) {
endpoints, err := c.Endpoints(ns).Get(name) endpoints, err := c.Endpoints(ns).Get(name)
Expect(err).NotTo(HaveOccurred()) if err != nil {
Logf("Get endpoints failed (%v elapsed, ignoring for %v): %v", time.Since(t), poll, err)
continue
}
uidToPort := getContainerPortsByPodUID(endpoints) uidToPort := getContainerPortsByPodUID(endpoints)
if len(uidToPort) == 0 { if len(uidToPort) == 0 {
@ -383,7 +385,7 @@ var _ = Describe("Kubectl client", func() {
continue continue
} }
if len(uidToPort) > 1 { if len(uidToPort) > 1 {
Fail("To many endpoints found") Fail("Too many endpoints found")
} }
for _, port := range uidToPort { for _, port := range uidToPort {
if port[0] != redisPort { if port[0] != redisPort {
@ -413,13 +415,13 @@ var _ = Describe("Kubectl client", func() {
By("exposing RC") By("exposing RC")
runKubectl("expose", "rc", "redis-master", "--name=rm2", "--port=1234", fmt.Sprintf("--target-port=%d", redisPort), nsFlag) runKubectl("expose", "rc", "redis-master", "--name=rm2", "--port=1234", fmt.Sprintf("--target-port=%d", redisPort), nsFlag)
waitForService(c, ns, "rm2", true, poll, serviceTimeout) waitForService(c, ns, "rm2", true, poll, serviceStartTimeout)
validateService("rm2", 1234, serviceTimeout) validateService("rm2", 1234, serviceStartTimeout)
By("exposing service") By("exposing service")
runKubectl("expose", "service", "rm2", "--name=rm3", "--port=2345", fmt.Sprintf("--target-port=%d", redisPort), nsFlag) runKubectl("expose", "service", "rm2", "--name=rm3", "--port=2345", fmt.Sprintf("--target-port=%d", redisPort), nsFlag)
waitForService(c, ns, "rm3", true, poll, serviceTimeout) waitForService(c, ns, "rm3", true, poll, serviceStartTimeout)
validateService("rm3", 2345, serviceTimeout) validateService("rm3", 2345, serviceStartTimeout)
}) })
}) })