Cherry pick of #7094 onto release-1.13#7100

Merged

k8s-ci-robot merged 3 commits intokubernetes:release-1.13from granular-ryanbonham:cherrypick_7094_release-1.13

Jun 5, 2019

+10-4

Commits on Jun 5, 2019

We are not deleting the primary ENI for private networks on termination, which will run accounts our of ENIs.
granular-ryanbonham
committed
Fix test to make sure we have delete_on_termination set.
granular-ryanbonham
committed
Make sure CF marks eni0 as delete_on_terminate
granular-ryanbonham
committed