Migrate flux uninstall to Helm Source API v1

Signed-off-by: Stefan Prodan <[email protected]>
fluxcd · May 6, 2024 · aae086c · aae086c
1 parent e40961c
commit aae086c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cmd/flux/delete_source_helm.go b/cmd/flux/delete_source_helm.go
@@ -19,7 +19,7 @@ package main
 import (
 	"github.com/spf13/cobra"
 
-	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 )
 
 var deleteSourceHelmCmd = &cobra.Command{

diff --git a/internal/flags/helm_chart_source.go b/internal/flags/helm_chart_source.go
@@ -26,7 +26,7 @@ import (
 	"github.com/fluxcd/flux2/v2/internal/utils"
 )
 
-var supportedHelmChartSourceKinds = []string{sourcev1b2.HelmRepositoryKind, sourcev1.GitRepositoryKind, sourcev1b2.BucketKind}
+var supportedHelmChartSourceKinds = []string{sourcev1.HelmRepositoryKind, sourcev1.GitRepositoryKind, sourcev1b2.BucketKind}
 
 type HelmChartSource struct {
 	Kind      string

diff --git a/internal/flags/helm_chart_source_test.go b/internal/flags/helm_chart_source_test.go
@@ -23,7 +23,7 @@ import (
 	"fmt"
 	"testing"
 
-	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 )
 
 func TestHelmChartSource_Set(t *testing.T) {

diff --git a/pkg/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go
@@ -268,7 +268,7 @@ func objectReconciled(kube client.Client, objKey client.ObjectKey, clientObject
 func hasRevision(kind string, obj map[string]interface{}, expectedRev string) (bool, error) {
 	var rev string
 	switch kind {
-	case sourcev1.GitRepositoryKind, sourcev1b2.OCIRepositoryKind, sourcev1b2.BucketKind, sourcev1b2.HelmChartKind:
+	case sourcev1.GitRepositoryKind, sourcev1b2.OCIRepositoryKind, sourcev1b2.BucketKind, sourcev1.HelmChartKind:
 		rev, _, _ = unstructured.NestedString(obj, "status", "artifact", "revision")
 	case kustomizev1.KustomizationKind:
 		rev, _, _ = unstructured.NestedString(obj, "status", "lastAttemptedRevision")

diff --git a/pkg/uninstall/uninstall.go b/pkg/uninstall/uninstall.go
@@ -169,7 +169,7 @@ func Finalizers(ctx context.Context, logger log.Logger, kubeClient client.Client
 		}
 	}
 	{
-		var list sourcev1b2.HelmRepositoryList
+		var list sourcev1.HelmRepositoryList
 		if err := kubeClient.List(ctx, &list, client.InNamespace("")); err == nil {
 			for i := range list.Items {
 				r := list.Items[i]
@@ -184,7 +184,7 @@ func Finalizers(ctx context.Context, logger log.Logger, kubeClient client.Client
 		}
 	}
 	{
-		var list sourcev1b2.HelmChartList
+		var list sourcev1.HelmChartList
 		if err := kubeClient.List(ctx, &list, client.InNamespace("")); err == nil {
 			for i := range list.Items {
 				r := list.Items[i]