Move deployment to helm

.github/workflows/python.yml

@@ -72,17 +72,6 @@ jobs:
         run: |
           minikube image build -t e2e/test-app-${{ env.INITCONTAINER_LANGUAGE }}:e2e tests/${{ env.INITCONTAINER_LANGUAGE }}/
 
-      - name: Deploy test app to minikube
-        run: |
-          kubectl apply -f tests/${{ env.INITCONTAINER_LANGUAGE }}/customresource.yaml -n default
-          kubectl apply -f tests/${{ env.INITCONTAINER_LANGUAGE }}/test_app_deployment.yaml -n default
-          sleep 5
-          kubectl wait --for=condition=Ready -n default --all pods
-
-      - name: Test
-        run: |
-          curl --fail-with-body $(minikube service test-app-${{ env.INITCONTAINER_LANGUAGE }}-service --url -n default)
-
       - name: Run e2e-test
         uses: newrelic/newrelic-integration-e2e-action@a97ced80a4841c8c6261d1f9dca6706b1d89acb1  # 1.11.0
         with:

tests/python/chart/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

tests/python/chart/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v2
+name: test-app-python
+description: A Helm chart for Kubernetes
+type: application
+version: 1.0.0
+appVersion: "1.0.0"

tests/python/test_app_deployment.yaml → tests/python/chart/templates/deployment.yaml

@@ -24,6 +24,8 @@ spec:
           env:
           - name: NEW_RELIC_APP_NAME
             value: k8s-e2e-test-app-python
+          - name: SCENARIO_TAG
+            value: {{ quote .Values.scenarioTag }}
 ---
 apiVersion: v1
 kind: Service

tests/python/chart/values.yaml

@@ -0,0 +1 @@
+scenarioTag: ""

tests/python/main.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import traceback
 
@@ -9,9 +10,11 @@
 @app.route("/")
 def hello_world():
     try:
-        from newrelic.agent import current_transaction
+        from newrelic.agent import current_transaction, add_custom_attribute
+
         assert current_transaction(), "No active transaction."
+        add_custom_attribute("testKey", os.getenv("NEW_RELIC_SCENARIO_TAG", "NOTSET"))
     except Exception:
         return "".join(traceback.format_exception(*sys.exc_info())), 417
 
-    return "<p>Hello, World!</p>"
+    return f"Hello, World!"

tests/python/test-specs.yml

@@ -4,6 +4,9 @@ description: |
 scenarios:
   - description: This scenario will verify that a transaction is reported by the test app after a curl request
     before:
+      - helm install test-python ./tests/python/chart/ --set=scenarioTag="${SCENARIO_TAG}" -n default
+      - sleep 5
+      - kubectl wait --for=condition=Ready -n default --all pods
       - curl --fail-with-body $(minikube service test-app-python-service --url -n default)
     tests:
       nrqls: