Merge pull request #38645 from zmerlynn/clean-dhcp-options

Automatic merge from submit-queue cluster/aws: Clean up dhcp-options **What this PR does / why we need it**: After adding the aws janitor, the thing we're consistently sweeping is the DhcpOptionSets created by cluster/aws/util.sh (and there were thousands on the first run). Fix it! **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note Fix an issue where AWS tear-down leaks an DHCP Option Set. ```

Merge pull request #38645 from zmerlynn/clean-dhcp-options
17de6861 · Kubernetes Submit Queue · GitHub · d5055d49 · 3e859837 · 17de6861
Commit 17de6861 authored Dec 12, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 12, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 0 deletions

util.sh cluster/aws/util.sh +15 -0

No files found.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -1489,6 +1489,21 @@ function kube-down {
    echo "has a name other than '${CLUSTER_ID}'." >&2
  fi
+  if [[ -z "${DHCP_OPTION_SET_ID:-}" ]]; then
+    dhcp_option_ids=$($AWS_CMD describe-dhcp-options \
+                               --output text \
+                               --filters Name=tag:Name,Values=kubernetes-dhcp-option-set \
+                                         Name=tag:KubernetesCluster,Values=${CLUSTER_ID} \
+                               --query DhcpOptions[].DhcpOptionsId \
+                      | tr "\t" "\n")
+    for dhcp_option_id in ${dhcp_option_ids}; do
+      echo "Deleting DHCP option set: ${dhcp_option_id}"
+      $AWS_CMD delete-dhcp-options --dhcp-options-id $dhcp_option_id > $LOG
+    done
+  else
+    echo "Skipping deletion of pre-existing DHCP option set: ${DHCP_OPTION_SET_ID}"
+  fi
  echo "Deleting IAM Instance profiles"
  delete-iam-profiles
 }