Add check that initcontainer is attached by operator

tests/Makefile

@@ -76,6 +76,8 @@ test: build-initcontainer build-testapp check-language-arg
 	helm install test-deployment ${REPO_ROOT}/tests/${INITCONTAINER_LANGUAGE}/chart/
 	sleep 3
 	kubectl wait --for=condition=Ready -n default --all pods
+# If jq is installed, check for the initcontainer to be visible on the pod spec
+	command -v jq && kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $$(echo "Operator failed to attach initcontainer." >&2; exit 1)
 	minikube service test-app-${INITCONTAINER_LANGUAGE}-service -n default
 
 # View test app container logs

tests/dotnet/test-specs.yml

@@ -6,6 +6,7 @@ scenarios:
       - helm install test-dotnet ./chart/ --set=scenarioTag="${SCENARIO_TAG}" -n default
       - sleep 5
       - kubectl wait --for=condition=Ready -n default --all pods
+      - kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $(echo "Operator failed to attach initcontainer." >&2; exit 1)
       - sleep 15 # give the agent time to connect
       - curl --fail-with-body $(minikube service test-app-dotnet-service --url -n default)/WeatherForecast
     tests:

tests/java/test-specs.yml

@@ -6,6 +6,7 @@ scenarios:
       - helm install test-java ./chart/ --set=scenarioTag="${SCENARIO_TAG}" -n default
       - sleep 120
       - kubectl wait --for=condition=Ready -n default --all pods
+      - kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $(echo "Operator failed to attach initcontainer." >&2; exit 1)
       - curl --fail-with-body $(minikube service test-app-java-service --url -n default)
     tests:
       nrqls:

tests/nodejs/test-specs.yml

@@ -6,6 +6,7 @@ scenarios:
       - helm install test-nodejs ./chart/ --set=scenarioTag="${SCENARIO_TAG}" -n default
       - sleep 5
       - kubectl wait --for=condition=Ready -n default --all pods
+      - kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $(echo "Operator failed to attach initcontainer." >&2; exit 1)
       - curl --fail-with-body $(minikube service test-app-nodejs-service --url -n default)
     tests:
       nrqls:

tests/php/test-specs.yml

@@ -6,6 +6,7 @@ scenarios:
       - helm install test-php ./chart/ --set=scenarioTag="${SCENARIO_TAG}" ${TEST_APP_HELM_CHART_ARGS} -n default
       - sleep 5
       - kubectl wait --for=condition=Ready -n default --all pods --timeout=2m
+      - kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $(echo "Operator failed to attach initcontainer." >&2; exit 1)
       - curl --fail-with-body $(minikube service test-app-php-service --url -n default)
       - sleep 5
       - curl --fail-with-body $(minikube service test-app-php-service --url -n default)

tests/python/test-specs.yml

@@ -6,6 +6,7 @@ scenarios:
       - helm install test-python ./chart/ --set=scenarioTag="${SCENARIO_TAG}" -n default
       - sleep 5
       - kubectl wait --for=condition=Ready -n default --all pods --timeout=2m
+      - kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $(echo "Operator failed to attach initcontainer." >&2; exit 1)
       - curl --fail-with-body $(minikube service test-app-python-service --url -n default)
     tests:
       nrqls:

tests/ruby/test-specs.yml

@@ -6,6 +6,7 @@ scenarios:
       - helm install test-ruby ./chart/ --set=scenarioTag="${SCENARIO_TAG}" -n default
       - sleep 5
       - kubectl wait --for=condition=Ready -n default --all pods
+      - kubectl get pods --output json | jq '.items[].spec.initContainers | select( . != null )[].name' | grep -q "newrelic-instrumentation-" || $(echo "Operator failed to attach initcontainer." >&2; exit 1)
       - curl --fail-with-body $(minikube service test-app-ruby-service --url -n default)/
     tests:
       nrqls: