Update Flux dependencies.

This imports the newer versions of GitRepository etc so that we dont'
get logged warnings about needing to upgrade.

Author: bigkevmcd

config/crd/bases/sets.gitops.pro_gitopssets.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.14.0
+    controller-gen.kubebuilder.io/version: v0.16.1
   name: gitopssets.sets.gitops.pro
 spec:
   group: sets.gitops.pro
@@ -67,7 +67,6 @@ spec:
                           description: |-
                             Body is set as the body in a POST request.
 
-
                             If set, this will configure the Method to be POST automatically.
                           x-kubernetes-preserve-unknown-fields: true
                         endpoint:
@@ -79,7 +78,6 @@ spec:
                             HeadersRef allows optional configuration of a Secret or ConfigMap to add
                             additional headers to an outgoing request.
 
-
                             For example, a Secret with a key Authorization: Bearer abc123 could be
                             used to configure an authorization header.
                           properties:
@@ -105,7 +103,6 @@ spec:
                             JSONPath is string that is used to modify the result of the API
                             call.
 
-
                             This can be used to extract a repeating element from a response.
                             https://kubernetes.io/docs/reference/kubectl/jsonpath/
                           type: string
@@ -133,7 +130,6 @@ spec:
                             SingleElement means generate a single element with the result of the API
                             call.
 
-
                             When true, the response must be a JSON object and will be returned as a
                             single element, i.e. only one element will be generated containing the
                             entire object.
@@ -150,7 +146,6 @@ spec:
                           description: |-
                             Selector is used to filter the clusters that you want to target.
 
-
                             If no selector is provided, no clusters will be matched.
                           properties:
                             matchExpressions:
@@ -293,7 +288,6 @@ spec:
                                     description: |-
                                       Body is set as the body in a POST request.
 
-
                                       If set, this will configure the Method to be POST automatically.
                                     x-kubernetes-preserve-unknown-fields: true
                                   endpoint:
@@ -305,7 +299,6 @@ spec:
                                       HeadersRef allows optional configuration of a Secret or ConfigMap to add
                                       additional headers to an outgoing request.
 
-
                                       For example, a Secret with a key Authorization: Bearer abc123 could be
                                       used to configure an authorization header.
                                     properties:
@@ -333,7 +326,6 @@ spec:
                                       JSONPath is string that is used to modify the result of the API
                                       call.
 
-
                                       This can be used to extract a repeating element from a response.
                                       https://kubernetes.io/docs/reference/kubectl/jsonpath/
                                     type: string
@@ -361,7 +353,6 @@ spec:
                                       SingleElement means generate a single element with the result of the API
                                       call.
 
-
                                       When true, the response must be a JSON object and will be returned as a
                                       single element, i.e. only one element will be generated containing the
                                       entire object.
@@ -378,7 +369,6 @@ spec:
                                     description: |-
                                       Selector is used to filter the clusters that you want to target.
 
-
                                       If no selector is provided, no clusters will be matched.
                                     properties:
                                       matchExpressions:
@@ -613,7 +603,6 @@ spec:
                             SingleElement means generate a single element with the result of the
                             merged generator elements.
 
-
                             When true, the matrix elements will be merged to a single element, with
                             whatever prefixes they have.
                             It's recommended that you use the Name field to separate out elements.
@@ -753,16 +742,8 @@ spec:
               conditions:
                 description: Conditions holds the conditions for the GitOpsSet
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource.\n---\nThis struct is intended for
-                    direct use as an array at the field path .status.conditions.  For
-                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
-                    observations of a foo's current state.\n\t    // Known .status.conditions.type
-                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
-                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
-                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
-                    \   // other fields\n\t}"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
                       description: |-
@@ -803,12 +784,7 @@ spec:
                       - Unknown
                       type: string
                     type:
-                      description: |-
-                        type of condition in CamelCase or in foo.example.com/CamelCase.
-                        ---
-                        Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
-                        useful (see .node.status.conditions), the ability to deconflict is important.
-                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      description: type of condition in CamelCase or in foo.example.com/CamelCase.
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string

config/rbac/role.yaml

@@ -8,6 +8,7 @@ rules:
   - ""
   resources:
   - configmaps
+  - secrets
   verbs:
   - get
   - list
@@ -22,19 +23,27 @@ rules:
 - apiGroups:
   - ""
   resources:
-  - secrets
+  - serviceaccounts
+  verbs:
+  - impersonate
+- apiGroups:
+  - gitops.weave.works
+  resources:
+  - gitopsclusters
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - ""
+  - image.toolkit.fluxcd.io
   resources:
-  - serviceaccounts
+  - imagepolicies
   verbs:
-  - impersonate
+  - get
+  - list
+  - watch
 - apiGroups:
-  - gitops.pro
+  - sets.gitops.pro
   resources:
   - gitopssets
   verbs:
@@ -46,46 +55,23 @@ rules:
   - update
   - watch
 - apiGroups:
-  - gitops.pro
+  - sets.gitops.pro
   resources:
   - gitopssets/finalizers
   verbs:
   - update
 - apiGroups:
-  - gitops.pro
+  - sets.gitops.pro
   resources:
   - gitopssets/status
   verbs:
   - get
   - patch
   - update
-- apiGroups:
-  - gitops.weave.works
-  resources:
-  - gitopsclusters
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - image.toolkit.fluxcd.io
-  resources:
-  - imagepolicies
-  verbs:
-  - get
-  - list
-  - watch
 - apiGroups:
   - source.toolkit.fluxcd.io
   resources:
   - gitrepositories
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - source.toolkit.fluxcd.io
-  resources:
   - ocirepositories
   verbs:
   - get

controllers/gitopsset_controller.go

@@ -13,7 +13,8 @@ import (
 	"github.com/fluxcd/pkg/runtime/conditions"
 	runtimeCtrl "github.com/fluxcd/pkg/runtime/controller"
 	"github.com/fluxcd/pkg/runtime/predicates"
-	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/gitops-tools/pkg/sets"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
@@ -83,9 +84,9 @@ func (r *GitOpsSetReconciler) event(obj *templatesv1.GitOpsSet, severity, msg st
 	r.EventRecorder.Event(obj, eventType, reason, msg)
 }
 
-//+kubebuilder:rbac:groups=gitops.pro,resources=gitopssets,verbs=get;list;watch;create;update;patch;delete
-//+kubebuilder:rbac:groups=gitops.pro,resources=gitopssets/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=gitops.pro,resources=gitopssets/finalizers,verbs=update
+//+kubebuilder:rbac:groups=sets.gitops.pro,resources=gitopssets,verbs=get;list;watch;create;update;patch;delete
+//+kubebuilder:rbac:groups=sets.gitops.pro,resources=gitopssets/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=sets.gitops.pro,resources=gitopssets/finalizers,verbs=update
 //+kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=gitrepositories,verbs=get;list;watch
 //+kubebuilder:rbac:groups=source.toolkit.fluxcd.io,resources=ocirepositories,verbs=get;list;watch
 //+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch
@@ -380,7 +381,7 @@ func (r *GitOpsSetReconciler) SetupWithManager(mgr ctrl.Manager) error {
 
 	if r.Generators["OCIRepository"] != nil {
 		builder.Watches(
-			&sourcev1.OCIRepository{},
+			&sourcev1beta2.OCIRepository{},
 			handler.EnqueueRequestsFromMapFunc(r.ociRepositoryToGitOpsSet),
 		)
 	}

controllers/gitopsset_controller_test.go

@@ -11,6 +11,7 @@ import (
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1beta2"
 	"github.com/fluxcd/pkg/apis/meta"
 	fluxMeta "github.com/fluxcd/pkg/apis/meta"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
@@ -77,6 +78,7 @@ func TestReconciliation(t *testing.T) {
 	test.AssertNoError(t, clientgoscheme.AddToScheme(scheme))
 	test.AssertNoError(t, templatesv1.AddToScheme(scheme))
 	test.AssertNoError(t, sourcev1beta2.AddToScheme(scheme))
+	test.AssertNoError(t, sourcev1.AddToScheme(scheme))
 
 	k8sClient, err := client.New(cfg, client.Options{Scheme: scheme})
 	test.AssertNoError(t, err)

examples/apiclient/api-client-generator.yaml

@@ -16,7 +16,7 @@ spec:
   templates:
     - content:
         kind: Kustomization
-        apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+        apiVersion: kustomize.toolkit.fluxcd.io/v1
         metadata:
           name: "{{ .Element.env }}-demo"
           labels:

examples/base/go-demo-gitrepository.yaml

@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   name: go-demo-repo

examples/pull-requests/pull-requests-generator.yaml

@@ -19,7 +19,7 @@ spec:
         forks: false
   templates:
     - content:
-        apiVersion: source.toolkit.fluxcd.io/v1beta2
+        apiVersion: source.toolkit.fluxcd.io/v1
         kind: GitRepository
         metadata:
           name: "pr-{{ .Element.Number }}-gitrepository"

pkg/generators/gitrepository/git_repository.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"time"
 
-	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	templatesv1 "github.com/gitops-tools/gitopssets-controller/api/v1alpha1"
 	"github.com/gitops-tools/gitopssets-controller/pkg/generators"
 	"github.com/gitops-tools/gitopssets-controller/pkg/parser"

pkg/generators/gitrepository/git_repository_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/fluxcd/pkg/http/fetch"
 	"github.com/fluxcd/pkg/tar"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
-	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
 	"github.com/go-logr/logr"
 	"github.com/google/go-cmp/cmp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -199,8 +198,8 @@ func TestGenerate_errors(t *testing.T) {
 	}
 }
 
-func withArchiveURLAndChecksum(archiveURL, xsum string) func(*sourcev1beta2.GitRepository) {
-	return func(gr *sourcev1beta2.GitRepository) {
+func withArchiveURLAndChecksum(archiveURL, xsum string) func(*sourcev1.GitRepository) {
+	return func(gr *sourcev1.GitRepository) {
 		gr.Status.Artifact = &sourcev1.Artifact{
 			URL:    archiveURL,
 			Digest: xsum,
@@ -211,7 +210,7 @@ func withArchiveURLAndChecksum(archiveURL, xsum string) func(*sourcev1beta2.GitR
 func newFakeClient(t *testing.T, objs ...runtime.Object) client.WithWatch {
 	t.Helper()
 	scheme := runtime.NewScheme()
-	if err := sourcev1beta2.AddToScheme(scheme); err != nil {
+	if err := sourcev1.AddToScheme(scheme); err != nil {
 		t.Fatal(err)
 	}
 	if err := templatesv1.AddToScheme(scheme); err != nil {

pkg/setup/generators.go

@@ -9,7 +9,8 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
 	imagev1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
-	sourcev1 "github.com/fluxcd/source-controller/api/v1beta2"
+	sourcev1 "github.com/fluxcd/source-controller/api/v1"
+	sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"
 	clustersv1 "github.com/weaveworks/cluster-controller/api/v1alpha1"
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
@@ -42,6 +43,7 @@ func NewSchemeForGenerators(enabledGenerators []string) (*runtime.Scheme, error)
 	builder := runtime.SchemeBuilder{
 		clientgoscheme.AddToScheme,
 		sourcev1.AddToScheme,
+		sourcev1beta2.AddToScheme,
 		templatesv1.AddToScheme,
 	}