Skip to content

Commit bb2b76b

Browse files
authored
Merge pull request #1228 from gianlucam76/typo
Typo
2 parents 1ece863 + 339f73a commit bb2b76b

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

controllers/handlers_helm.go

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,9 @@ func handleCharts(ctx context.Context, clusterSummary *configv1beta1.ClusterSumm
492492

493493
releaseReports, chartDeployed, deployError := walkChartsAndDeploy(ctx, c, clusterSummary, kubeconfig, mgmtResources, logger)
494494
// Even if there is a deployment error do not return just yet. Update various status and clean stale resources.
495+
if deployError != nil {
496+
logger.V(logs.LogInfo).Info("MGIANLUC handleCharts failed")
497+
}
495498

496499
// If there was an helm release previous managed by this ClusterSummary and currently not referenced
497500
// anymore, such helm release has been successfully remove at this point. So
@@ -532,6 +535,7 @@ func handleCharts(ctx context.Context, clusterSummary *configv1beta1.ClusterSumm
532535
}
533536

534537
if deployError != nil {
538+
logger.V(logs.LogInfo).Info("MGIANLUC handleCharts failed")
535539
return deployError
536540
}
537541

@@ -595,6 +599,7 @@ func walkChartsAndDeploy(ctx context.Context, c client.Client, clusterSummary *c
595599
instantiatedChart.ChartName, instantiatedChart.ReleaseName, err)
596600
continue
597601
}
602+
logger.V(logs.LogInfo).Info("MGIANLUC walkChartsAndDeploy failed")
598603
return releaseReports, chartDeployed, err
599604
}
600605

@@ -790,6 +795,7 @@ func handleUpgrade(ctx context.Context, clusterSummary *configv1beta1.ClusterSum
790795
logger.V(logs.LogDebug).Info("upgrade helm release")
791796
err := doUpgradeRelease(ctx, clusterSummary, mgmtResources, currentChart, kubeconfig, registryOptions, logger)
792797
if err != nil {
798+
logger.V(logs.LogInfo).Info("MGIANLUC handleUpgrade failed")
793799
return nil, err
794800
}
795801
var message string
@@ -931,6 +937,7 @@ func handleChart(ctx context.Context, clusterSummary *configv1beta1.ClusterSumma
931937
report, err = handleUpgrade(ctx, clusterSummary, mgmtResources, currentChart, currentRelease, kubeconfig,
932938
registryOptions, logger)
933939
if err != nil {
940+
logger.V(logs.LogInfo).Info("MGIANLUC handleChart failed")
934941
return nil, nil, err
935942
}
936943
} else if shouldUninstall(currentRelease, currentChart) {
@@ -1295,7 +1302,7 @@ func upgradeRelease(ctx context.Context, clusterSummary *configv1beta1.ClusterSu
12951302
// a managed cluster.
12961303
// Ignore the recoverRelease result. Always return an error as we must install this release back
12971304
_ = recoverRelease(ctx, clusterSummary, requestedChart, kubeconfig, registryOptions, logger)
1298-
return fmt.Errorf("tried recovering by uininstalling first")
1305+
return fmt.Errorf("tried recovering by uninstalling first")
12991306
}
13001307
return err
13011308
}
@@ -1736,6 +1743,7 @@ func doUpgradeRelease(ctx context.Context, clusterSummary *configv1beta1.Cluster
17361743
err = upgradeRelease(ctx, clusterSummary, settings, requestedChart, kubeconfig, registryOptions,
17371744
values, mgmtResources, logger)
17381745
if err != nil {
1746+
logger.V(logs.LogInfo).Info("MGIANLUC upgradeRelease failed")
17391747
return err
17401748
}
17411749

0 commit comments

Comments
 (0)