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

Merge pull request #15192 from olemarkus/channels-always-prune 

Always try to prune an addon even if applying updates fail
This commit is contained in:
Kubernetes Prow Robot 2023-03-04 01:02:57 -08:00 committed by GitHub
parent e4f56ad8fa 74a6a5a319
commit 40e9561266
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
channels/pkg/channels/addon.go
View File

@ -197,12 +197,26 @@ func (a *Addon) updateAddon(ctx context.Context, k8sClient kubernetes.Interface,
return fmt.Errorf("error reading manifest: %w", err)
}
if err := applier.Apply(ctx, data); err != nil {
return fmt.Errorf("error applying update from %q: %w", manifestURL, err)
var merr error
var applyError, pruneError error
if applyError = applier.Apply(ctx, data); applyError != nil {
merr = multierr.Append(merr, fmt.Errorf("error applying update: %w", applyError))
}
if err := pruner.Prune(ctx, data, a.Spec.Prune); err != nil {
return fmt.Errorf("error pruning manifest from %q: %w", manifestURL, err)
if pruneError = pruner.Prune(ctx, data, a.Spec.Prune); pruneError != nil {
merr = multierr.Append(merr, fmt.Errorf("error pruning manifest: %w", pruneError))
}
if applyError != nil && pruneError == nil {
// 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))
}
}
if merr != nil {
return fmt.Errorf("error updating addon from %q: %w", manifestURL, merr)
}
if err := a.AddNeedsUpdateLabel(ctx, k8sClient, required); err != nil {