fix: backwards compatibility to HelmRelease v2beta1

gimlet-io · Mar 5, 2024 · d49a41e · d49a41e
1 parent 1d6541a
commit d49a41e
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/pkg/controllers/helmreleaseController.go b/pkg/controllers/helmreleaseController.go
@@ -13,7 +13,7 @@ import (
 
 var helmReleaseResource = schema.GroupVersionResource{
 	Group:    "helm.toolkit.fluxcd.io",
-	Version:  "v2beta2",
+	Version:  "v2beta1",
 	Resource: "helmreleases",
 }
 

diff --git a/pkg/flux/events.go b/pkg/flux/events.go
@@ -25,7 +25,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
-	helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	autov1 "github.com/fluxcd/image-automation-controller/api/v1beta1"
 	imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"

diff --git a/pkg/flux/flux.go b/pkg/flux/flux.go
@@ -8,7 +8,7 @@ import (
 	"sort"
 	"strings"
 
-	helmv2beta2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizationv1 "github.com/fluxcd/kustomize-controller/api/v1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -56,7 +56,7 @@ var (
 
 	helmReleaseGVR = schema.GroupVersionResource{
 		Group:    "helm.toolkit.fluxcd.io",
-		Version:  "v2beta2",
+		Version:  "v2beta1",
 		Resource: "helmreleases",
 	}
 )
@@ -233,8 +233,8 @@ func inventory(dc *dynamic.DynamicClient) ([]object.ObjMetadata, error) {
 	return inventory, nil
 }
 
-func helmReleases(dc *dynamic.DynamicClient) ([]helmv2beta2.HelmRelease, error) {
-	releases := []helmv2beta2.HelmRelease{}
+func helmReleases(dc *dynamic.DynamicClient) ([]helmv2beta1.HelmRelease, error) {
+	releases := []helmv2beta1.HelmRelease{}
 
 	helmReleases, err := dc.Resource(helmReleaseGVR).
 		Namespace("").
@@ -245,7 +245,7 @@ func helmReleases(dc *dynamic.DynamicClient) ([]helmv2beta2.HelmRelease, error)
 
 	for _, h := range helmReleases.Items {
 		unstructured := h.UnstructuredContent()
-		var helmRelease helmv2beta2.HelmRelease
+		var helmRelease helmv2beta1.HelmRelease
 		err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstructured, &helmRelease)
 		if err != nil {
 			return nil, err
@@ -259,7 +259,7 @@ func helmReleases(dc *dynamic.DynamicClient) ([]helmv2beta2.HelmRelease, error)
 
 func helmStatusWithResources(
 	releases []*rspb.Release,
-	hr helmv2beta2.HelmRelease,
+	hr helmv2beta1.HelmRelease,
 ) (kube.ResourceList, error) {
 	var release *rspb.Release
 	version := -1
@@ -300,7 +300,7 @@ func State(c *kubernetes.Clientset, dc *dynamic.DynamicClient) (*FluxState, erro
 		OCIRepositories: []sourcev1beta2.OCIRepository{},
 		Buckets:         []sourcev1beta2.Bucket{},
 		Kustomizations:  []kustomizationv1.Kustomization{},
-		HelmReleases:    []helmv2beta2.HelmRelease{},
+		HelmReleases:    []helmv2beta1.HelmRelease{},
 		FluxServices:    []Service{},
 	}
 
@@ -379,7 +379,7 @@ func State(c *kubernetes.Clientset, dc *dynamic.DynamicClient) (*FluxState, erro
 	}
 	for _, h := range helmReleases.Items {
 		unstructured := h.UnstructuredContent()
-		var helmRelease helmv2beta2.HelmRelease
+		var helmRelease helmv2beta1.HelmRelease
 		err = runtime.DefaultUnstructuredConverter.FromUnstructured(unstructured, &helmRelease)
 		if err != nil {
 			return nil, err

diff --git a/pkg/flux/helmrelease.go b/pkg/flux/helmrelease.go
@@ -20,12 +20,12 @@ package flux
 import (
 	"fmt"
 
-	helmv2beta2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 type helmReleaseAdapter struct {
-	*helmv2beta2.HelmRelease
+	*helmv2beta1.HelmRelease
 }
 
 func (h helmReleaseAdapter) asClientObject() client.Object {

diff --git a/pkg/flux/reconcile.go b/pkg/flux/reconcile.go
@@ -21,7 +21,7 @@ import (
 	"context"
 	"time"
 
-	helmv2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizationv1 "github.com/fluxcd/kustomize-controller/api/v1"
 	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
@@ -64,9 +64,9 @@ func NewReconcileCommand(resource string) *reconcileCommand {
 		}
 	case "helmrelease":
 		return &reconcileCommand{
-			object:       helmReleaseAdapter{&helmv2.HelmRelease{}},
-			groupVersion: helmv2.GroupVersion,
-			kind:         helmv2.HelmReleaseKind,
+			object:       helmReleaseAdapter{&helmv2beta1.HelmRelease{}},
+			groupVersion: helmv2beta1.GroupVersion,
+			kind:         helmv2beta1.HelmReleaseKind,
 		}
 	case sourcev1.GitRepositoryKind:
 		return &reconcileCommand{
@@ -96,7 +96,7 @@ func (r *reconcileCommand) Run(config *rest.Config, namespace, name string) {
 	sourcev1.AddToScheme(scheme)
 	sourcev1beta2.AddToScheme(scheme)
 	kustomizationv1.AddToScheme(scheme)
-	helmv2.AddToScheme(scheme)
+	helmv2beta1.AddToScheme(scheme)
 
 	kubeClient, err := client.NewWithWatch(config, client.Options{
 		Scheme: scheme,
@@ -194,7 +194,7 @@ func requestReconciliation(
 		annotations[meta.ReconcileRequestAnnotation] = ts
 
 		// HelmRelease specific annotations to force a release.
-		if gvk.Kind == helmv2.HelmReleaseKind {
+		if gvk.Kind == helmv2beta1.HelmReleaseKind {
 			annotations["reconcile.fluxcd.io/forceAt"] = ts
 		}
 

diff --git a/pkg/flux/types.go b/pkg/flux/types.go
@@ -3,7 +3,7 @@ package flux
 import (
 	"time"
 
-	helmv2beta2 "github.com/fluxcd/helm-controller/api/v2beta2"
+	helmv2beta1 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizationv1 "github.com/fluxcd/kustomize-controller/api/v1"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
@@ -16,7 +16,7 @@ type FluxState struct {
 	OCIRepositories []sourcev1beta2.OCIRepository   `json:"ociRepositories"`
 	Buckets         []sourcev1beta2.Bucket          `json:"buckets"`
 	Kustomizations  []kustomizationv1.Kustomization `json:"kustomizations"`
-	HelmReleases    []helmv2beta2.HelmRelease       `json:"helmReleases"`
+	HelmReleases    []helmv2beta1.HelmRelease       `json:"helmReleases"`
 	FluxServices    []Service                       `json:"fluxServices"`
 }