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

Merge pull request #10086 from justinsb/fix_9992 

Ignore changes to ForAPIServer field
This commit is contained in:
Kubernetes Prow Robot 2020-10-23 11:43:02 -07:00 committed by GitHub
parent 4c4cd50e9c 712f901f61
commit bbcb966347
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
upup/pkg/fi/cloudup/alitasks/loadbalancer.go
View File

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

3
upup/pkg/fi/cloudup/awstasks/load_balancer.go
View File

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

11
upup/pkg/fi/cloudup/dotasks/loadbalancer.go
View File

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