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

@@ -65,12 +65,10 @@ jobs:
         id: job-started
         run: echo "job-started=true" >> $GITHUB_OUTPUT
 
-      # TODO: Put back namespace
       - 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:
@@ -141,20 +139,21 @@ jobs:
         run: kubectl get namespace | awk '/^ns-[0-9]+-[0-9]+/{print $1}' | xargs --no-run-if-empty kubectl delete namespace
 
       # Set up App Signals permissions and resources
+      # Renamed `service-account` to `SA` to get under 128 character limit for CFN stack names, which includes the namespace
       - name: Create role for AWS access from the sample app
         id: create_service_account
         uses: ./.github/workflows/actions/execute_and_retry
         with:
           command: "eksctl create iamserviceaccount \
-            --name service-account-${{ env.TESTING_ID }} \
+            --name SA-${{ env.TESTING_ID }} \
             --namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
             --cluster ${{ env.CLUSTER_NAME }} \
             --role-name eks-s3-access-${{ env.TESTING_ID }} \
             --attach-policy-arn arn:aws:iam::aws:policy/AmazonS3ReadOnlyAccess \
             --region ${{ env.E2E_TEST_AWS_REGION }} \
             --approve"
           cleanup: "eksctl delete iamserviceaccount \
-            --name service-account-${{ env.TESTING_ID }} \
+            --name SA-${{ env.TESTING_ID }} \
             --namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
             --cluster ${{ env.CLUSTER_NAME }} \
             --region ${{ env.E2E_TEST_AWS_REGION }}"
@@ -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 }}"
@@ -214,7 +214,7 @@ jobs:
               -var=\"eks_cluster_name=${{ env.CLUSTER_NAME }}\" \
               -var=\"eks_cluster_context_name=$(kubectl config current-context)\" \
               -var=\"test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}\" \
-              -var=\"service_account_aws_access=service-account-${{ env.TESTING_ID }}\" \
+              -var=\"service_account_aws_access=SA-${{ env.TESTING_ID }}\" \
               -var=\"sample_app_image=${{ env.MAIN_SAMPLE_APP_IMAGE_ARN }}\" \
               -var=\"sample_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}\" \
               -var='account_id=${{ env.ACCOUNT_ID }}'"
@@ -224,7 +224,7 @@ jobs:
             -var=\"kube_directory_path=${{ github.workspace }}/.kube\" \
             -var=\"eks_cluster_name=${{ env.CLUSTER_NAME }}\" \
             -var=\"test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}\" \
-            -var=\"service_account_aws_access=service-account-${{ env.TESTING_ID }}\" \
+            -var=\"service_account_aws_access=SA-${{ env.TESTING_ID }}\" \
             -var=\"sample_app_image=${{ env.MAIN_SAMPLE_APP_IMAGE_ARN }}\" \
             -var=\"sample_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}\""
           max_retry: 2
@@ -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
@@ -360,7 +355,7 @@ jobs:
             -var="kube_directory_path=${{ github.workspace }}/.kube" \
             -var="eks_cluster_name=${{ env.CLUSTER_NAME }}" \
             -var="test_namespace=${{ env.SAMPLE_APP_NAMESPACE }}" \
-            -var="service_account_aws_access=service-account-${{ env.TESTING_ID }}" \
+            -var="service_account_aws_access=SA-${{ env.TESTING_ID }}" \
             -var="sample_app_image=${{ env.MAIN_SAMPLE_APP_IMAGE_ARN }}" \
             -var="sample_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}"
 
@@ -369,7 +364,7 @@ jobs:
         continue-on-error: true
         run: |
           eksctl delete iamserviceaccount \
-          --name service-account-${{ env.TESTING_ID }} \
+          --name SA-${{ env.TESTING_ID }} \
           --namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
           --cluster ${{ env.CLUSTER_NAME }} \
           --region ${{ env.E2E_TEST_AWS_REGION }}

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