Skip to content

Ignore changes to ForAPIServer field #10086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 23, 2020
Merged

Ignore changes to ForAPIServer field #10086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions upup/pkg/fi/cloudup/alitasks/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 3 additions & 0 deletions upup/pkg/fi/cloudup/awstasks/load_balancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
11 changes: 7 additions & 4 deletions upup/pkg/fi/cloudup/dotasks/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down