Update to fluxcd 2.3.0

Signed-off-by: Tamal Saha <[email protected]>
kluster-manager · May 19, 2024 · bf4fe67 · bf4fe67
1 parent f761874
commit bf4fe67
Show file tree

Hide file tree

Showing 15 changed files with 6,273 additions and 3,092 deletions.
diff --git a/apis/fluxcd/v1alpha1/fluxcdconfig_types.go b/apis/fluxcd/v1alpha1/fluxcdconfig_types.go
@@ -332,6 +332,12 @@ type Rbac struct {
  CreateAggregation bool `json:"createAggregation"`
  // +optional
  Annotations map[string]string `json:"annotations"`
+ // +optional
+ RoleRef RoleRef `json:"roleRef"`
+}
+
+type RoleRef struct {
+ Name string `json:"name"`
 }
 
 type PrometheusSpec struct {

diff --git a/apis/fluxcd/v1alpha1/openapi_generated.go b/apis/fluxcd/v1alpha1/openapi_generated.go
diff --git a/apis/fluxcd/v1alpha1/zz_generated.deepcopy.go b/apis/fluxcd/v1alpha1/zz_generated.deepcopy.go
diff --git a/crds/fluxcd.open-cluster-management.io_fluxcdconfigs.yaml b/crds/fluxcd.open-cluster-management.io_fluxcdconfigs.yaml
@@ -3453,6 +3453,13 @@ spec:
  type: boolean
  createAggregation:
  type: boolean
+ roleRef:
+ properties:
+ name:
+ type: string
+ required:
+ - name
+ type: object
  required:
  - create
  type: object

diff --git a/pkg/manager/agent-manifests/flux2/Chart.yaml b/pkg/manager/agent-manifests/flux2/Chart.yaml
@@ -1,11 +1,11 @@
 annotations:
  artifacthub.io/changes: |
- - "[Chore]: Update App Version to upstream 2.2.2"
+ - "[Chore]: Update App Version to upstream 2.2.3"
 apiVersion: v2
-appVersion: 2.2.2
+appVersion: 2.3.0
 description: A Helm chart for flux2
 name: flux2
 sources:
 - https://github.com/fluxcd-community/helm-charts
 type: application
-version: 2.12.2
+version: 2.13.0
diff --git a/pkg/manager/agent-manifests/flux2/README.md b/pkg/manager/agent-manifests/flux2/README.md
@@ -1,6 +1,6 @@
 # flux2
 
-![Version: 2.12.2](https://img.shields.io/badge/Version-2.12.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.2](https://img.shields.io/badge/AppVersion-2.2.2-informational?style=flat-square)
+![Version: 2.13.0](https://img.shields.io/badge/Version-2.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)
 
 A Helm chart for flux2
 
@@ -19,7 +19,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | cli.image | string | `"ghcr.io/fluxcd/flux-cli"` | |
 | cli.nodeSelector | object | `{}` | |
 | cli.serviceAccount.automount | bool | `true` | |
-| cli.tag | string | `"v2.2.2"` | |
+| cli.tag | string | `"v2.3.0"` | |
 | cli.tolerations | list | `[]` | |
 | clusterDomain | string | `"cluster.local"` | |
 | crds.annotations | object | `{}` | Add annotations to all CRD resources, e.g. "helm.sh/resource-policy": keep |
@@ -41,7 +41,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | helmController.serviceAccount.annotations | object | `{}` | |
 | helmController.serviceAccount.automount | bool | `true` | |
 | helmController.serviceAccount.create | bool | `true` | |
-| helmController.tag | string | `"v0.37.2"` | |
+| helmController.tag | string | `"v1.0.1"` | |
 | helmController.tolerations | list | `[]` | |
 | imageAutomationController.affinity | object | `{}` | |
 | imageAutomationController.annotations."prometheus.io/port" | string | `"8080"` | |
@@ -60,7 +60,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | imageAutomationController.serviceAccount.annotations | object | `{}` | |
 | imageAutomationController.serviceAccount.automount | bool | `true` | |
 | imageAutomationController.serviceAccount.create | bool | `true` | |
-| imageAutomationController.tag | string | `"v0.37.0"` | |
+| imageAutomationController.tag | string | `"v0.38.0"` | |
 | imageAutomationController.tolerations | list | `[]` | |
 | imagePullSecrets | list | `[]` | contents of pod imagePullSecret in form 'name=[secretName]'; applied to all controllers |
 | imageReflectionController.affinity | object | `{}` | |
@@ -80,7 +80,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | imageReflectionController.serviceAccount.annotations | object | `{}` | |
 | imageReflectionController.serviceAccount.automount | bool | `true` | |
 | imageReflectionController.serviceAccount.create | bool | `true` | |
-| imageReflectionController.tag | string | `"v0.31.1"` | |
+| imageReflectionController.tag | string | `"v0.32.0"` | |
 | imageReflectionController.tolerations | list | `[]` | |
 | installCRDs | bool | `true` | |
 | kustomizeController.affinity | object | `{}` | |
@@ -105,7 +105,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | kustomizeController.serviceAccount.annotations | object | `{}` | |
 | kustomizeController.serviceAccount.automount | bool | `true` | |
 | kustomizeController.serviceAccount.create | bool | `true` | |
-| kustomizeController.tag | string | `"v1.2.1"` | |
+| kustomizeController.tag | string | `"v1.3.0"` | |
 | kustomizeController.tolerations | list | `[]` | |
 | logLevel | string | `"info"` | |
 | multitenancy.defaultServiceAccount | string | `"default"` | All Kustomizations and HelmReleases which don’t have spec.serviceAccountName specified, will use the default account from the tenant’s namespace. Tenants have to specify a service account in their Flux resources to be able to deploy workloads in their namespaces as the default account has no permissions. |
@@ -130,7 +130,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | notificationController.serviceAccount.annotations | object | `{}` | |
 | notificationController.serviceAccount.automount | bool | `true` | |
 | notificationController.serviceAccount.create | bool | `true` | |
-| notificationController.tag | string | `"v1.2.3"` | |
+| notificationController.tag | string | `"v1.3.0"` | |
 | notificationController.tolerations | list | `[]` | |
 | notificationController.webhookReceiver.ingress.annotations | object | `{}` | |
 | notificationController.webhookReceiver.ingress.create | bool | `false` | |
@@ -150,6 +150,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | rbac.annotations | object | `{}` | Add annotations to all RBAC resources, e.g. "helm.sh/resource-policy": keep |
 | rbac.create | bool | `true` | |
 | rbac.createAggregation | bool | `true` | Grant the Kubernetes view, edit and admin roles access to Flux custom resources |
+| rbac.roleRef.name | string | `"cluster-admin"` | |
 | sourceController.affinity | object | `{}` | |
 | sourceController.annotations."prometheus.io/port" | string | `"8080"` | |
 | sourceController.annotations."prometheus.io/scrape" | string | `"true"` | |
@@ -169,6 +170,6 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | sourceController.serviceAccount.annotations | object | `{}` | |
 | sourceController.serviceAccount.automount | bool | `true` | |
 | sourceController.serviceAccount.create | bool | `true` | |
-| sourceController.tag | string | `"v1.2.3"` | |
+| sourceController.tag | string | `"v1.3.0"` | |
 | sourceController.tolerations | list | `[]` | |
 | watchAllNamespaces | bool | `true` | |
diff --git a/pkg/manager/agent-manifests/flux2/templates/cluster-reconciler-clusterrolebinding.yaml b/pkg/manager/agent-manifests/flux2/templates/cluster-reconciler-clusterrolebinding.yaml
@@ -15,7 +15,7 @@ metadata:
 roleRef:
  apiGroup: rbac.authorization.k8s.io
  kind: ClusterRole
- name: cluster-admin
+ name: {{ .Values.rbac.roleRef.name }}
 subjects:
 - kind: ServiceAccount
  name: kustomize-controller