homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'v1.5' into master

Browse source
This commit is contained in:
Fernandez Ludovic 2018-01-24 11:57:06 +01:00
commit c8446c2dc8
40 changed files with 493 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

8
provider/kubernetes/kubernetes_test.go
View file

@ -1323,8 +1323,8 @@ func TestTLSSecretLoad(t *testing.T) {
),
),
),
tlsConfigurations(
tlsConfiguration(
tlsesSection(
tlsSection(
tlsEntryPoints("ep1", "ep2"),
certificate(
"-----BEGIN CERTIFICATE-----\n-----END CERTIFICATE-----",
@ -1336,7 +1336,7 @@ func TestTLSSecretLoad(t *testing.T) {
assert.Equal(t, expected, actual)
}
func TestGetTLSConfigurations(t *testing.T) {
func TestGetTLS(t *testing.T) {
testIngressWithoutHostname := buildIngress(
iNamespace("testing"),
iRules(
@ -1503,7 +1503,7 @@ func TestGetTLSConfigurations(t *testing.T) {
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
tlsConfigs, err := getTLSConfigurations(test.ingress, test.client)
tlsConfigs, err := getTLS(test.ingress, test.client)
if test.errResult != "" {
assert.EqualError(t, err, test.errResult)