Use edge tag of k8s-agents-operator

newrelic · May 16, 2024 · 1b806aa · 1b806aa
1 parent 456ffe6
commit 1b806aa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -29,6 +29,7 @@ on:
 
 env:
   INITCONTAINER_LANGUAGE: python
+  K8S_OPERATOR_IMAGE_TAG: edge
 
 jobs:
   test:
@@ -58,13 +59,16 @@ jobs:
       - name: Deploy New Relic k8s-agents-operator to minikube
         run: |
           helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator
-          helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator --namespace=default --set=licenseKey=${{ secrets.NEW_RELIC_LICENSE_KEY }}
+          helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \
+            --namespace=default \
+            --set=licenseKey=${{ secrets.NEW_RELIC_LICENSE_KEY }} \
+            --set=controllerManager.manager.image.tag=${{ env.K8S_OPERATOR_IMAGE_TAG }}
           sleep 5
           kubectl wait --for=condition=Ready -n default --all pods
 
       - name: Build init container
         run: |
-          minikube image build -t e2e/initcontainer-${{ env.INITCONTAINER_LANGUAGE }}:e2e ${{ env.INITCONTAINER_LANGUAGE }}/
+          minikube image build -t e2e/newrelic-${{ env.INITCONTAINER_LANGUAGE }}-init:e2e ${{ env.INITCONTAINER_LANGUAGE }}/
 
       - name: Build test app container
         run: |

diff --git a/tests/python/chart/templates/instrumentation.yaml b/tests/python/chart/templates/instrumentation.yaml
@@ -8,14 +8,10 @@ metadata:
   name: newrelic-instrumentation
 spec:
   python:
-    image: e2e/initcontainer-python:e2e
+    image: e2e/newrelic-python-init:e2e
     # Configure agent for testing using environment variables
     env:
       - name: NEW_RELIC_STARTUP_TIMEOUT
         value: "30"
       - name: NEW_RELIC_STARTUP_DEBUG
         value: "true"
-
-      # TODO: Remove these hacks
-      - name: NEW_RELIC_K8S_OPERATOR_ENABLED
-        value: "true"