kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1432 from justinsb/fix_1427 

Cleanup of bastion IAM & Route53 resources
This commit is contained in:
Kris Nova 2017-01-10 20:45:57 -07:00 committed by GitHub
parent 2c180cb63e 4280bc206c
commit f4c9027e47
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
upup/pkg/kutil/delete_cluster.go
View File

@ -1815,7 +1815,7 @@ func ListRoute53Records(cloud fi.Cloud, clusterName string) ([]*ResourceTracker,
remove := false
// TODO: Compute the actual set of names?
if prefix == ".api" || prefix == ".api.internal" {
if prefix == ".api" || prefix == ".api.internal" || prefix == ".bastion" {
remove = true
} else if strings.HasPrefix(prefix, ".etcd-") {
remove = true
@ -1900,6 +1900,7 @@ func ListIAMRoles(cloud fi.Cloud, clusterName string) ([]*ResourceTracker, error
remove := make(map[string]bool)
remove["masters."+clusterName] = true
remove["nodes."+clusterName] = true
remove["bastions."+clusterName] = true
var roles []*iam.Role
// Find roles matching remove map
@ -1977,6 +1978,7 @@ func ListIAMInstanceProfiles(cloud fi.Cloud, clusterName string) ([]*ResourceTra
remove := make(map[string]bool)
remove["masters."+clusterName] = true
remove["nodes."+clusterName] = true
remove["bastions."+clusterName] = true
var profiles []*iam.InstanceProfile