Skip to content

Commit 235e3d4

Browse files
authored
Set correct labels on helm release during upgrade (#1017)
Write the correct label set to the helm release. This commit fixes an issue where the upgrades get wedged after the first upgrade when following legacy upgade semantics because the resolver relied on inaccurate version data in the helm release label Signed-off-by: kevinrizza <[email protected]>
1 parent 7cc9872 commit 235e3d4

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

internal/controllers/clusterextension_controller.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,10 @@ func (r *ClusterExtensionReconciler) reconcile(ctx context.Context, ext *ocv1alp
362362
return ctrl.Result{}, err
363363
}
364364
case stateNeedsUpgrade:
365-
rel, err = ac.Upgrade(ext.GetName(), ext.Spec.InstallNamespace, chrt, values, helmclient.AppendUpgradePostRenderer(post))
365+
rel, err = ac.Upgrade(ext.GetName(), ext.Spec.InstallNamespace, chrt, values, func(upgrade *action.Upgrade) error {
366+
upgrade.Labels = map[string]string{labels.BundleNameKey: bundle.Name, labels.PackageNameKey: bundle.Package, labels.BundleVersionKey: bundleVersion.String()}
367+
return nil
368+
}, helmclient.AppendUpgradePostRenderer(post))
366369
if err != nil {
367370
setInstalledStatusConditionFailed(ext, fmt.Sprintf("%s:%v", ocv1alpha1.ReasonUpgradeFailed, err))
368371
return ctrl.Result{}, err

0 commit comments

Comments
 (0)