Add more K8s Unit Tests
This commit is contained in:
Daniel Tomcej
Traefiker Bot
parent
6ef0e6791b
commit
b2a57ca1f3
|
|
@ -521,8 +521,6 @@ func getRuleForPath(pa extensionsv1beta1.HTTPIngressPath, i *extensionsv1beta1.I
|
|||
case ruleTypePath, ruleTypePathPrefix, ruleTypePathStrip, ruleTypePathPrefixStrip:
|
||||
case ruleTypeReplacePath:
|
||||
log.Warnf("Using %s as %s will be deprecated in the future. Please use the %s annotation instead", ruleType, annotationKubernetesRuleType, annotationKubernetesRequestModifier)
|
||||
case "":
|
||||
return "", errors.New("cannot use empty rule")
|
||||
default:
|
||||
return "", fmt.Errorf("cannot use non-matcher rule: %q", ruleType)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,6 +45,11 @@ func TestLoadIngresses(t *testing.T) {
|
|||
onePath(iBackend("service6", intstr.FromInt(80))),
|
||||
),
|
||||
),
|
||||
iRule(iHost("*.service7"),
|
||||
iPaths(
|
||||
onePath(iBackend("service7", intstr.FromInt(80))),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
}
|
||||
|
|
@ -105,6 +110,14 @@ func TestLoadIngresses(t *testing.T) {
|
|||
clusterIP("10.0.0.6"),
|
||||
sPorts(sPort(80, ""))),
|
||||
),
|
||||
buildService(
|
||||
sName("service7"),
|
||||
sNamespace("testing"),
|
||||
sUID("7"),
|
||||
sSpec(
|
||||
clusterIP("10.0.0.7"),
|
||||
sPorts(sPort(80, ""))),
|
||||
),
|
||||
}
|
||||
|
||||
endpoints := []*corev1.Endpoints{
|
||||
|
|
@ -144,6 +157,14 @@ func TestLoadIngresses(t *testing.T) {
|
|||
eAddresses(eAddressWithTargetRef("http://10.15.0.3:80", "10.15.0.3")),
|
||||
ePorts(ePort(80, ""))),
|
||||
),
|
||||
buildEndpoint(
|
||||
eNamespace("testing"),
|
||||
eName("service7"),
|
||||
eUID("7"),
|
||||
subset(
|
||||
eAddresses(eAddress("10.10.0.7")),
|
||||
ePorts(ePort(80, ""))),
|
||||
),
|
||||
}
|
||||
|
||||
watchChan := make(chan interface{})
|
||||
|
|
@ -191,6 +212,12 @@ func TestLoadIngresses(t *testing.T) {
|
|||
server("http://10.15.0.3:80", weight(1)),
|
||||
),
|
||||
),
|
||||
backend("*.service7",
|
||||
lbMethod("wrr"),
|
||||
servers(
|
||||
server("http://10.10.0.7:80", weight(1)),
|
||||
),
|
||||
),
|
||||
),
|
||||
frontends(
|
||||
frontend("foo/bar",
|
||||
|
|
@ -217,6 +244,10 @@ func TestLoadIngresses(t *testing.T) {
|
|||
passHostHeader(),
|
||||
routes(route("service6", "Host:service6")),
|
||||
),
|
||||
frontend("*.service7",
|
||||
passHostHeader(),
|
||||
routes(route("*.service7", "HostRegexp:{subdomain:[A-Za-z0-9-_]+}.service7")),
|
||||
),
|
||||
),
|
||||
)
|
||||
assert.Equal(t, expected, actual)
|
||||
|
|
@ -450,6 +481,10 @@ func TestRuleFails(t *testing.T) {
|
|||
ruletypeAnnotation: "ReplacePath",
|
||||
requestModifierAnnotation: "ReplacePathRegex:/foo /bar",
|
||||
},
|
||||
{
|
||||
desc: "Empty Rule",
|
||||
ruletypeAnnotation: " : /bar",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range testCases {
|
||||
|
|
@ -589,6 +624,10 @@ func TestModifierFails(t *testing.T) {
|
|||
desc: "Request modifier using unknown rule",
|
||||
requestModifierAnnotation: "Foo: /bar",
|
||||
},
|
||||
{
|
||||
desc: "Missing Rule",
|
||||
requestModifierAnnotation: " : /bar",
|
||||
},
|
||||
}
|
||||
|
||||
for _, test := range testCases {
|
||||
|
|
@ -3096,3 +3135,173 @@ func TestProviderNewK8sOutOfClusterClient(t *testing.T) {
|
|||
_, err := p.newK8sClient("")
|
||||
assert.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestAddGlobalBackendDuplicateFailures(t *testing.T) {
|
||||
testCases := []struct {
|
||||
desc string
|
||||
previousConfig *types.Configuration
|
||||
err string
|
||||
}{
|
||||
{
|
||||
desc: "Duplicate Frontend",
|
||||
previousConfig: buildConfiguration(
|
||||
frontends(
|
||||
frontend("global-default-backend",
|
||||
frontendName("global-default-frontend"),
|
||||
passHostHeader(),
|
||||
routes(
|
||||
route("/", "PathPrefix:/"),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
err: "duplicate frontend: global-default-frontend",
|
||||
},
|
||||
{
|
||||
desc: "Duplicate Backend",
|
||||
previousConfig: buildConfiguration(
|
||||
backends(
|
||||
backend("global-default-backend",
|
||||
lbMethod("wrr"),
|
||||
servers(
|
||||
server("http://10.10.0.1:8080", weight(1)),
|
||||
),
|
||||
),
|
||||
)),
|
||||
err: "duplicate backend: global-default-backend",
|
||||
},
|
||||
}
|
||||
|
||||
ingress := buildIngress(
|
||||
iNamespace("testing"),
|
||||
iSpecBackends(iSpecBackend(iIngressBackend("service1", intstr.FromInt(80)))),
|
||||
)
|
||||
|
||||
for _, test := range testCases {
|
||||
test := test
|
||||
t.Run(test.desc, func(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
watchChan := make(chan interface{})
|
||||
client := clientMock{
|
||||
watchChan: watchChan,
|
||||
}
|
||||
provider := Provider{}
|
||||
|
||||
err := provider.addGlobalBackend(client, ingress, test.previousConfig)
|
||||
assert.EqualError(t, err, test.err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestAddGlobalBackendServiceMissing(t *testing.T) {
|
||||
ingresses := buildIngress(
|
||||
iNamespace("testing"),
|
||||
iSpecBackends(iSpecBackend(iIngressBackend("service1", intstr.FromInt(80)))),
|
||||
)
|
||||
|
||||
config := buildConfiguration(
|
||||
frontends(),
|
||||
backends(),
|
||||
)
|
||||
watchChan := make(chan interface{})
|
||||
client := clientMock{
|
||||
watchChan: watchChan,
|
||||
}
|
||||
provider := Provider{}
|
||||
|
||||
err := provider.addGlobalBackend(client, ingresses, config)
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
||||
func TestAddGlobalBackendServiceAPIError(t *testing.T) {
|
||||
ingresses := buildIngress(
|
||||
iNamespace("testing"),
|
||||
iSpecBackends(iSpecBackend(iIngressBackend("service1", intstr.FromInt(80)))),
|
||||
)
|
||||
|
||||
config := buildConfiguration(
|
||||
frontends(),
|
||||
backends(),
|
||||
)
|
||||
|
||||
apiErr := errors.New("failed kube api call")
|
||||
|
||||
watchChan := make(chan interface{})
|
||||
client := clientMock{
|
||||
apiServiceError: apiErr,
|
||||
watchChan: watchChan,
|
||||
}
|
||||
provider := Provider{}
|
||||
err := provider.addGlobalBackend(client, ingresses, config)
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
||||
func TestAddGlobalBackendEndpointMissing(t *testing.T) {
|
||||
ingresses := buildIngress(
|
||||
iNamespace("testing"),
|
||||
iSpecBackends(iSpecBackend(iIngressBackend("service", intstr.FromInt(80)))),
|
||||
)
|
||||
|
||||
services := []*corev1.Service{
|
||||
buildService(
|
||||
sName("service"),
|
||||
sNamespace("testing"),
|
||||
sUID("1"),
|
||||
sSpec(
|
||||
clusterIP("10.0.0.1"),
|
||||
sPorts(sPort(80, "")),
|
||||
),
|
||||
),
|
||||
}
|
||||
|
||||
config := buildConfiguration(
|
||||
frontends(),
|
||||
backends(),
|
||||
)
|
||||
watchChan := make(chan interface{})
|
||||
client := clientMock{
|
||||
services: services,
|
||||
watchChan: watchChan,
|
||||
}
|
||||
provider := Provider{}
|
||||
|
||||
err := provider.addGlobalBackend(client, ingresses, config)
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
||||
func TestAddGlobalBackendEndpointAPIError(t *testing.T) {
|
||||
ingresses := buildIngress(
|
||||
iNamespace("testing"),
|
||||
iSpecBackends(iSpecBackend(iIngressBackend("service", intstr.FromInt(80)))),
|
||||
)
|
||||
|
||||
config := buildConfiguration(
|
||||
frontends(),
|
||||
backends(),
|
||||
)
|
||||
|
||||
services := []*corev1.Service{
|
||||
buildService(
|
||||
sName("service"),
|
||||
sNamespace("testing"),
|
||||
sUID("1"),
|
||||
sSpec(
|
||||
clusterIP("10.0.0.1"),
|
||||
sPorts(sPort(80, "")),
|
||||
),
|
||||
),
|
||||
}
|
||||
|
||||
apiErr := errors.New("failed kube api call")
|
||||
|
||||
watchChan := make(chan interface{})
|
||||
client := clientMock{
|
||||
apiEndpointsError: apiErr,
|
||||
services: services,
|
||||
watchChan: watchChan,
|
||||
}
|
||||
provider := Provider{}
|
||||
err := provider.addGlobalBackend(client, ingresses, config)
|
||||
assert.Error(t, err)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue