From cd68cbd3eaed32e27ad8cb967899a694fb9beae5 Mon Sep 17 00:00:00 2001 From: Romain Date: Thu, 24 Jun 2021 17:32:07 +0200 Subject: [PATCH] Fix: malformed Kubernetes resource names and references in tests --- .../crd/fixtures/tcp/with_bad_tls_options.yml | 10 +++++----- .../kubernetes/crd/fixtures/tcp/with_tls_options.yml | 8 ++++---- .../tcp/with_tls_options_and_specific_namespace.yml | 8 ++++---- .../kubernetes/crd/fixtures/with_bad_tls_options.yml | 10 +++++----- .../crd/fixtures/with_default_tls_options.yml | 8 ++++---- .../with_default_tls_options_default_namespace.yml | 8 ++++---- .../kubernetes/crd/fixtures/with_servers_transport.yml | 8 ++++---- .../kubernetes/crd/fixtures/with_tls_options.yml | 8 ++++---- .../with_tls_options_and_specific_namespace.yml | 8 ++++---- .../ingress/fixtures/TLS-support_ingress.yml | 4 ++-- .../kubernetes/ingress/fixtures/TLS-support_secret.yml | 2 +- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkg/provider/kubernetes/crd/fixtures/tcp/with_bad_tls_options.yml b/pkg/provider/kubernetes/crd/fixtures/tcp/with_bad_tls_options.yml index 9c2a82f42..5bb19f259 100644 --- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_bad_tls_options.yml +++ b/pkg/provider/kubernetes/crd/fixtures/tcp/with_bad_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,9 +32,9 @@ spec: - TLS_RSA_WITH_AES_256_GCM_SHA384 clientAuth: secretNames: - - secretCA1 - - secretUnknown - - emptySecret + - secret-ca1 + - secret-unknown + - empty-secret clientAuthType: VerifyClientCertIfGiven --- diff --git a/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options.yml b/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options.yml index 6f0c80143..f5ecab56c 100644 --- a/pkg/provider/kubernetes/crd/fixtures/tcp/with_tls_options.yml +++ b/pkg/provider/kubernetes/crd/fixtures/tcp/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 --- diff --git 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 index 518d8e1b8..27e34fcaf 100644 --- 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 @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: secretCA1 + name: secret-ca1 namespace: myns data: @@ -11,7 +11,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: secretCA2 + name: secret-ca2 namespace: myns data: @@ -32,8 +32,8 @@ spec: - TLS_RSA_WITH_AES_256_GCM_SHA384 clientAuth: secretNames: - - secretCA1 - - secretCA2 + - secret-ca1 + - secret-ca2 clientAuthType: VerifyClientCertIfGiven --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_bad_tls_options.yml b/pkg/provider/kubernetes/crd/fixtures/with_bad_tls_options.yml index 94ea22e5f..2df4c3a67 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_bad_tls_options.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_bad_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: badSecret + name: bad-secret namespace: default data: @@ -32,9 +32,9 @@ spec: - TLS_RSA_WITH_AES_256_GCM_SHA384 clientAuth: secretNames: - - secretCA1 - - secretUnknown - - emptySecret + - secret-ca1 + - secret-unknown + - empty-secret clientAuthType: VerifyClientCertIfGiven --- diff --git a/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options.yml b/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options.yml index fb0a6a840..f88d0f89a 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: secretCAdefault1 + name: secret-ca-default1 namespace: foo data: @@ -11,7 +11,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: secretCAdefault2 + name: secret-ca-default2 namespace: foo data: @@ -32,8 +32,8 @@ spec: - TLS_RSA_WITH_AES_256_GCM_SHA384 clientAuth: secretNames: - - secretCAdefault1 - - secretCAdefault2 + - secret-ca-default1 + - secret-ca-default2 clientAuthType: VerifyClientCertIfGiven preferServerCipherSuites: true diff --git a/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options_default_namespace.yml b/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options_default_namespace.yml index d1c1d3885..3bc9b95f3 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options_default_namespace.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_default_tls_options_default_namespace.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 diff --git a/pkg/provider/kubernetes/crd/fixtures/with_servers_transport.yml b/pkg/provider/kubernetes/crd/fixtures/with_servers_transport.yml index 5bc2af3ee..61f7afdf6 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_servers_transport.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_servers_transport.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: rootCas1 + name: root-ca1 namespace: foo data: @@ -11,7 +11,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: rootCas2 + name: root-ca2 namespace: foo data: @@ -51,8 +51,8 @@ spec: insecureSkipVerify: true maxIdleConnsPerHost: 42 rootCAsSecrets: - - rootCas1 - - rootCas2 + - root-ca1 + - root-ca2 certificatesSecrets: - mtls1 - mtls2 diff --git a/pkg/provider/kubernetes/crd/fixtures/with_tls_options.yml b/pkg/provider/kubernetes/crd/fixtures/with_tls_options.yml index a5dd706b8..86027a800 100644 --- 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 diff --git a/pkg/provider/kubernetes/crd/fixtures/with_tls_options_and_specific_namespace.yml b/pkg/provider/kubernetes/crd/fixtures/with_tls_options_and_specific_namespace.yml index e7e56e43f..eec9d6fd1 100644 --- a/pkg/provider/kubernetes/crd/fixtures/with_tls_options_and_specific_namespace.yml +++ b/pkg/provider/kubernetes/crd/fixtures/with_tls_options_and_specific_namespace.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: secretCA1 + name: secret-ca1 namespace: myns data: @@ -11,7 +11,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: secretCA2 + name: secret-ca2 namespace: myns data: @@ -32,8 +32,8 @@ spec: - TLS_RSA_WITH_AES_256_GCM_SHA384 clientAuth: secretNames: - - secretCA1 - - secretCA2 + - secret-ca1 + - secret-ca2 clientAuthType: VerifyClientCertIfGiven --- diff --git a/pkg/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml index df59838ff..e5f39fc91 100644 --- a/pkg/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml +++ b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_ingress.yml @@ -8,7 +8,7 @@ metadata: spec: tls: - - secretName: myTlsSecret + - secretName: my-tls-secret rules: - host: example.com http: @@ -27,7 +27,7 @@ metadata: spec: tls: - - secretName: myUndefinedSecret + - secretName: my-undefined-secret rules: - host: example.fail http: diff --git a/pkg/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml index 5227af4a1..77df8ed37 100644 --- a/pkg/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml +++ b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_secret.yml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: myTlsSecret + name: my-tls-secret namespace: testing data: