refactor: migrate use of deprecated HelmRelease .status.lastReleaseRevision (#4374)

Author: erikgb

core/server/inventory.go

@@ -489,13 +489,6 @@ func secretNameFromHelmRelease(helmRelease *helmv2.HelmRelease) *client.ObjectKe
 		}
 	}
 
-	if latestRevision := helmRelease.Status.LastReleaseRevision; latestRevision > 0 {
-		return &client.ObjectKey{
-			Name:      fmt.Sprintf(helmSecretNameFmt, helmRelease.GetReleaseName(), latestRevision),
-			Namespace: helmRelease.GetStorageNamespace(),
-		}
-	}
-
 	return nil
 }
 
@@ -504,9 +497,5 @@ func defaultNSFromHelmRelease(helmRelease *helmv2.HelmRelease) string {
 		return latest.Namespace
 	}
 
-	if latestRevision := helmRelease.Status.LastReleaseRevision; latestRevision > 0 {
-		return helmRelease.GetReleaseNamespace()
-	}
-
 	return ""
 }

core/server/inventory_test.go

@@ -230,7 +230,11 @@ func TestGetInventoryHelmRelease(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 
@@ -307,8 +311,7 @@ func TestGetInventoryHelmReleaseNoNSResources(t *testing.T) {
 			TargetNamespace: "test-ns",
 		},
 		Status: helmv2.HelmReleaseStatus{
-			StorageNamespace:    ns.Name,
-			LastReleaseRevision: 0,
+			StorageNamespace: ns.Name,
 			History: helmv2.Snapshots{
 				{
 					Name:      "first-helm-name",
@@ -401,7 +404,11 @@ func TestGetInventoryHelmReleaseWithKubeconfig(t *testing.T) {
 			},
 		},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 

core/server/objects_test.go

@@ -169,7 +169,11 @@ func TestGetObject_HelmReleaseWithInventory(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 	// Create helm storage.
@@ -248,7 +252,11 @@ func TestGetObject_HelmReleaseWithCompressedInventory(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 	// Create helm storage.
@@ -310,7 +318,11 @@ func TestGetObject_HelmReleaseCantGetSecret(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 	secret := &corev1.Secret{
@@ -588,7 +600,11 @@ func TestListObject_HelmReleaseWithInventory(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 	// Create helm storage.
@@ -643,12 +659,12 @@ func TestListObject_HelmReleaseWithInventoryHistory(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			StorageNamespace:    ns.Name,
-			LastReleaseRevision: 0,
+			StorageNamespace: ns.Name,
 			History: helmv2.Snapshots{
 				{
-					Name:    "first-helm-name",
-					Version: 1,
+					Name:      "first-helm-name",
+					Version:   1,
+					Namespace: ns.Name,
 				},
 			},
 		},
@@ -705,7 +721,11 @@ func TestListObject_HelmReleaseCantGetSecret(t *testing.T) {
 		},
 		Spec: helmv2.HelmReleaseSpec{},
 		Status: helmv2.HelmReleaseStatus{
-			LastReleaseRevision: 1,
+			History: helmv2.Snapshots{{
+				Name:      "first-helm-name",
+				Version:   1,
+				Namespace: ns.Name,
+			}},
 		},
 	}
 	secret := &corev1.Secret{