Skip to content

Commit 8d3e864

Browse files
smarterclaytonsmarterclayton
committed
Add an e2e test for a router that does not update status
Verify that a router running in a namespace does update status if it has permission.
1 parent 3aa7c97 commit 8d3e864

File tree

7 files changed

+139
-32
lines changed

7 files changed

+139
-32
lines changed

‎test/extended/router/headers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
exutil "github.com/openshift/origin/test/extended/util"
1919
)
2020

21-
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] router headers", func() {
21+
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
2222
defer g.GinkgoRecover()
2323
var (
2424
configPath = exutil.FixturePath("testdata", "router-http-echo-server.yaml")

‎test/extended/router/metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
exutil "github.com/openshift/origin/test/extended/util"
2424
)
2525

26-
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift router metrics", func() {
26+
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
2727
defer g.GinkgoRecover()
2828
var (
2929
oc = exutil.NewCLI("router-metrics", exutil.KubeConfigPath())

‎test/extended/router/scoped.go

+29-12
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@ import (
1111
g "github.com/onsi/ginkgo"
1212
o "github.com/onsi/gomega"
1313

14+
routeapi "github.com/openshift/origin/pkg/route/apis/route"
1415
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1516
"k8s.io/apimachinery/pkg/util/wait"
17+
kapi "k8s.io/kubernetes/pkg/apis/core"
1618
e2e "k8s.io/kubernetes/test/e2e/framework"
1719

1820
exutil "github.com/openshift/origin/test/extended/util"
1921
)
2022

2123
const changeTimeoutSeconds = 3 * 60
2224

23-
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift routers", func() {
25+
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
2426
defer g.GinkgoRecover()
2527
var (
2628
configPath = exutil.FixturePath("testdata", "scoped-router.yaml")
@@ -32,19 +34,16 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift rou
3234
if len(imagePrefix) == 0 {
3335
imagePrefix = "openshift/origin"
3436
}
35-
err := oc.AsAdmin().Run("adm").Args("policy", "add-cluster-role-to-user", "system:router", oc.Username()).Execute()
36-
o.Expect(err).NotTo(o.HaveOccurred())
37-
err = oc.Run("new-app").Args("-f", configPath, "-p", "IMAGE="+imagePrefix+"-haproxy-router").Execute()
37+
err := oc.AsAdmin().Run("new-app").Args("-f", configPath, "-p", "IMAGE="+imagePrefix+"-haproxy-router").Execute()
3838
o.Expect(err).NotTo(o.HaveOccurred())
3939
})
4040

4141
g.Describe("The HAProxy router", func() {
4242
g.It("should serve the correct routes when scoped to a single namespace and label set", func() {
4343
defer func() {
44-
// This should be done if the test fails but
45-
// for now always dump the logs.
46-
// if g.CurrentGinkgoTestDescription().Failed
47-
dumpScopedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
44+
if g.CurrentGinkgoTestDescription().Failed {
45+
dumpScopedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
46+
}
4847
}()
4948
oc.SetOutputDir(exutil.TestContext.OutputDir)
5049
ns := oc.KubeFramework().Namespace.Name
@@ -91,10 +90,9 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift rou
9190

9291
g.It("should override the route host with a custom value", func() {
9392
defer func() {
94-
// This should be done if the test fails but
95-
// for now always dump the logs.
96-
// if g.CurrentGinkgoTestDescription().Failed
97-
dumpScopedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
93+
if g.CurrentGinkgoTestDescription().Failed {
94+
dumpScopedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
95+
}
9896
}()
9997
oc.SetOutputDir(exutil.TestContext.OutputDir)
10098
ns := oc.KubeFramework().Namespace.Name
@@ -142,6 +140,16 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] openshift rou
142140
err = expectRouteStatusCodeExec(ns, execPodName, routerURL+"/Letter", host, http.StatusOK)
143141
o.Expect(err).NotTo(o.HaveOccurred())
144142
}
143+
144+
g.By("checking that the router reported the correct ingress and override")
145+
r, err := oc.RouteClient().Route().Routes(ns).Get("route-1", metav1.GetOptions{})
146+
o.Expect(err).NotTo(o.HaveOccurred())
147+
ingress := ingressForName(r, "test-override")
148+
o.Expect(ingress).NotTo(o.BeNil())
149+
o.Expect(ingress.Host).To(o.Equal(fmt.Sprintf(pattern, "route-1", ns)))
150+
status, condition := routeapi.IngressConditionStatus(ingress, routeapi.RouteAdmitted)
151+
o.Expect(status).To(o.Equal(kapi.ConditionTrue))
152+
o.Expect(condition.LastTransitionTime).NotTo(o.BeNil())
145153
})
146154
})
147155
})
@@ -223,3 +231,12 @@ func dumpScopedRouterLogs(oc *exutil.CLI, name string) {
223231
log, _ := e2e.GetPodLogs(oc.AdminKubeClient(), oc.KubeFramework().Namespace.Name, "scoped-router", "router")
224232
e2e.Logf("Scoped Router test %s logs:\n %s", name, log)
225233
}
234+
235+
func ingressForName(r *routeapi.Route, name string) *routeapi.RouteIngress {
236+
for i, ingress := range r.Status.Ingress {
237+
if ingress.RouterName == name {
238+
return &r.Status.Ingress[i]
239+
}
240+
}
241+
return nil
242+
}

‎test/extended/router/unprivileged.go

+94
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
package images
2+
3+
import (
4+
"fmt"
5+
"net/http"
6+
"os"
7+
"time"
8+
9+
g "github.com/onsi/ginkgo"
10+
o "github.com/onsi/gomega"
11+
12+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13+
"k8s.io/apimachinery/pkg/util/wait"
14+
15+
exutil "github.com/openshift/origin/test/extended/util"
16+
)
17+
18+
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
19+
defer g.GinkgoRecover()
20+
var (
21+
configPath = exutil.FixturePath("testdata", "scoped-router.yaml")
22+
oc = exutil.NewCLI("unprivileged-router", exutil.KubeConfigPath())
23+
)
24+
25+
g.BeforeEach(func() {
26+
imagePrefix := os.Getenv("OS_IMAGE_PREFIX")
27+
if len(imagePrefix) == 0 {
28+
imagePrefix = "openshift/origin"
29+
}
30+
err := oc.AsAdmin().Run("new-app").Args("-f", configPath,
31+
`-p=IMAGE=`+imagePrefix+`-haproxy-router`,
32+
`-p=SCOPE=["--name=test-unprivileged", "--namespace=$(POD_NAMESPACE)", "--loglevel=4", "--labels=select=first", "--update-status=false"]`,
33+
).Execute()
34+
o.Expect(err).NotTo(o.HaveOccurred())
35+
})
36+
37+
g.Describe("The HAProxy router", func() {
38+
g.It("should run even if it has no access to update status", func() {
39+
defer func() {
40+
if g.CurrentGinkgoTestDescription().Failed {
41+
dumpScopedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
42+
}
43+
}()
44+
g.Skip("test temporarily disabled")
45+
oc.SetOutputDir(exutil.TestContext.OutputDir)
46+
ns := oc.KubeFramework().Namespace.Name
47+
execPodName := exutil.CreateExecPodOrFail(oc.AdminKubeClient().CoreV1(), ns, "execpod")
48+
defer func() { oc.AdminKubeClient().CoreV1().Pods(ns).Delete(execPodName, metav1.NewDeleteOptions(1)) }()
49+
50+
g.By(fmt.Sprintf("creating a scoped router from a config file %q", configPath))
51+
52+
var routerIP string
53+
err := wait.Poll(time.Second, changeTimeoutSeconds*time.Second, func() (bool, error) {
54+
pod, err := oc.KubeFramework().ClientSet.CoreV1().Pods(oc.KubeFramework().Namespace.Name).Get("scoped-router", metav1.GetOptions{})
55+
if err != nil {
56+
return false, err
57+
}
58+
if len(pod.Status.PodIP) == 0 {
59+
return false, nil
60+
}
61+
routerIP = pod.Status.PodIP
62+
return true, nil
63+
})
64+
o.Expect(err).NotTo(o.HaveOccurred())
65+
66+
// router expected to listen on port 80
67+
routerURL := fmt.Sprintf("http://%s", routerIP)
68+
69+
g.By("waiting for the healthz endpoint to respond")
70+
healthzURI := fmt.Sprintf("http://%s:1936/healthz", routerIP)
71+
err = waitForRouterOKResponseExec(ns, execPodName, healthzURI, routerIP, changeTimeoutSeconds)
72+
if err != nil {
73+
dumpScopedRouterLogs(oc, fmt.Sprintf("%s - %s", g.CurrentGinkgoTestDescription().TestText, "waiting for the healthz endpoint to respond"))
74+
}
75+
o.Expect(err).NotTo(o.HaveOccurred())
76+
77+
g.By("waiting for the valid route to respond")
78+
err = waitForRouterOKResponseExec(ns, execPodName, routerURL+"/Letter", "FIRST.example.com", changeTimeoutSeconds)
79+
o.Expect(err).NotTo(o.HaveOccurred())
80+
81+
for _, host := range []string{"second.example.com", "third.example.com"} {
82+
g.By(fmt.Sprintf("checking that %s does not match a route", host))
83+
err = expectRouteStatusCodeExec(ns, execPodName, routerURL+"/Letter", host, http.StatusServiceUnavailable)
84+
o.Expect(err).NotTo(o.HaveOccurred())
85+
}
86+
87+
g.By("checking that the route doesn't have an ingress status")
88+
r, err := oc.RouteClient().Route().Routes(ns).Get("route-1", metav1.GetOptions{})
89+
o.Expect(err).NotTo(o.HaveOccurred())
90+
ingress := ingressForName(r, "test-unprivileged")
91+
o.Expect(ingress).To(o.BeNil())
92+
})
93+
})
94+
})

‎test/extended/router/weighted.go

+6-14
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ import (
1111

1212
g "github.com/onsi/ginkgo"
1313
o "github.com/onsi/gomega"
14-
"github.com/openshift/origin/pkg/api"
1514

1615
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1716
"k8s.io/apimachinery/pkg/util/wait"
1817
e2e "k8s.io/kubernetes/test/e2e/framework"
1918

2019
exutil "github.com/openshift/origin/test/extended/util"
21-
testutil "github.com/openshift/origin/test/util"
2220
)
2321

24-
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] weighted openshift router", func() {
22+
var _ = g.Describe("[Conformance][Area:Networking][Feature:Router]", func() {
2523
defer g.GinkgoRecover()
2624
var (
2725
configPath = exutil.FixturePath("testdata", "weighted-router.yaml")
@@ -33,22 +31,16 @@ var _ = g.Describe("[Conformance][Area:Networking][Feature:Router] weighted open
3331
if len(imagePrefix) == 0 {
3432
imagePrefix = "openshift/origin"
3533
}
36-
err := oc.AsAdmin().Run("adm").Args("policy", "add-cluster-role-to-user", "system:router", oc.Username()).Execute()
37-
o.Expect(err).NotTo(o.HaveOccurred())
38-
// Wait for the policy to be propagated
39-
testutil.WaitForClusterPolicyUpdate(oc.InternalKubeClient().Authorization(), "get", api.Resource("service"), true)
40-
o.Expect(err).NotTo(o.HaveOccurred())
41-
err = oc.Run("new-app").Args("-f", configPath, "-p", "IMAGE="+imagePrefix+"-haproxy-router").Execute()
34+
err := oc.AsAdmin().Run("new-app").Args("-f", configPath, "-p", "IMAGE="+imagePrefix+"-haproxy-router").Execute()
4235
o.Expect(err).NotTo(o.HaveOccurred())
4336
})
4437

4538
g.Describe("The HAProxy router", func() {
46-
g.It("should appropriately serve a route that points to two services", func() {
39+
g.It("should serve a route that points to two services and respect weights", func() {
4740
defer func() {
48-
// This should be done if the test fails but
49-
// for now always dump the logs.
50-
// if g.CurrentGinkgoTestDescription().Failed
51-
dumpWeightedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
41+
if g.CurrentGinkgoTestDescription().Failed {
42+
dumpWeightedRouterLogs(oc, g.CurrentGinkgoTestDescription().FullTestText)
43+
}
5244
}()
5345
oc.SetOutputDir(exutil.TestContext.OutputDir)
5446
ns := oc.KubeFramework().Namespace.Name

‎test/extended/testdata/bindata.go

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/extended/testdata/scoped-router.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kind: Template
33
parameters:
44
- name: IMAGE
55
value: openshift/origin-haproxy-router:latest
6+
- name: SCOPE
7+
value: '["--name=test-scoped", "--namespace=$(POD_NAMESPACE)", "--loglevel=4", "--labels=select=first"]'
68
objects:
79
# a scoped router
810
- apiVersion: v1
@@ -22,7 +24,7 @@ objects:
2224
valueFrom:
2325
fieldRef:
2426
fieldPath: metadata.namespace
25-
args: ["--namespace=$(POD_NAMESPACE)", "--loglevel=4", "--labels=select=first"]
27+
args: "${{SCOPE}}"
2628
hostNetwork: false
2729
ports:
2830
- containerPort: 80
@@ -50,7 +52,7 @@ objects:
5052
valueFrom:
5153
fieldRef:
5254
fieldPath: metadata.namespace
53-
args: ["--namespace=$(POD_NAMESPACE)", "--loglevel=4", "--override-hostname", "--hostname-template=${name}-${namespace}.myapps.mycompany.com"]
55+
args: ["--name=test-override", "--namespace=$(POD_NAMESPACE)", "--loglevel=4", "--override-hostname", "--hostname-template=${name}-${namespace}.myapps.mycompany.com"]
5456
hostNetwork: false
5557
ports:
5658
- containerPort: 80

0 commit comments

Comments
 (0)