Ignore changes to ForAPIServer field

It's a system field, we should treat the value as matching.

Issue #9992
This commit is contained in:
Justin SB 2020-10-23 11:19:18 -04:00
parent fbb172c08c
commit 712f901f61
3 changed files with 11 additions and 4 deletions

View File

@ -104,6 +104,7 @@ func (l *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) {
// Ignore "system" fields
l.LoadbalancerId = actual.LoadbalancerId
actual.Lifecycle = l.Lifecycle
actual.ForAPIServer = l.ForAPIServer
return actual, nil
}

View File

@ -296,7 +296,10 @@ func (e *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) {
actual.DNSName = lb.DNSName
actual.HostedZoneId = lb.CanonicalHostedZoneNameID
actual.Scheme = lb.Scheme
// Ignore system fields
actual.Lifecycle = e.Lifecycle
actual.ForAPIServer = e.ForAPIServer
tagMap, err := describeLoadBalancerTags(cloud, []string{*lb.LoadBalancerName})
if err != nil {

View File

@ -67,10 +67,13 @@ func (lb *LoadBalancer) Find(c *fi.Context) (*LoadBalancer, error) {
}
return &LoadBalancer{
Name: fi.String(loadbalancer.Name),
ID: fi.String(loadbalancer.ID),
Lifecycle: lb.Lifecycle,
Region: fi.String(loadbalancer.Region.Slug),
Name: fi.String(loadbalancer.Name),
ID: fi.String(loadbalancer.ID),
Region: fi.String(loadbalancer.Region.Slug),
// Ignore system fields
Lifecycle: lb.Lifecycle,
ForAPIServer: lb.ForAPIServer,
}, nil
}