Fix: remove v1beta2 Bucket deprecated log (#131)

Author: WilliamB78

pkg/controllers/bucketController.go

@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"context"
 	"encoding/json"
 
 	"github.com/gimlet-io/capacitor/pkg/flux"
@@ -13,6 +14,12 @@ import (
 )
 
 var bucketResource = schema.GroupVersionResource{
+	Group:    "source.toolkit.fluxcd.io",
+	Version:  "v1",
+	Resource: "buckets",
+}
+
+var bucketResourceV1beta2 = schema.GroupVersionResource{
 	Group:    "source.toolkit.fluxcd.io",
 	Version:  "v1beta2",
 	Resource: "buckets",
@@ -23,6 +30,13 @@ func BucketController(
 	dynamicClient *dynamic.DynamicClient,
 	clientHub *streaming.ClientHub,
 ) (*Controller, error) {
+	// check if v1 is supported
+	_, err := dynamicClient.Resource(bucketResource).Namespace("").List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		// try and possibly fail (bucket-controller is not mandatory) with v1beta2
+		bucketResource = bucketResourceV1beta2
+	}
+
 	return NewDynamicController(
 		"buckets.source.toolkit.fluxcd.io",
 		dynamicClient,

pkg/flux/flux.go

@@ -57,6 +57,12 @@ var (
 	}
 
 	bucketGVR = schema.GroupVersionResource{
+		Group:    "source.toolkit.fluxcd.io",
+		Version:  "v1",
+		Resource: "buckets",
+	}
+
+	bucketGVR1beta2 = schema.GroupVersionResource{
 		Group:    "source.toolkit.fluxcd.io",
 		Version:  "v1beta2",
 		Resource: "buckets",
@@ -453,9 +459,21 @@ func State(c *kubernetes.Clientset, dc *dynamic.DynamicClient) (*FluxState, erro
 	buckets, err := dc.Resource(bucketGVR).
 		Namespace("").
 		List(context.TODO(), metav1.ListOptions{})
+
 	if err != nil {
-		return nil, err
+		if strings.Contains(err.Error(), "the server could not find the requested resource") {
+			// let's try the deprecated v1beta2
+			buckets, err = dc.Resource(bucketGVR1beta2).
+				Namespace("").
+				List(context.TODO(), metav1.ListOptions{})
+			if err != nil {
+				return nil, err
+			}
+		} else {
+			return nil, err
+		}
 	}
+
 	for _, repo := range buckets.Items {
 		unstructured := repo.UnstructuredContent()
 		var bucket sourcev1beta2.Bucket