Expand Client Auth Type configuration

2019-07-12 17:50:04 +02:00 · 2019-07-12 17:50:04 +02:00 · 2c7cfd1c68
commit 2c7cfd1c68
parent 7a4b4c941c
31 changed files with 304 additions and 151 deletions
--- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_bad_tls_options.yml
+++ b/pkg/provider/kubernetes/crd/fixtures/tcp/with_bad_tls_options.yml
@ -25,17 +25,17 @@ metadata:
  namespace: default

 spec:
-  minversion: VersionTLS12
-  snistrict: true
-  ciphersuites:
+  minVersion: VersionTLS12
+  sniStrict: true
+  cipherSuites:
    - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
    - TLS_RSA_WITH_AES_256_GCM_SHA384
-  clientca:
-    secretnames:
+  clientAuth:
+    secretNames:
      - secretCA1
      - secretUnknown
      - emptySecret
-    optional: true
+    clientAuthType: VerifyClientCertIfGiven

 ---
 apiVersion: v1
--- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options.yml
+++ b/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options.yml
@ -25,16 +25,16 @@ metadata:
  namespace: default

 spec:
-  minversion: VersionTLS12
-  snistrict: true
-  ciphersuites:
+  minVersion: VersionTLS12
+  sniStrict: true
+  cipherSuites:
    - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
    - TLS_RSA_WITH_AES_256_GCM_SHA384
-  clientca:
-    secretnames:
+  clientAuth:
+    secretNames:
      - secretCA1
      - secretCA2
-    optional: true
+    clientAuthType: VerifyClientCertIfGiven

 ---
 apiVersion: v1
--- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options_and_specific_namespace.yml
+++ b/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options_and_specific_namespace.yml
@ -25,16 +25,16 @@ metadata:
  namespace: myns

 spec:
-  minversion: VersionTLS12
-  snistrict: true
-  ciphersuites:
+  minVersion: VersionTLS12
+  sniStrict: true
+  cipherSuites:
    - TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
    - TLS_RSA_WITH_AES_256_GCM_SHA384
-  clientca:
-    secretnames:
+  clientAuth:
+    secretNames:
      - secretCA1
      - secretCA2
-    optional: true
+    clientAuthType: VerifyClientCertIfGiven

 ---
 apiVersion: v1
--- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_unknown_tls_options.yml
+++ b/pkg/provider/kubernetes/crd/fixtures/tcp/with_unknown_tls_options.yml
@ -6,7 +6,7 @@ metadata:
  namespace: default

 spec:
-  minversion: VersionTLS12
+  minVersion: VersionTLS12

 ---
 apiVersion: traefik.containo.us/v1alpha1
--- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_unknown_tls_options_namespace.yml
+++ b/pkg/provider/kubernetes/crd/fixtures/tcp/with_unknown_tls_options_namespace.yml
@ -6,7 +6,7 @@ metadata:
  namespace: default

 spec:
-  minversion: VersionTLS12
+  minVersion: VersionTLS12

 ---
 apiVersion: traefik.containo.us/v1alpha1