Upgrade to gitopssets-controller v0.3.1 and turn on by default (#2393)

* Upgrade to gitopssets-controller v0.3.0

* 0.3.1

* Enable by default

Author: foot

charts/gitopssets-controller/crds/gitopsset-crd.yaml

@@ -11,6 +11,8 @@ spec:
     kind: GitOpsSet
     listKind: GitOpsSetList
     plural: gitopssets
+    shortNames:
+    - gs
     singular: gitopsset
   scope: Namespaced
   versions:
@@ -143,6 +145,11 @@ spec:
                                     - gitlab
                                     - bitbucketserver
                                     type: string
+                                  forks:
+                                    description: Fork is used to filter out forks
+                                      from the target PRs if false, or to include
+                                      forks if  true
+                                    type: boolean
                                   interval:
                                     description: The interval at which to check for
                                       repository updates.
@@ -194,6 +201,10 @@ spec:
                           - gitlab
                           - bitbucketserver
                           type: string
+                        forks:
+                          description: Fork is used to filter out forks from the target
+                            PRs if false, or to include forks if  true
+                          type: boolean
                         interval:
                           description: The interval at which to check for repository
                             updates.
@@ -230,6 +241,10 @@ spec:
                       type: object
                   type: object
                 type: array
+              serviceAccountName:
+                description: The name of the Kubernetes service account to impersonate
+                  when reconciling this Kustomization.
+                type: string
               suspend:
                 description: Suspend tells the controller to suspend the reconciliation
                   of this GitOpsSet.

charts/gitopssets-controller/templates/manager-rbac.yaml

@@ -13,6 +13,12 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts
+  verbs:
+  - impersonate
 - apiGroups:
   - source.toolkit.fluxcd.io
   resources:

charts/mccp/values.yaml

@@ -177,10 +177,10 @@ templates-controller:
         tag: v0.1.2
 
 gitopssets-controller:
-  enabled: false
+  enabled: true
   # gitops-controller-manager etc
   fullnameOverride: gitopssets
   controllerManager:
     manager:
       image:
-        tag: v0.2.0
+        tag: v0.3.1

tools/dev-resources/gitopssets/gitopsset-configmaps.yaml

@@ -18,10 +18,10 @@ spec:
         kind: ConfigMap
         apiVersion: v1
         metadata:
-          name: "{{ .element.env }}-info-configmap"
+          name: "{{ .Element.env }}-info-configmap"
           namespace: default
         spec:
           data:
-            team: "{{ .element.team }}"
-            env: "{{ .element.env }}"
-            description: "This is a configmap for the {{ .element.env }} environment"
+            team: "{{ .Element.team }}"
+            env: "{{ .Element.env }}"
+            description: "This is a configmap for the {{ .Element.env }} environment"