From f96d5e49451e58797d36c723581a728f1ecb8001 Mon Sep 17 00:00:00 2001
From: Nitya Dhanushkodi <nitya@hashicorp.com>
Date: Wed, 7 Apr 2021 09:40:29 -0700
Subject: [PATCH] Enable metrics acceptance tests (#896)

Enable metrics acceptance tests
---
 .circleci/config.yml                                   |  4 ++--
 .../bases/static-metrics-app/kustomization.yaml        |  3 +++
 .../fixtures/bases/static-metrics-app/service.yaml     | 10 ++++++++++
 test/acceptance/tests/metrics/metrics_test.go          |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 test/acceptance/tests/fixtures/bases/static-metrics-app/kustomization.yaml
 create mode 100644 test/acceptance/tests/fixtures/bases/static-metrics-app/service.yaml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7460c5ecb..da0559f7b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -133,7 +133,7 @@ jobs:
             # exit early if any test fails (-failfast only works within a single
             # package).
             exit_code=0
-            pkgs=$(go list ./... | grep -v -E 'metrics'| circleci tests split)
+            pkgs=$(go list ./... | circleci tests split)
             echo "Running $pkgs"
             for pkg in $pkgs
             do
@@ -143,7 +143,7 @@ jobs:
                     -kubecontext="kind-dc1" \
                     -secondary-kubecontext="kind-dc2" \
                     -debug-directory="$TEST_RESULTS/debug" \
-                    -consul-k8s-image=ishustava/consul-k8s-dev:04-06-2021-8a9a841 # TODO: change once feature-tproxy consul-k8s branch is merged
+                    -consul-k8s-image="gcr.io/nitya-293720/consul-k8s-dev:tproxymetrics2" # TODO: change once feature-tproxy consul-k8s branch is merged
               then
                 echo "Tests in ${pkg} failed, aborting early"
                 exit_code=1
diff --git a/test/acceptance/tests/fixtures/bases/static-metrics-app/kustomization.yaml b/test/acceptance/tests/fixtures/bases/static-metrics-app/kustomization.yaml
new file mode 100644
index 000000000..6d1374a18
--- /dev/null
+++ b/test/acceptance/tests/fixtures/bases/static-metrics-app/kustomization.yaml
@@ -0,0 +1,3 @@
+resources:
+  - deployment.yaml
+  - service.yaml
diff --git a/test/acceptance/tests/fixtures/bases/static-metrics-app/service.yaml b/test/acceptance/tests/fixtures/bases/static-metrics-app/service.yaml
new file mode 100644
index 000000000..a37db2687
--- /dev/null
+++ b/test/acceptance/tests/fixtures/bases/static-metrics-app/service.yaml
@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: static-metrics-app
+spec:
+  selector:
+    app: static-metrics-app
+  ports:
+    - port: 80
+      targetPort: 9090
diff --git a/test/acceptance/tests/metrics/metrics_test.go b/test/acceptance/tests/metrics/metrics_test.go
index e9de76ae9..159e104a6 100644
--- a/test/acceptance/tests/metrics/metrics_test.go
+++ b/test/acceptance/tests/metrics/metrics_test.go
@@ -120,7 +120,7 @@ func TestAppMetrics(t *testing.T) {
 
 	// Deploy service that will emit app and envoy metrics at merged metrics endpoint
 	logger.Log(t, "creating static-metrics-app")
-	k8s.Deploy(t, ctx.KubectlOptions(t), cfg.NoCleanupOnFailure, cfg.DebugDirectory, "../fixtures/bases/static-metrics-app/deployment.yaml")
+	k8s.DeployKustomize(t, ctx.KubectlOptions(t), cfg.NoCleanupOnFailure, cfg.DebugDirectory, "../fixtures/bases/static-metrics-app")
 
 	// Create the static-client deployment so we can use it for in-cluster calls to metrics endpoints.
 	// This simulates queries that would be made by a prometheus server that runs externally to the consul