diff --git a/.github/workflows/nightly-cleanup.yml b/.github/workflows/nightly-cleanup.yml index fe2047fb11..83d6688ac5 100644 --- a/.github/workflows/nightly-cleanup.yml +++ b/.github/workflows/nightly-cleanup.yml @@ -1,14 +1,10 @@ # Dispatch to the consul-k8s-workflows with a nightly cron name: nightly-cleanup on: - push: - branches: - # REMOVE MEEEEE - Testing only - - "NET-8391_fix_eks_cleanup" - # schedule: - # # * is a special character in YAML so you have to quote this string - # # Run nightly at 12PM UTC/8AM EST/5AM PST - # - cron: '0 12 * * *' + schedule: + # * is a special character in YAML so you have to quote this string + # Run nightly at 12PM UTC/8AM EST/5AM PST + - cron: '0 12 * * *' # these should be the only settings that you will ever need to change env: diff --git a/hack/aws-acceptance-test-cleanup/main.go b/hack/aws-acceptance-test-cleanup/main.go index 7e934bb1af..c708940104 100644 --- a/hack/aws-acceptance-test-cleanup/main.go +++ b/hack/aws-acceptance-test-cleanup/main.go @@ -279,7 +279,7 @@ func realMain(ctx context.Context) error { vpcName, _ := vpcNameAndBuildURL(vpc) cluster, ok := toDeleteClusters[vpcName] if !ok { - fmt.Printf("Found no associated EKS cluster for VPC: %s\n", *vpc.VpcId) + fmt.Printf("Found no associated EKS cluster for VPC: %s\n", vpcName) } else { // Delete node groups. nodeGroups, err := eksClient.ListNodegroupsWithContext(ctx, &eks.ListNodegroupsInput{ @@ -382,7 +382,7 @@ func realMain(ctx context.Context) error { }, }, }) - + if err != nil { return err } @@ -495,7 +495,7 @@ func realMain(ctx context.Context) error { if err != nil { return err } - + for _, igw := range igws.InternetGateways { fmt.Printf("Internet gateway: Detaching from VPC... [id=%s]\n", *igw.InternetGatewayId) if err := destroyBackoff(ctx, "Internet Gateway", *igw.InternetGatewayId, func() error {