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

Automated cherry pick of #15585: Update Karpenter to v0.28.1 #15592

Merged
merged 3 commits into from
Jul 5, 2023
Merged

Automated cherry pick of #15585: Update Karpenter to v0.28.1 #15592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609fb6b
Update Karpenter to v0.28.1
hakman Jul 3, 2023
9553747
hack/update-expected.sh
hakman Jul 3, 2023
58bf642
Clear the errors if the apply after prune succeeds
hakman Jul 5, 2023
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
3 changes: 3 additions & 0 deletions channels/pkg/channels/addon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,9 @@ func (a *Addon) updateAddon(ctx context.Context, k8sClient kubernetes.Interface,
// If we failed to apply, but not prune, we should try to apply again
if err := applier.Apply(ctx, data); err != nil {
merr = multierr.Append(merr, fmt.Errorf("error applying update after prune: %w", err))
} else {
// If we succeeded to apply after prune, clear the errors
merr = nil
}
}

Expand Down
2 changes: 1 addition & 1 deletion .../update_cluster/karpenter/data/aws_s3_object_minimal.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
version: 9.99.0
- id: k8s-1.19
manifest: karpenter.sh/k8s-1.19.yaml
manifestHash: 0f922f2cfc90670293583bd428cd7ca393181fd8057cdd8382cbf247787f0c6c
manifestHash: f59d4c21751b3fc33c84e664fb41199b8efb58cc5976ade6e937abc109cb612b
name: karpenter.sh
prune:
kinds:
Expand Down
Loading
Loading