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

Merge pull request #1084 from DualSpark/nat-gateway-sanity-check 

Adding sanity check for natgateways
This commit is contained in:
Justin Santa Barbara 2016-12-07 11:05:15 -05:00 committed by GitHub
parent b6c9525933 7377250a13
commit 0e7ab42eb7
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_vendor/k8s.io/kubernetes generated

@ -1 +1 @@
Subproject commit 5b9ef417329fea35e35f510ede2042ad6386dd49 Subproject commit 82c2538cf7541383a3d203e1d850331a507bc80c

4
upup/pkg/fi/cloudup/awstasks/natgateway.go
View File

@ -48,6 +48,10 @@ func (e *NatGateway) Find(c *fi.Context) (*NatGateway, error) {
if id == nil && e.Subnet != nil { if id == nil && e.Subnet != nil {
var filters []*ec2.Filter var filters []*ec2.Filter
filters = append(filters, awsup.NewEC2Filter("key", "AssociatedNatgateway")) filters = append(filters, awsup.NewEC2Filter("key", "AssociatedNatgateway"))
if e.Subnet.ID == nil {
glog.V(2).Infof("Unable to find subnet, bypassing Find() for NGW")
return nil, nil
}
filters = append(filters, awsup.NewEC2Filter("resource-id", *e.Subnet.ID)) filters = append(filters, awsup.NewEC2Filter("resource-id", *e.Subnet.ID))
request := &ec2.DescribeTagsInput{ request := &ec2.DescribeTagsInput{