From f028c0b5e85fb06063a1176537133f029d6412dd Mon Sep 17 00:00:00 2001 From: Shiv Bhosale Date: Mon, 2 Jun 2025 11:44:44 -0700 Subject: [PATCH 1/2] delete node-roles after ASGs have been deleted --- .../tasks/teardown/awscli-eks.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml index cf2d72bf..c6c2ba45 100644 --- a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml +++ b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml @@ -59,18 +59,6 @@ spec: echo "Role $PIA_ROLE_NAME does not exist, no action needed." fi done - - name: teardown-eks-role-stack - image: alpine/k8s:1.23.7 - script: | - aws cloudformation delete-stack --stack-name $(params.service-role-stack-name) - aws cloudformation delete-stack --stack-name $(params.node-role-stack-name) - aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name) - - name: send-slack-notification - image: alpine/k8s:1.23.7 - script: | - if [ -n "$(params.slack-hook)" ]; then - curl -H "Content-type: application/json" --data '{"Message": "$(params.slack-message)"}' -X POST $(params.slack-hook) - fi - name: awscli-delete-asg image: alpine/k8s:1.23.7 script: | @@ -109,6 +97,18 @@ spec: done echo "All matching stacks have been deleted!" + - name: teardown-eks-role-stack + image: alpine/k8s:1.23.7 + script: | + aws cloudformation delete-stack --stack-name $(params.service-role-stack-name) + aws cloudformation delete-stack --stack-name $(params.node-role-stack-name) + aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name) + - name: send-slack-notification + image: alpine/k8s:1.23.7 + script: | + if [ -n "$(params.slack-hook)" ]; then + curl -H "Content-type: application/json" --data '{"Message": "$(params.slack-message)"}' -X POST $(params.slack-hook) + fi - name: awscli-delete-vpc image: alpine/k8s:1.23.7 script: | From 9c948485cdc1b8754190267f78c2bc9e4792447e Mon Sep 17 00:00:00 2001 From: Shiv Bhosale Date: Mon, 2 Jun 2025 12:07:07 -0700 Subject: [PATCH 2/2] moved slack notif to the bottom --- .../tekton-resources/tasks/teardown/awscli-eks.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml index c6c2ba45..d7aa3ad4 100644 --- a/tests/tekton-resources/tasks/teardown/awscli-eks.yaml +++ b/tests/tekton-resources/tasks/teardown/awscli-eks.yaml @@ -103,12 +103,6 @@ spec: aws cloudformation delete-stack --stack-name $(params.service-role-stack-name) aws cloudformation delete-stack --stack-name $(params.node-role-stack-name) aws cloudformation delete-stack --stack-name $(params.launch-template-stack-name) - - name: send-slack-notification - image: alpine/k8s:1.23.7 - script: | - if [ -n "$(params.slack-hook)" ]; then - curl -H "Content-type: application/json" --data '{"Message": "$(params.slack-message)"}' -X POST $(params.slack-hook) - fi - name: awscli-delete-vpc image: alpine/k8s:1.23.7 script: | @@ -158,3 +152,9 @@ spec: else echo "Stack deleted successfully!" fi + - name: send-slack-notification + image: alpine/k8s:1.23.7 + script: | + if [ -n "$(params.slack-hook)" ]; then + curl -H "Content-type: application/json" --data '{"Message": "$(params.slack-message)"}' -X POST $(params.slack-hook) + fi \ No newline at end of file