Skip to content

fix: IAM role cleanup order to prevent orphaned roles #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiyuan-he merged 1 commit into from
Dec 11, 2025
Merged

fix: IAM role cleanup order to prevent orphaned roles #516

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 33 additions & 24 deletions .github/workflows/java-eks-otlp-ocb-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,17 +342,37 @@ jobs:
echo "validation-result=failure" >> $GITHUB_OUTPUT
fi

- name: Clean up
# IAM service accounts must be deleted BEFORE the namespace is deleted,
# otherwise eksctl cannot find the K8s ServiceAccount and leaves the IAM role orphaned
- name: Remove aws access service account
if: always()
continue-on-error: true
timeout-minutes: 5
working-directory: terraform/java/eks-otlp-ocb/util
run: |
aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
kubectl delete ns ${{ env.SAMPLE_APP_NAMESPACE }}
eksctl delete iamserviceaccount --name cloudwatch-agent --namespace amazon-cloudwatch --cluster ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
kubectl delete ns opentelemetry-operator-system
aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
eksctl delete iamserviceaccount \
--name sa-${{ env.TESTING_ID }} \
--namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
--cluster ${{ env.CLUSTER_NAME }} \
--region ${{ env.E2E_TEST_AWS_REGION }}

- name: Remove Application Signals Collector IAM service account
if: always()
continue-on-error: true
run: |
eksctl delete iamserviceaccount \
--name appsignals-collector \
--namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
--cluster ${{ env.CLUSTER_NAME }} \
--region ${{ env.E2E_TEST_AWS_REGION }}

- name: Remove cloudwatch-agent IAM service account
if: always()
continue-on-error: true
run: |
eksctl delete iamserviceaccount \
--name cloudwatch-agent \
--namespace amazon-cloudwatch \
--cluster ${{ env.CLUSTER_NAME }} \
--region ${{ env.E2E_TEST_AWS_REGION }}

- name: Terraform destroy
if: always()
Expand All @@ -370,22 +390,11 @@ jobs:
-var="sample_app_image=${{ env.MAIN_SAMPLE_APP_IMAGE_ARN }}" \
-var="sample_remote_app_image=${{ env.REMOTE_SAMPLE_APP_IMAGE_ARN }}"

- name: Remove aws access service account
if: always()
continue-on-error: true
run: |
eksctl delete iamserviceaccount \
--name sa-${{ env.TESTING_ID }} \
--namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
--cluster ${{ env.CLUSTER_NAME }} \
--region ${{ env.E2E_TEST_AWS_REGION }}

- name: Remove Application Signals Collector IAM service account
- name: Clean up namespaces
if: always()
continue-on-error: true
timeout-minutes: 5
run: |
eksctl delete iamserviceaccount \
--name appsignals-collector \
--namespace ${{ env.SAMPLE_APP_NAMESPACE }} \
--cluster ${{ env.CLUSTER_NAME }} \
--region ${{ env.E2E_TEST_AWS_REGION }}
aws eks update-kubeconfig --name ${{ env.CLUSTER_NAME }} --region ${{ env.E2E_TEST_AWS_REGION }}
kubectl delete ns ${{ env.SAMPLE_APP_NAMESPACE }}
kubectl delete ns opentelemetry-operator-system