Merge pull request #25 from Jont828/get-release-error-fix

Fix nil pointer issue when trying to check if a Helm release exists
kubernetes-sigs · Feb 18, 2023 · 3bfa919 · 3bfa919
2 parents db3d9e5 + 5416108
commit 3bfa919
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/internal/helm_operations.go b/internal/helm_operations.go
@@ -113,12 +113,16 @@ func InstallOrUpgradeHelmRelease(ctx context.Context, kubeconfig string, spec ad
 	// historyClient.Max = 1
 	// if _, err := historyClient.Run(spec.ReleaseName); err == helmDriver.ErrReleaseNotFound {
 	existingRelease, err := GetHelmRelease(ctx, kubeconfig, spec)
-	if err == helmDriver.ErrReleaseNotFound {
-		release, err := InstallHelmRelease(ctx, kubeconfig, spec)
-		if err != nil {
-			return nil, false, err
+	if err != nil {
+		if err == helmDriver.ErrReleaseNotFound {
+			release, err := InstallHelmRelease(ctx, kubeconfig, spec)
+			if err != nil {
+				return nil, false, err
+			}
+			return release, true, nil
 		}
-		return release, true, nil
+
+		return nil, false, err
 	}
 
 	return UpgradeHelmReleaseIfChanged(ctx, kubeconfig, spec, existingRelease)