Merge pull request #10086 from justinsb/fix_9992

Ignore changes to ForAPIServer field
kubernetes · Oct 23, 2020 · bbcb966 · bbcb966
2 parents 4c4cd50 + 712f901
commit bbcb966
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/upup/pkg/fi/cloudup/alitasks/loadbalancer.go b/upup/pkg/fi/cloudup/alitasks/loadbalancer.go
@@ -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
 }
 

diff --git a/upup/pkg/fi/cloudup/awstasks/load_balancer.go b/upup/pkg/fi/cloudup/awstasks/load_balancer.go
@@ -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 {

diff --git a/upup/pkg/fi/cloudup/dotasks/loadbalancer.go b/upup/pkg/fi/cloudup/dotasks/loadbalancer.go
@@ -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
 }