Fix: Handle empty chart directory correctly

Currently the return of helmChartNamePath is not checked on errors.
This means that the CSO tries to helm template the container which leads to cryptic error messages from helm.

This commit adds a check to the clusterstackrelease_controller.

Signed-off-by: Jan Klippel <[email protected]>

Author: jklippel

cs-dev/cs-ci.yaml

@@ -151,6 +151,20 @@ func (r *ClusterStackReleaseReconciler) Reconcile(ctx context.Context, req recon
 		return reconcile.Result{Requeue: true}, nil
 	}
 
+	// Check for helm charts in the release assets. If they are not present, then something went wrong.
+	if err := releaseAssets.CheckHelmCharts(); err != nil {
+		msg := fmt.Sprintf("failed to validate helm charts: %s", err.Error())
+		conditions.MarkFalse(
+			clusterStackRelease,
+			csov1alpha1.ClusterStackReleaseAssetsReadyCondition,
+			csov1alpha1.IssueWithReleaseAssetsReason,
+			clusterv1.ConditionSeverityError,
+			"%s", msg,
+		)
+		record.Warn(clusterStackRelease, "ValidateHelmChartFailed", msg)
+		return reconcile.Result{}, nil
+	}
+
 	conditions.MarkTrue(clusterStackRelease, csov1alpha1.ClusterStackReleaseAssetsReadyCondition)
 
 	kubeClient := r.KubeClientFactory.NewClient(req.Namespace, r.RESTConfig)
@@ -304,7 +318,10 @@ func (r *ClusterStackReleaseReconciler) templateAndApply(ctx context.Context, re
 
 // templateClusterClassHelmChart templates the clusterClass helm chart.
 func (*ClusterStackReleaseReconciler) templateClusterClassHelmChart(releaseAssets *release.Release, name, namespace string) ([]byte, error) {
-	clusterClassChart := releaseAssets.ClusterClassChartPath()
+	clusterClassChart, e := releaseAssets.ClusterClassChartPath()
+	if e != nil {
+		return nil, fmt.Errorf("failed to template clusterClass helm chart: %w", e)
+	}
 
 	splittedName := strings.Split(name, clusterstack.Separator)
 	releaseName := strings.Join(splittedName[0:4], clusterstack.Separator)

internal/controller/clusterstackrelease_controller.go

@@ -159,6 +159,11 @@ func ensureMetadata(downloadPath, metadataFileName string) (Metadata, error) {
 func (r *Release) CheckHelmCharts() error {
 	// check if the cluster class chart is present.
 	clusterClassChartName := r.clusterClassChartName()
+
+	if _, err := r.ClusterClassChartPath(); err != nil {
+		return fmt.Errorf("failed to validate cluster stack: %w", err)
+	}
+
 	clusterClassChartPath, err := r.helmChartNamePath(clusterClassChartName)
 	if err != nil {
 		return fmt.Errorf("failed to get cluster class chart path: %w", err)
@@ -172,12 +177,6 @@ func (r *Release) CheckHelmCharts() error {
 		if !os.IsNotExist(err) {
 			return fmt.Errorf("failed to verify the clusteraddon.yaml path %s with error: %w", clusterAddonPath, err)
 		}
-
-		// check if the cluster addon values file is present.
-		valuesPath := filepath.Join(r.LocalDownloadPath, ClusterAddonValuesName)
-		if _, err := os.Stat(valuesPath); err != nil {
-			return fmt.Errorf("failed to verify the cluster addon values path %s with error: %w", valuesPath, err)
-		}
 	}
 
 	// check if the cluster addon chart is present.
@@ -238,11 +237,11 @@ func (r *Release) clusterClassChartName() string {
 }
 
 // ClusterClassChartPath returns the absolute helm chart path for cluster class.
-func (r *Release) ClusterClassChartPath() string {
+func (r *Release) ClusterClassChartPath() (string, error) {
 	nameFilter := r.clusterClassChartName()
-	// we ignore the error here, since we already checked for the presence of the chart.
-	path, _ := r.helmChartNamePath(nameFilter)
-	return path
+
+	path, err := r.helmChartNamePath(nameFilter)
+	return path, err
 }
 
 // helmChartNamePath returns the helm chart name from the given path.