Merge current v2.4 into master

2021-06-28 10:07:17 +02:00 · 2021-06-28 10:07:17 +02:00 · fc69f882c5
commit fc69f882c5
parent 838a8e18d3 6d8512bda0
17 changed files with 91 additions and 87 deletions
--- a/pkg/provider/kubernetes/crd/fixtures/with_tls_options.yml
+++ b/pkg/provider/kubernetes/crd/fixtures/with_tls_options.yml
@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: secretCA1
+  name: secret-ca1
  namespace: default

 data:
@ -11,7 +11,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: secretCA2
+  name: secret-ca2
  namespace: default

 data:
@ -32,8 +32,8 @@ spec:
    - TLS_RSA_WITH_AES_256_GCM_SHA384
  clientAuth:
    secretNames:
-      - secretCA1
-      - secretCA2
+      - secret-ca1
+      - secret-ca2
    clientAuthType: VerifyClientCertIfGiven
  preferServerCipherSuites: true