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 helm chart validation.

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

Author: jklippel

internal/controller/clusterstackrelease_controller.go

@@ -304,7 +304,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)
@@ -315,6 +318,7 @@ func (*ClusterStackReleaseReconciler) templateClusterClassHelmChart(releaseAsset
 	}
 
 	return template, nil
+
 }
 
 func helmTemplate(chartPath, releaseName, namespace string) ([]byte, error) {

pkg/release/release.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)
@@ -207,6 +212,9 @@ func (r *Release) Validate() error {
 	if err := r.ClusterStack.Version.Validate(); err != nil {
 		return fmt.Errorf("failed to validate cluster stack object: %w", err)
 	}
+	if err := r.CheckHelmCharts(); err != nil {
+		return fmt.Errorf("failed to validate cluster stack object: %w", err)
+	}
 	if err := r.Meta.Validate(); err != nil {
 		return fmt.Errorf("failed to validate metadata: %w", err)
 	}
@@ -238,11 +246,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.