From db11e113d9e1edc6323afcc6876ffa1e2e5aca03 Mon Sep 17 00:00:00 2001 From: Kris Childress Date: Tue, 6 Dec 2016 23:49:08 -0700 Subject: [PATCH 1/2] Adding sanity check for natgateways --- upup/pkg/fi/cloudup/awstasks/natgateway.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/upup/pkg/fi/cloudup/awstasks/natgateway.go b/upup/pkg/fi/cloudup/awstasks/natgateway.go index d1e0809870..fa809b74d2 100644 --- a/upup/pkg/fi/cloudup/awstasks/natgateway.go +++ b/upup/pkg/fi/cloudup/awstasks/natgateway.go @@ -48,6 +48,9 @@ func (e *NatGateway) Find(c *fi.Context) (*NatGateway, error) { if id == nil && e.Subnet != nil { var filters []*ec2.Filter filters = append(filters, awsup.NewEC2Filter("key", "AssociatedNatgateway")) + if e.Subnet.ID == nil { + return nil, nil + } filters = append(filters, awsup.NewEC2Filter("resource-id", *e.Subnet.ID)) request := &ec2.DescribeTagsInput{ From 7377250a1307757432158d9f61ab932d3a39d8ad Mon Sep 17 00:00:00 2001 From: Kris Childress Date: Wed, 7 Dec 2016 00:13:26 -0700 Subject: [PATCH 2/2] logging --- _vendor/k8s.io/kubernetes | 2 +- upup/pkg/fi/cloudup/awstasks/natgateway.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/_vendor/k8s.io/kubernetes b/_vendor/k8s.io/kubernetes index 5b9ef41732..82c2538cf7 160000 --- a/_vendor/k8s.io/kubernetes +++ b/_vendor/k8s.io/kubernetes @@ -1 +1 @@ -Subproject commit 5b9ef417329fea35e35f510ede2042ad6386dd49 +Subproject commit 82c2538cf7541383a3d203e1d850331a507bc80c diff --git a/upup/pkg/fi/cloudup/awstasks/natgateway.go b/upup/pkg/fi/cloudup/awstasks/natgateway.go index fa809b74d2..0fb3e50b64 100644 --- a/upup/pkg/fi/cloudup/awstasks/natgateway.go +++ b/upup/pkg/fi/cloudup/awstasks/natgateway.go @@ -49,6 +49,7 @@ func (e *NatGateway) Find(c *fi.Context) (*NatGateway, error) { var filters []*ec2.Filter 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))