Merge pull request #204 from rsafonseca/helm-controller-crd-update

Flux v2.2.0: Update CRDs and component versions

.github/workflows/e2e-sync.yaml

@@ -18,7 +18,7 @@ jobs:
         uses: helm/[email protected]
         with:
           cluster_name: kind
-          node_image: kindest/node:v1.25.11
+          node_image: kindest/node:v1.28.0
       - name: Setup Helm
         uses: fluxcd/pkg//actions/helm@main
         with:

.github/workflows/lint-test.yaml

@@ -46,7 +46,7 @@ jobs:
         uses: helm/[email protected]
         if: steps.list-changed.outputs.changed == 'true'
         with:
-          node_image: kindest/node:v1.25.11
+          node_image: kindest/node:v1.28.0
 
       - name: Run chart-testing (install) for flux2
         run: ct install --config ct.yaml --charts charts/flux2

Makefile

@@ -1,7 +1,7 @@
 # ====================================================================================
 # Setup Project
 
-FLUX2_VERSION ?= v2.1.2
+FLUX2_VERSION ?= v2.2.0
 
 # set the shell to bash always
 SHELL := /bin/bash

charts/flux2-notification/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: flux2-notification
 type: application
-version: 1.12.4
-appVersion: 2.1.2
+version: 1.13.0
+appVersion: 2.2.0
 description: A Helm chart for flux2 alerts and the needed providers and secrets
 sources:
   - https://github.com/fluxcd-community/helm-charts

charts/flux2-notification/templates/alert.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.alertlist}}
 {{- range $key, $alert := .Values.alertlist }}
 ---
-apiVersion: notification.toolkit.fluxcd.io/v1beta2
+apiVersion: notification.toolkit.fluxcd.io/v1beta3
 kind: Alert
 metadata:
   labels:

charts/flux2-notification/templates/provider.yaml

@@ -1,7 +1,7 @@
 {{- if .Values.providerlist}}
 {{- range $key, $provider := .Values.providerlist }}
 ---
-apiVersion: notification.toolkit.fluxcd.io/v1beta2
+apiVersion: notification.toolkit.fluxcd.io/v1beta3
 kind: Provider
 metadata:
   labels:

charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap

@@ -1,14 +1,14 @@
 should match snapshot:
   1: |
-    apiVersion: notification.toolkit.fluxcd.io/v1beta2
+    apiVersion: notification.toolkit.fluxcd.io/v1beta3
     kind: Alert
     metadata:
       labels:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        app.kubernetes.io/version: 2.1.2
-        helm.sh/chart: flux2-notification-1.12.4
+        app.kubernetes.io/version: 2.2.0
+        helm.sh/chart: flux2-notification-1.13.0
       name: all-kustomizations
       namespace: NAMESPACE
     spec:

charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap

@@ -1,14 +1,14 @@
 should match snapshot:
   1: |
-    apiVersion: notification.toolkit.fluxcd.io/v1beta2
+    apiVersion: notification.toolkit.fluxcd.io/v1beta3
     kind: Provider
     metadata:
       labels:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        app.kubernetes.io/version: 2.1.2
-        helm.sh/chart: flux2-notification-1.12.4
+        app.kubernetes.io/version: 2.2.0
+        helm.sh/chart: flux2-notification-1.13.0
       name: on-call-slack
       namespace: NAMESPACE
     spec:

charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap

@@ -7,8 +7,8 @@ should match snapshot of default values:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        app.kubernetes.io/version: 2.1.2
-        helm.sh/chart: flux2-notification-1.12.4
+        app.kubernetes.io/version: 2.2.0
+        helm.sh/chart: flux2-notification-1.13.0
       name: webhook-url
       namespace: NAMESPACE
     stringData:

charts/flux2-sync/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
 name: flux2-sync
 type: application
-version: 1.7.3
-appVersion: 2.1.2
+version: 1.8.0
+appVersion: 2.2.0
 description: A Helm chart for flux2 GitRepository to sync with
 sources:
   - https://github.com/fluxcd-community/helm-charts

charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap

@@ -7,7 +7,7 @@ should match snapshot of default values:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        helm.sh/chart: flux2-sync-1.7.3
+        helm.sh/chart: flux2-sync-1.8.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -24,7 +24,7 @@ should match snapshot with special values:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        helm.sh/chart: flux2-sync-1.7.3
+        helm.sh/chart: flux2-sync-1.8.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     spec:

charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap

@@ -7,7 +7,7 @@ should match kubeconfig:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        helm.sh/chart: flux2-sync-1.7.3
+        helm.sh/chart: flux2-sync-1.8.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     spec:

charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap

@@ -10,7 +10,7 @@ should match snapshot of default values:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        helm.sh/chart: flux2-sync-1.7.3
+        helm.sh/chart: flux2-sync-1.8.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     type: Opaque

charts/flux2-sync/values.yaml

@@ -17,7 +17,7 @@ secret:
 
 cli:
   image: ghcr.io/fluxcd/flux-cli
-  tag: v2.1.1
+  tag: v2.2.0
   nodeSelector: {}
   affinity: {}
   tolerations: []

charts/flux2/Chart.yaml

@@ -1,11 +1,11 @@
 annotations:
   artifacthub.io/changes: |
-    - "feat: adding CRD and RBAC annotation option"
+    - "feat: update CRDs and component versions to flux v2.2.0"
 apiVersion: v2
-appVersion: 2.1.2
+appVersion: 2.2.0
 description: A Helm chart for flux2
 name: flux2
 sources:
 - https://github.com/fluxcd-community/helm-charts
 type: application
-version: 2.11.1
+version: 2.12.0

charts/flux2/README.md

@@ -1,6 +1,6 @@
 # flux2
 
-![Version: 2.11.0](https://img.shields.io/badge/Version-2.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-informational?style=flat-square)
+![Version: 2.12.0](https://img.shields.io/badge/Version-2.12.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.2](https://img.shields.io/badge/AppVersion-2.1.2-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.1.2"` |  |
+| cli.tag | string | `"v2.2.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.36.2"` |  |
+| helmController.tag | string | `"v0.37.0"` |  |
 | 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.36.1"` |  |
+| imageAutomationController.tag | string | `"v0.37.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.30.0"` |  |
+| imageReflectionController.tag | string | `"v0.31.1"` |  |
 | 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.1.1"` |  |
+| kustomizeController.tag | string | `"v1.2.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.1.0"` |  |
+| notificationController.tag | string | `"v1.2.2"` |  |
 | notificationController.tolerations | list | `[]` |  |
 | notificationController.webhookReceiver.ingress.annotations | object | `{}` |  |
 | notificationController.webhookReceiver.ingress.create | bool | `false` |  |
@@ -169,6 +169,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.1.2"` |  |
+| sourceController.tag | string | `"v1.2.2"` |  |
 | sourceController.tolerations | list | `[]` |  |
 | watchAllNamespaces | bool | `true` |  |