tidy up secrets for dos and prometheus

nginx · Dec 19, 2024 · ba45012 · ba45012
1 parent 657a99a
commit ba45012
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 20 deletions.
diff --git a/examples/common-secrets/dos-secret-cafe.example.com.yaml b/examples/common-secrets/dos-secret-cafe.example.com.yaml
diff --git a/examples/common-secrets/prometheus-test-secret-cafe.example.com.yaml b/examples/common-secrets/prometheus-test-secret-cafe.example.com.yaml
diff --git a/tests/data/dos/dos-secret.yaml b/tests/data/dos/dos-secret.yaml
diff --git a/tests/data/dos/tls-secret.yaml b/tests/data/dos/tls-secret.yaml
@@ -0,0 +1 @@
+../../../examples/common-secrets/tls-secret-cafe.example.com.yaml
diff --git a/tests/data/prometheus/secret.yaml b/tests/data/prometheus/secret.yaml
@@ -1 +1 @@
-../../../examples/common-secrets/prometheus-test-secret-cafe.example.com.yaml
+../../../examples/common-secrets/tls-secret-cafe.example.com.yaml
diff --git a/tests/suite/test_dos.py b/tests/suite/test_dos.py
@@ -106,7 +106,7 @@ def dos_setup(
     )
 
     print("------------------------- Deploy Secret -----------------------------")
-    src_sec_yaml = f"{TEST_DATA}/dos/dos-secret.yaml"
+    src_sec_yaml = f"{TEST_DATA}/dos/tls-secret.yaml"
     create_items_from_yaml(kube_apis, src_sec_yaml, test_namespace)
 
     print("------------------------- Deploy logconf -----------------------------")

diff --git a/tests/suite/test_prometheus_metrics.py b/tests/suite/test_prometheus_metrics.py
@@ -166,7 +166,7 @@ def test_latency_metrics(
                     "extra_args": [
                         "-enable-prometheus-metrics",
                         "-enable-latency-metrics",
-                        "-prometheus-tls-secret=nginx-ingress/prometheus-test-secret",
+                        "-prometheus-tls-secret=nginx-ingress/tls-secret",
                     ]
                 },
                 [
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../../../examples/common-secrets/tls-secret-cafe.example.com.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../../../examples/common-secrets/prometheus-test-secret-cafe.example.com.yaml
		../../../examples/common-secrets/tls-secret-cafe.example.com.yaml