fix e2e test issues

1. use NAMESPACE var instead of hardcoding
2. make sure to require yq for the NGTS e2e

Signed-off-by: Ashley Davis <ashley.davis@cyberark.com>

Author: SgtCoDFish

hack/ark/test-e2e.sh

@@ -128,17 +128,17 @@ timeout 60 jq -n \
 
 # Query the Prometheus metrics endpoint to ensure it's working.
 kubectl get pod \
-        --namespace cyberark \
+        --namespace $NAMESPACE \
         --selector app.kubernetes.io/name=disco-agent \
         --output jsonpath={.items[*].metadata.name} \
-    | xargs -I{} kubectl get --raw /api/v1/namespaces/cyberark/pods/{}:8081/proxy/metrics \
+    | xargs -I{} kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/{}:8081/proxy/metrics \
     | grep '^process_'
 
 # Query the pprof endpoint to ensure it's working.
 kubectl get pod \
-        --namespace cyberark \
+        --namespace $NAMESPACE \
         --selector app.kubernetes.io/name=disco-agent \
         --output jsonpath={.items[*].metadata.name} \
-    | xargs -I{} kubectl get --raw /api/v1/namespaces/cyberark/pods/{}:8081/proxy/debug/pprof/cmdline \
+    | xargs -I{} kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/{}:8081/proxy/debug/pprof/cmdline \
     | xargs -0
 

hack/ngts/test-e2e.sh

@@ -130,18 +130,18 @@ timeout 120 jq -n \
 
 # Query the Prometheus metrics endpoint to ensure it's working.
 kubectl get pod \
-        --namespace ngts \
+        --namespace ${NAMESPACE} \
         --selector app.kubernetes.io/name=discovery-agent \
         --output jsonpath={.items[*].metadata.name} \
-    | xargs -I{} kubectl get --raw /api/v1/namespaces/ngts/pods/{}:8081/proxy/metrics \
+    | xargs -I{} kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/{}:8081/proxy/metrics \
     | grep '^process_'
 
 # Query the pprof endpoint to ensure it's working.
 kubectl get pod \
-        --namespace ngts \
+        --namespace ${NAMESPACE} \
         --selector app.kubernetes.io/name=discovery-agent \
         --output jsonpath={.items[*].metadata.name} \
-    | xargs -I{} kubectl get --raw /api/v1/namespaces/ngts/pods/{}:8081/proxy/debug/pprof/cmdline \
+    | xargs -I{} kubectl get --raw /api/v1/namespaces/$NAMESPACE/pods/{}:8081/proxy/debug/pprof/cmdline \
     | xargs -0
 
 # TODO: should call to SCM and verify that certs are actually uploaded

make/ngts/02_mod.mk

@@ -40,7 +40,7 @@ ngts-release:
 ## Run a basic E2E test on a Kind cluster
 ## See `hack/ngts/e2e.sh` for the full test script.
 ## @category NGTS Discovery Agent
-ngts-test-e2e: $(NEEDS_KIND) $(NEEDS_KUBECTL) $(NEEDS_HELM)
+ngts-test-e2e: $(NEEDS_KIND) $(NEEDS_KUBECTL) $(NEEDS_HELM) $(NEEDS_YQ)
 	PATH="$(bin_dir)/tools:${PATH}" ./hack/ngts/test-e2e.sh
 
 .PHONY: ngts-verify