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

Set the Shared field of RouteTable resources when listing

This commit is contained in:
georgebuckerfield 2017-11-17 17:27:16 +00:00
parent 1dcc4a0ef1
commit df550ec2b5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/resources/aws.go
View File

@ -220,7 +220,7 @@ func addUntaggedRouteTables(cloud awsup.AWSCloud, clusterName string, resources
continue continue
} }
t := buildTrackerForRouteTable(rt) t := buildTrackerForRouteTable(rt, clusterName)
if resources[t.Type+":"+t.ID] == nil { if resources[t.Type+":"+t.ID] == nil {
resources[t.Type+":"+t.ID] = t resources[t.Type+":"+t.ID] = t
} }
@ -973,19 +973,20 @@ func ListRouteTables(cloud fi.Cloud, clusterName string) ([]*Resource, error) {
var resourceTrackers []*Resource var resourceTrackers []*Resource
for _, rt := range routeTables { for _, rt := range routeTables {
resourceTracker := buildTrackerForRouteTable(rt) resourceTracker := buildTrackerForRouteTable(rt, clusterName)
resourceTrackers = append(resourceTrackers, resourceTracker) resourceTrackers = append(resourceTrackers, resourceTracker)
} }
return resourceTrackers, nil return resourceTrackers, nil
} }
func buildTrackerForRouteTable(rt *ec2.RouteTable) *Resource { func buildTrackerForRouteTable(rt *ec2.RouteTable, clusterName string) *Resource {
resourceTracker := &Resource{ resourceTracker := &Resource{
Name: FindName(rt.Tags), Name: FindName(rt.Tags),
ID: aws.StringValue(rt.RouteTableId), ID: aws.StringValue(rt.RouteTableId),
Type: ec2.ResourceTypeRouteTable, Type: ec2.ResourceTypeRouteTable,
Deleter: DeleteRouteTable, Deleter: DeleteRouteTable,
Shared: HasSharedTag(ec2.ResourceTypeRouteTable+":"+*rt.RouteTableId, rt.Tags, clusterName),
} }
var blocks []string var blocks []string