100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
EKS cleanup (#2163)
Eric Bariaux2d119b13ec3e
diff --git a/kubernetes/eks-cleanup-haproxy.sh b/kubernetes/eks-cleanup-haproxy.shindex 60c9af558..fd11a8f7b 100755--- a/kubernetes/eks-cleanup-haproxy.sh+++ b/kubernetes/eks-cleanup-haproxy.sh@@ -38,7 +38,7 @@ for peering_id in $VPC_PEERING_IDS; dodone# Give the AWS LB Controller time to delete the NLB after the Service is deleted-while aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?Type=='network']" 2>/dev/null | grep '"Code": "active"'; do+while aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?VpcId=='$CLUSTER_VPC_ID' && Type=='network']" 2>/dev/null | grep '"Code": "active"'; doecho "Waiting for load balancer to be deleted..."sleep 10donediff --git a/kubernetes/eks-cleanup.sh b/kubernetes/eks-cleanup.shindex 85b4ef0c3..491a28663 100755--- a/kubernetes/eks-cleanup.sh+++ b/kubernetes/eks-cleanup.sh@@ -2,6 +2,12 @@. ./eks-common.sh+CLUSTER_VPC_ID=$(aws eks describe-cluster --name $CLUSTER_NAME --query 'cluster.resourcesVpcConfig.vpcId' --output text --profile or)+if [ -z "$CLUSTER_VPC_ID" ] || [ "$CLUSTER_VPC_ID" = "None" ]; then+ echo "Error: Failed to retrieve VPC ID for cluster '$CLUSTER_NAME'. Aborting."+ exit 1+fi+CERTIFICATE_ARN=$(kubectl get ingress manager -o jsonpath='{.metadata.annotations.\alb\.ingress\.kubernetes\.io\/certificate-arn}')DNS_RECORD_NAME=$(aws acm describe-certificate --certificate-arn $CERTIFICATE_ARN --profile or --query "Certificate.DomainValidationOptions[0].ResourceRecord.Name")@@ -24,8 +30,8 @@ aws route53 change-resource-record-sets \'{"Changes": [ { "Action": "DELETE", "ResourceRecordSet": { "Name": '$DNS_RECORD_NAME', "Type": "CNAME", "TTL": 300, "ResourceRecords" : [ { "Value": '$DNS_RECORD_VALUE' } ] } } ]}' \--profile dnschg-DNS_NAME=$(aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?Type=='application'].DNSName | [0]")-HOSTED_ZONE_ID=$(aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?Type=='application'].CanonicalHostedZoneId | [0]")+DNS_NAME=$(aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?VpcId=='$CLUSTER_VPC_ID' && Type=='application'].DNSName | [0]")+HOSTED_ZONE_ID=$(aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?VpcId=='$CLUSTER_VPC_ID' && Type=='application'].CanonicalHostedZoneId | [0]")echo "Delete DNS record $FQDN"@@ -63,11 +69,6 @@ helm uninstall postgresqlecho "Delete VPC peerings"-CLUSTER_VPC_ID=$(aws eks describe-cluster --name $CLUSTER_NAME --query 'cluster.resourcesVpcConfig.vpcId' --output text --profile or)-if [ -z "$CLUSTER_VPC_ID" ] || [ "$CLUSTER_VPC_ID" = "None" ]; then- echo "Error: Failed to retrieve VPC ID for cluster '$CLUSTER_NAME'. Aborting."- exit 1-fiVPC_PEERING_IDS=$(aws ec2 describe-vpc-peering-connections \--filters "Name=accepter-vpc-info.vpc-id,Values=$CLUSTER_VPC_ID" "Name=status-code,Values=active" \--query 'VpcPeeringConnections[*].VpcPeeringConnectionId' \@@ -80,7 +81,7 @@ for peering_id in $VPC_PEERING_IDS; dodone# Give the AWS LB Controller time to delete the ALB and NLB after the Service is deleted-while aws elbv2 describe-load-balancers --profile or --query "LoadBalancers" --output text 2>/dev/null | grep -q .; do+while aws elbv2 describe-load-balancers --profile or --query "LoadBalancers[?VpcId=='$CLUSTER_VPC_ID']" --output text 2>/dev/null | grep -q .; doecho "Waiting for load balancer to be deleted..."sleep 10done