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

Fix NAT find based on #4572

This commit is contained in:
Mike Splain 2018-03-08 11:14:34 -05:00
parent 7bd39bd9e7
commit 4bd5797bb1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,10 +110,13 @@ func (e *NatGateway) Find(c *fi.Context) (*NatGateway, error) {
return nil, fmt.Errorf("found multiple elastic IPs attached to NatGateway %q", aws.StringValue(ngw.NatGatewayId)) return nil, fmt.Errorf("found multiple elastic IPs attached to NatGateway %q", aws.StringValue(ngw.NatGatewayId))
} }
// NATGateways don't have a Name (no tags), so we set the name to avoid spurious changes // NATGateways now have names and tags so lets pull from there instead.
actual.Name = e.Name actual.Name = findNameTag(ngw.Tags)
actual.Tags = intersectTags(ngw.Tags, e.Tags)
actual.Lifecycle = e.Lifecycle actual.Lifecycle = e.Lifecycle
actual.Shared = e.Shared
actual.AssociatedRouteTable = e.AssociatedRouteTable actual.AssociatedRouteTable = e.AssociatedRouteTable
e.ID = actual.ID e.ID = actual.ID