Skip to content

refactor: setting ownership references to Nutanix CSI Helm Chart Proxies #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2024
+27 −37
Merged

refactor: setting ownership references to Nutanix CSI Helm Chart Proxies #565

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a90efa3
fix: Set ownership reference for Nutanix CSI Snapshot Helm Chart Proxy
dlipovetsky Apr 26, 2024
b01bc61
fixup! refactor: Apply review suggestions
jimmidyson Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 27 additions & 37 deletions pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
snapshotChart, 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",
Expand All @@ -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",
Expand All @@ -204,29 +193,30 @@ func (n *NutanixCSI) handleHelmAddonApply(
Name: "nutanix-csi-snapshot-" + req.Cluster.Name,
},
Spec: caaphv1.HelmChartProxySpec{
RepoURL: snapshotHelmChart.Repository,
ChartName: snapshotHelmChart.Name,
RepoURL: snapshotChart.Repository,
ChartName: snapshotChart.Name,
ClusterSelector: metav1.LabelSelector{
MatchLabels: map[string]string{clusterv1.ClusterNameLabel: req.Cluster.Name},
},
ReleaseNamespace: defaultSnapshotHelmReleaseNamespace,
ReleaseName: defaultSnapshotHelmReleaseName,
Version: snapshotHelmChart.Version,
Version: snapshotChart.Version,
},
}

if err = controllerutil.SetOwnerReference(&req.Cluster, snapshotChart, n.client.Scheme()); err != nil {
return fmt.Errorf(
"failed to set owner reference on 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, snapshotChart); err != nil {
return fmt.Errorf(
"failed to apply nutanix-csi-snapshot installation HelmChartProxy: %w",
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
Expand Down
Loading