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

Merge pull request #4848 from justinsb/toolbox_dump_subnet_fix 

Fix toolbox dump bug: store subnet in resource
This commit is contained in:
k8s-ci-robot 2018-03-31 18:10:04 -07:00 committed by GitHub
parent 34a07d4c80 4498d23d22
commit ebae4ba447
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/resources/aws/aws.go
View File

@ -654,10 +654,11 @@ func ListSubnets(cloud fi.Cloud, clusterName string) ([]*resources.Resource, err
resourceTracker := &resources.Resource{ resourceTracker := &resources.Resource{
Name: FindName(subnet.Tags), Name: FindName(subnet.Tags),
ID: subnetID, ID: subnetID,
Type: "subnet", Type: ec2.ResourceTypeSubnet,
Deleter: DeleteSubnet, Deleter: DeleteSubnet,
Dumper: DumpSubnet, Dumper: DumpSubnet,
Shared: shared, Shared: shared,
Obj: subnet,
} }
resourceTracker.Blocks = append(resourceTracker.Blocks, "vpc:"+aws.StringValue(subnet.VpcId)) resourceTracker.Blocks = append(resourceTracker.Blocks, "vpc:"+aws.StringValue(subnet.VpcId))
resourceTrackers = append(resourceTrackers, resourceTracker) resourceTrackers = append(resourceTrackers, resourceTracker)