From afcf12194d786d2c3705ec80a4614cfd7acbfaea Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Tue, 12 Dec 2023 11:25:12 +0200 Subject: [PATCH] Adapt tree command to `HelmRelease` v2beta2 Signed-off-by: Stefan Prodan --- cmd/flux/tree_kustomization.go | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/cmd/flux/tree_kustomization.go b/cmd/flux/tree_kustomization.go index 57d2ff25..6f1ee560 100644 --- a/cmd/flux/tree_kustomization.go +++ b/cmd/flux/tree_kustomization.go @@ -208,27 +208,16 @@ func getHelmReleaseInventory(ctx context.Context, objectKey client.ObjectKey, ku return nil, nil } - storageNamespace := hr.GetNamespace() - if hr.Spec.StorageNamespace != "" { - storageNamespace = hr.Spec.StorageNamespace - } - - storageName := hr.GetName() - if hr.Spec.ReleaseName != "" { - storageName = hr.Spec.ReleaseName - } else if hr.Spec.TargetNamespace != "" { - storageName = strings.Join([]string{hr.Spec.TargetNamespace, hr.Name}, "-") - } - - storageVersion := hr.Status.LastReleaseRevision - // skip release if it failed to install - if storageVersion < 1 { + storageNamespace := hr.Status.StorageNamespace + latest := hr.Status.History.Latest() + if len(storageNamespace) == 0 || latest == nil { + // Skip release if it has no current return nil, nil } storageKey := client.ObjectKey{ Namespace: storageNamespace, - Name: fmt.Sprintf("sh.helm.release.v1.%s.v%v", storageName, storageVersion), + Name: fmt.Sprintf("sh.helm.release.v1.%s.v%v", latest.Name, latest.Version), } storageSecret := &corev1.Secret{}