Skip to content

Commit 1a238da

Browse files
committed
(bug) report error upgrading helm chart
When an Helm chart is upgraded or downgraded, due to a bug Sveltos was ignoring errors and mark upgrade/downgraded as completed. This PR fixes this.
1 parent bf907e1 commit 1a238da

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

controllers/handlers_helm.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,9 +1286,9 @@ func upgradeRelease(ctx context.Context, clusterSummary *configv1beta1.ClusterSu
12861286
_, err = upgradeClient.RunWithContext(ctxWithTimeout, requestedChart.ReleaseName, chartRequested, values)
12871287
if err != nil {
12881288
logger.V(logs.LogInfo).Info(fmt.Sprintf("failed to upgrade: %v", err))
1289-
currentRelease, err := getCurrentRelease(requestedChart.ReleaseName, requestedChart.ReleaseNamespace,
1289+
currentRelease, getErr := getCurrentRelease(requestedChart.ReleaseName, requestedChart.ReleaseNamespace,
12901290
kubeconfig, registryOptions, getEnableClientCacheValue(requestedChart.Options))
1291-
if err == nil && currentRelease.Info.Status.IsPending() {
1291+
if getErr == nil && currentRelease.Info.Status.IsPending() {
12921292
// This error: "another operation (install/upgrade/rollback) is in progress"
12931293
// With Sveltos this error should never happen. A previous check ensures that only one
12941294
// ClusterProfile/Profile can manage a Helm Chart with a given name in a specific namespace within

controllers/utils.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,8 +551,6 @@ func removeStaleResourceSummary(ctx context.Context, clusterNamespace, clusterNa
551551
},
552552
}
553553

554-
logger.V(logsettings.LogInfo).Info(fmt.Sprintf("MGIANLUC %v", rsListOptions))
555-
556554
resourceSummaries := &libsveltosv1beta1.ResourceSummaryList{}
557555
err := c.List(ctx, resourceSummaries, rsListOptions...)
558556
if err != nil {

0 commit comments

Comments
 (0)