remove hardcoded namespace

Author: jj22ee

.github/workflows/java-eks-otlp-ocb-canary.yml

@@ -8,9 +8,13 @@
 ## Logs, metrics, and traces are all validated.
 name: Java EKS OTLP/OCB Enablement Canary Test
 on:
-  schedule:
-    - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
+  # TODO: Reintroduce cron-job
+  # schedule:
+  #   - cron: '12,37 * * * *' # run the workflow at 12th and 37th minute of every hour
   workflow_dispatch: # be able to run the workflow on demand
+  push:
+    branches:
+      - otlp-ocb
 
 permissions:
   id-token: write

.github/workflows/java-eks-otlp-ocb-test.yml

@@ -69,8 +69,7 @@ jobs:
       - name: Generate testing id and sample app namespace
         run: |
           echo TESTING_ID="${{ github.job }}-${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt }}" >> $GITHUB_ENV
-          echo SAMPLE_APP_NAMESPACE="default" >> $GITHUB_ENV
-      # echo SAMPLE_APP_NAMESPACE="ns-${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV
+          echo SAMPLE_APP_NAMESPACE="ns-${{ github.run_id }}-${{ github.run_number }}" >> $GITHUB_ENV
 
       - uses: actions/checkout@v4
         with:
@@ -196,6 +195,7 @@ jobs:
         with:
           command: "cd ${{ env.TEST_RESOURCES_FOLDER }}/terraform/java/eks-otlp-ocb/util && \
             sed -i -e 's/${E2E_TEST_AWS_REGION}/${{ env.E2E_TEST_AWS_REGION }}/g' ./appsignals-collector.yaml && \
+            sed -i -e 's/${SAMPLE_APP_NAMESPACE}/${{ env.SAMPLE_APP_NAMESPACE }}/g' ./appsignals-collector.yaml && \
             kubectl apply -f ./appsignals-collector.yaml -n ${{ env.SAMPLE_APP_NAMESPACE }}"
           cleanup: "kubectl delete -f ./appsignals-collector.yaml -n ${{ env.SAMPLE_APP_NAMESPACE }} && \
             aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}"
@@ -331,8 +331,6 @@ jobs:
             echo "validation-result=failure" >> $GITHUB_OUTPUT
           fi
 
-      # TODO: Simplify cleanup
-      # Can just use `kubectl delete ns -n ${{ env.SAMPLE_APP_NAMESPACE }}` once the namespace is no longer hardcoded
       - name: Clean up
         if: always()
         continue-on-error: true
@@ -341,11 +339,8 @@ jobs:
         run: |
           aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
           eksctl delete iamserviceaccount --name cloudwatch-agent --namespace amazon-cloudwatch --cluster ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
-          kubectl delete -f ./appsignals-collector.yaml -n ${{ env.SAMPLE_APP_NAMESPACE }}
           kubectl delete ns opentelemetry-operator-system
-          kubectl delete deploy --all -n ${{ env.SAMPLE_APP_NAMESPACE }}
-          kubectl delete service sample-remote-app-service -n ${{ env.SAMPLE_APP_NAMESPACE }}
-          kubectl delete service sample-app-service -n ${{ env.SAMPLE_APP_NAMESPACE }}
+          kubectl delete ns -n ${{ env.SAMPLE_APP_NAMESPACE }}
           aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
 
       - name: Terraform destroy

terraform/java/eks-otlp-ocb/util/appsignals-collector.yaml

@@ -33,7 +33,7 @@ metadata:
 subjects:
   - kind: ServiceAccount
     name: appsignals-collector
-    namespace: default
+    namespace: ${SAMPLE_APP_NAMESPACE}
 roleRef:
   kind: ClusterRole
   name: otel-collector-role