fix: Set ownership reference for Nutanix CSI Snapshot Helm Chart Proxy

Also refactors some of the surrounding code.

Author: dlipovetsky

pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go

@@ -151,12 +151,17 @@ func (n *NutanixCSI) handleHelmAddonApply(
 		)
 	}
 
-	helmChart, err := n.helmChartInfoGetter.For(ctx, log, config.NutanixStorageCSI)
+	storageChart, err := n.helmChartInfoGetter.For(ctx, log, config.NutanixStorageCSI)
 	if err != nil {
-		return fmt.Errorf("failed to get values for nutanix-csi-config %w", err)
+		return fmt.Errorf("failed to get helm chart %q: %w", config.NutanixStorageCSI, err)
 	}
 
-	hcp := &caaphv1.HelmChartProxy{
+	snapshotHelmChart, err := n.helmChartInfoGetter.For(ctx, log, config.NutanixSnapshotCSI)
+	if err != nil {
+		return fmt.Errorf("failed to get helm chart %q: %w", config.NutanixSnapshotCSI, err)
+	}
+
+	storageChartProxy := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: caaphv1.GroupVersion.String(),
 			Kind:       "HelmChartProxy",
@@ -166,35 +171,19 @@ func (n *NutanixCSI) handleHelmAddonApply(
 			Name:      "nutanix-csi-" + req.Cluster.Name,
 		},
 		Spec: caaphv1.HelmChartProxySpec{
-			RepoURL:   helmChart.Repository,
-			ChartName: helmChart.Name,
+			RepoURL:   storageChart.Repository,
+			ChartName: storageChart.Name,
 			ClusterSelector: metav1.LabelSelector{
 				MatchLabels: map[string]string{clusterv1.ClusterNameLabel: req.Cluster.Name},
 			},
 			ReleaseNamespace: defaultStorageHelmReleaseNamespace,
 			ReleaseName:      defaultStorageHelmReleaseName,
-			Version:          helmChart.Version,
+			Version:          storageChart.Version,
 			ValuesTemplate:   values,
 		},
 	}
 
-	if err = controllerutil.SetOwnerReference(&req.Cluster, hcp, n.client.Scheme()); err != nil {
-		return fmt.Errorf(
-			"failed to set owner reference on nutanix-csi installation HelmChartProxy: %w",
-			err,
-		)
-	}
-
-	if err = client.ServerSideApply(ctx, n.client, hcp, client.ForceOwnership); err != nil {
-		return fmt.Errorf("failed to apply nutanix-csi installation HelmChartProxy: %w", err)
-	}
-
-	snapshotHelmChart, err := n.helmChartInfoGetter.For(ctx, log, config.NutanixSnapshotCSI)
-	if err != nil {
-		return fmt.Errorf("failed to get values for nutanix-csi-config %w", err)
-	}
-
-	snapshotChart := &caaphv1.HelmChartProxy{
+	snapshotChartProxy := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: caaphv1.GroupVersion.String(),
 			Kind:       "HelmChartProxy",
@@ -215,11 +204,16 @@ func (n *NutanixCSI) handleHelmAddonApply(
 		},
 	}
 
-	if err = client.ServerSideApply(ctx, n.client, snapshotChart, client.ForceOwnership); err != nil {
-		return fmt.Errorf(
-			"failed to apply nutanix-csi-snapshot installation HelmChartProxy: %w",
-			err,
-		)
+	// We use a slice of pointers to satisfy the gocritic linter rangeValCopy check.
+	for _, cp := range []*caaphv1.HelmChartProxy{storageChartProxy, snapshotChartProxy} {
+		if err = controllerutil.SetOwnerReference(&req.Cluster, cp, n.client.Scheme()); err != nil {
+			return fmt.Errorf(
+				"failed to set owner reference on HelmChartProxy %q: %w", cp.Name, err)
+		}
+
+		if err = client.ServerSideApply(ctx, n.client, cp, client.ForceOwnership); err != nil {
+			return fmt.Errorf("failed to apply HelmChartProxy %q: %w", cp.Name, err)
+		}
 	}
 
 	return nil