Skip to content
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

Jump to bottom

Update firewalls in maintenance reconciliation #43

Merged
merged 17 commits into from
May 29, 2024
Merged

Update firewalls in maintenance reconciliation #43

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7312880
Fix OS image update not detected for versions without suffix..
Gerrit91 Aug 31, 2023
742783d
Adding cache.
Gerrit91 Sep 1, 2023
9aff591
Fix tests.
Gerrit91 Sep 1, 2023
1fa2203
Merge branch 'main' into fix-os-image-update
Gerrit91 Apr 23, 2024
1b1523a
Update.
Gerrit91 Apr 24, 2024
b980e36
Better condition.
Gerrit91 May 2, 2024
176db9e
Early return.
Gerrit91 May 2, 2024
fa2c3a6
Provide test.
Gerrit91 May 3, 2024
3107b07
Turn into own update controller.
Gerrit91 May 7, 2024
c340e81
Cleanup deployment-controller.
Gerrit91 May 7, 2024
cf227b1
Do not change condition.
Gerrit91 May 7, 2024
5d848ec
Forgot var renaming.
Gerrit91 May 7, 2024
a129aba
Make manifests.
Gerrit91 May 7, 2024
92b9101
Do not react on maintenance annotation.
Gerrit91 May 8, 2024
9e21905
Log healthcheck with debug level.
Gerrit91 May 10, 2024
1552595
Simplify
Gerrit91 May 27, 2024
cab45bd
Longer timeout.
Gerrit91 May 27, 2024
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
14 changes: 6 additions & 8 deletions controllers/deployment/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,15 +215,13 @@ func sizeHasChanged(newS *v2.FirewallSpec, oldS *v2.FirewallSpec) bool {
}

func osImageHasChanged(ctx context.Context, m metalgo.Client, newS *v2.FirewallSpec, oldS *v2.FirewallSpec) (bool, error) {
if newS.Image != oldS.Image {
image, err := m.Image().FindLatestImage(image.NewFindLatestImageParams().WithID(newS.Image).WithContext(ctx), nil)
if err != nil {
return false, fmt.Errorf("latest firewall image not found:%s %w", newS.Image, err)
}
image, err := m.Image().FindLatestImage(image.NewFindLatestImageParams().WithID(newS.Image).WithContext(ctx), nil)
Gerrit91 marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return false, fmt.Errorf("latest firewall image not found:%s %w", newS.Image, err)
}

if image.Payload != nil && image.Payload.ID != nil && *image.Payload.ID != oldS.Image {
return true, nil
}
if image.Payload != nil && image.Payload.ID != nil && *image.Payload.ID != oldS.Image {
return true, nil
}

return false, nil
Expand Down
Loading