Fix panic when tracking managed cluster heartbeat (#798)

Mirantis · Dec 16, 2024 · 7c83fbc · 7c83fbc
1 parent ef63114
commit 7c83fbc
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/api/v1alpha1/templates_common.go b/api/v1alpha1/templates_common.go
@@ -68,6 +68,8 @@ type TemplateStatusCommon struct {
 	// ChartRef is a reference to a source controller resource containing the
 	// Helm chart representing the template.
 	ChartRef *helmcontrollerv2.CrossNamespaceSourceReference `json:"chartRef,omitempty"`
+	// ChartVersion represents the version of the Helm Chart associated with this template.
+	ChartVersion string `json:"chartVersion,omitempty"`
 	// Description contains information about the template.
 	Description string `json:"description,omitempty"`
 

diff --git a/internal/controller/template_controller.go b/internal/controller/template_controller.go
@@ -214,6 +214,8 @@ func (r *TemplateReconciler) ReconcileTemplate(ctx context.Context, template tem
 		Name:      hcChart.Name,
 		Namespace: hcChart.Namespace,
 	}
+	status.ChartVersion = hcChart.Spec.Version
+
 	if reportStatus, err := helm.ArtifactReady(hcChart); err != nil {
 		l.Info("HelmChart Artifact is not ready")
 		if reportStatus {

diff --git a/internal/telemetry/tracker.go b/internal/telemetry/tracker.go
@@ -91,7 +91,7 @@ func (t *Tracker) trackManagedClusterHeartbeat(ctx context.Context) error {
 			string(managedCluster.UID),
 			clusterID,
 			managedCluster.Spec.Template,
-			template.Spec.Helm.ChartSpec.Version,
+			template.Status.ChartVersion,
 			template.Status.Providers,
 		)
 		if err != nil {

diff --git a/templates/provider/hmc/templates/crds/hmc.mirantis.com_clustertemplates.yaml b/templates/provider/hmc/templates/crds/hmc.mirantis.com_clustertemplates.yaml
@@ -295,6 +295,10 @@ spec:
                 - kind
                 - name
                 type: object
+              chartVersion:
+                description: ChartVersion represents the version of the Helm Chart
+                  associated with this template.
+                type: string
               config:
                 description: |-
                   Config demonstrates available parameters for template customization,

diff --git a/templates/provider/hmc/templates/crds/hmc.mirantis.com_providertemplates.yaml b/templates/provider/hmc/templates/crds/hmc.mirantis.com_providertemplates.yaml
@@ -300,6 +300,10 @@ spec:
                 - kind
                 - name
                 type: object
+              chartVersion:
+                description: ChartVersion represents the version of the Helm Chart
+                  associated with this template.
+                type: string
               config:
                 description: |-
                   Config demonstrates available parameters for template customization,

diff --git a/templates/provider/hmc/templates/crds/hmc.mirantis.com_servicetemplates.yaml b/templates/provider/hmc/templates/crds/hmc.mirantis.com_servicetemplates.yaml
@@ -284,6 +284,10 @@ spec:
                 - kind
                 - name
                 type: object
+              chartVersion:
+                description: ChartVersion represents the version of the Helm Chart
+                  associated with this template.
+                type: string
               config:
                 description: |-
                   Config demonstrates available parameters for template customization,