shaba/traefik
1
0
Fork 0
mirror of https://github.com/containous/traefik.git synced 2025-10-20 11:33:18 +03:00
Code Releases Activity

Merge branch 'v1.5' into master

Browse Source
This commit is contained in:
Fernandez Ludovic
2017-12-15 22:16:48 +01:00
parent 5f6c5025d5 b17d5b80b8
commit f6520727a3
44 changed files with 1035 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
provider/kubernetes/kubernetes_test.go
View File

@@ -608,7 +608,7 @@ func TestIngressAnnotations(t *testing.T) {
buildIngress(
iNamespace("testing"),
iAnnotation(annotationKubernetesIngressClass, "traefik"),
iAnnotation(label.TraefikFrontendRedirect, "https"),
iAnnotation(label.TraefikFrontendRedirectEntryPoint, "https"),
iRules(
iRule(
iHost("redirect"),
@@ -752,7 +752,7 @@ func TestIngressAnnotations(t *testing.T) {
),
frontend("redirect/https",
passHostHeader(),
redirect("https"),
redirectEntryPoint("https"),
routes(
route("/https", "PathPrefix:/https"),
route("redirect", "Host:redirect")),
@@ -1182,6 +1182,7 @@ func TestBasicAuthInTemplate(t *testing.T) {
require.NoError(t, err, "error loading ingresses")
actual = provider.loadConfig(*actual)
require.NotNil(t, actual)
got := actual.Frontends["basic/auth"].BasicAuth
if !reflect.DeepEqual(got, []string{"myUser:myEncodedPW"}) {
t.Fatalf("unexpected credentials: %+v", got)