Merge pull request #206 from ravilr/release-v2.2.2

chore: upgrade charts to Flux v2.2.2 release

Makefile

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

charts/flux2-notification/Chart.yaml

@@ -1,11 +1,11 @@
 apiVersion: v2
 name: flux2-notification
 type: application
-version: 1.13.0
-appVersion: 2.2.0
+version: 1.13.1
+appVersion: 2.2.2
 description: A Helm chart for flux2 alerts and the needed providers and secrets
 sources:
   - https://github.com/fluxcd-community/helm-charts
 annotations:
   artifacthub.io/changes: |
-    - "docs: fix grammar""
+    - "[Chore]: Update App Version to upstream 2.2.2"

charts/flux2-notification/README.md

@@ -1,6 +1,6 @@
 # flux2-notification
 
-![Version: 1.12.4](https://img.shields.io/badge/Version-1.12.4-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: 1.13.1](https://img.shields.io/badge/Version-1.13.1-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)
 
 A Helm chart for flux2 alerts and the needed providers and secrets
 

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

@@ -7,8 +7,8 @@ should match snapshot:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        app.kubernetes.io/version: 2.2.0
-        helm.sh/chart: flux2-notification-1.13.0
+        app.kubernetes.io/version: 2.2.2
+        helm.sh/chart: flux2-notification-1.13.1
       name: all-kustomizations
       namespace: NAMESPACE
     spec:

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

@@ -7,8 +7,8 @@ should match snapshot:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        app.kubernetes.io/version: 2.2.0
-        helm.sh/chart: flux2-notification-1.13.0
+        app.kubernetes.io/version: 2.2.2
+        helm.sh/chart: flux2-notification-1.13.1
       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.2.0
-        helm.sh/chart: flux2-notification-1.13.0
+        app.kubernetes.io/version: 2.2.2
+        helm.sh/chart: flux2-notification-1.13.1
       name: webhook-url
       namespace: NAMESPACE
     stringData:

charts/flux2-sync/Chart.yaml

@@ -1,11 +1,11 @@
 apiVersion: v2
 name: flux2-sync
 type: application
-version: 1.8.0
-appVersion: 2.2.0
+version: 1.8.1
+appVersion: 2.2.2
 description: A Helm chart for flux2 GitRepository to sync with
 sources:
   - https://github.com/fluxcd-community/helm-charts
 annotations:
   artifacthub.io/changes: |
-    - "docs: fix grammar"
+    - "[Chore]: Update App Version to upstream 2.2.2"

charts/flux2-sync/README.md

@@ -1,6 +1,6 @@
 # flux2-sync
 
-![Version: 1.7.3](https://img.shields.io/badge/Version-1.7.3-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: 1.8.1](https://img.shields.io/badge/Version-1.8.1-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)
 
 A Helm chart for flux2 GitRepository to sync with
 
@@ -17,7 +17,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
 | cli.affinity | object | `{}` |  |
 | cli.image | string | `"ghcr.io/fluxcd/flux-cli"` |  |
 | cli.nodeSelector | object | `{}` |  |
-| cli.tag | string | `"v2.1.1"` |  |
+| cli.tag | string | `"v2.2.2"` |  |
 | cli.tolerations | list | `[]` |  |
 | gitRepository.annotations | object | `{}` |  |
 | gitRepository.labels | object | `{}` |  |

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.8.0
+        helm.sh/chart: flux2-sync-1.8.1
       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.8.0
+        helm.sh/chart: flux2-sync-1.8.1
       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.8.0
+        helm.sh/chart: flux2-sync-1.8.1
       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.8.0
+        helm.sh/chart: flux2-sync-1.8.1
       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.2.0
+  tag: v2.2.2
   nodeSelector: {}
   affinity: {}
   tolerations: []

charts/flux2/Chart.yaml

@@ -1,11 +1,11 @@
 annotations:
   artifacthub.io/changes: |
-    - "chore: disallow source-controller replica count other than 1"
+    - "[Chore]: Update App Version to upstream 2.2.2"
 apiVersion: v2
-appVersion: 2.2.0
+appVersion: 2.2.2
 description: A Helm chart for flux2
 name: flux2
 sources:
 - https://github.com/fluxcd-community/helm-charts
 type: application
-version: 2.12.1
+version: 2.12.2

charts/flux2/README.md

@@ -1,6 +1,6 @@
 # flux2
 
-![Version: 2.12.1](https://img.shields.io/badge/Version-2.12.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.0](https://img.shields.io/badge/AppVersion-2.2.0-informational?style=flat-square)
+![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)
 
 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.0"` |  |
+| cli.tag | string | `"v2.2.2"` |  |
 | 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.0"` |  |
+| helmController.tag | string | `"v0.37.2"` |  |
 | helmController.tolerations | list | `[]` |  |
 | imageAutomationController.affinity | object | `{}` |  |
 | imageAutomationController.annotations."prometheus.io/port" | string | `"8080"` |  |
@@ -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.0"` |  |
+| kustomizeController.tag | string | `"v1.2.1"` |  |
 | 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.2"` |  |
+| notificationController.tag | string | `"v1.2.3"` |  |
 | 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.2.2"` |  |
+| sourceController.tag | string | `"v1.2.3"` |  |
 | sourceController.tolerations | list | `[]` |  |
 | watchAllNamespaces | bool | `true` |  |

charts/flux2/templates/helm-controller.crds.yaml

@@ -209,6 +209,82 @@ spec:
                   - name
                   type: object
                 type: array
+              driftDetection:
+                description: "DriftDetection holds the configuration for detecting
+                  and handling differences between the manifest in the Helm storage
+                  and the resources currently existing in the cluster. \n Note: this
+                  field is provisional to the v2beta2 API, and not actively used by
+                  v2beta1 HelmReleases."
+                properties:
+                  ignore:
+                    description: Ignore contains a list of rules for specifying which
+                      changes to ignore during diffing.
+                    items:
+                      description: IgnoreRule defines a rule to selectively disregard
+                        specific changes during the drift detection process.
+                      properties:
+                        paths:
+                          description: Paths is a list of JSON Pointer (RFC 6901)
+                            paths to be excluded from consideration in a Kubernetes
+                            object.
+                          items:
+                            type: string
+                          type: array
+                        target:
+                          description: Target is a selector for specifying Kubernetes
+                            objects to which this rule applies. If Target is not set,
+                            the Paths will be ignored for all Kubernetes objects within
+                            the manifest of the Helm release.
+                          properties:
+                            annotationSelector:
+                              description: AnnotationSelector is a string that follows
+                                the label selection expression https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
+                                It matches with the resource annotations.
+                              type: string
+                            group:
+                              description: Group is the API group to select resources
+                                from. Together with Version and Kind it is capable
+                                of unambiguously identifying and/or selecting resources.
+                                https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
+                              type: string
+                            kind:
+                              description: Kind of the API Group to select resources
+                                from. Together with Group and Version it is capable
+                                of unambiguously identifying and/or selecting resources.
+                                https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
+                              type: string
+                            labelSelector:
+                              description: LabelSelector is a string that follows
+                                the label selection expression https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#api
+                                It matches with the resource labels.
+                              type: string
+                            name:
+                              description: Name to match resources with.
+                              type: string
+                            namespace:
+                              description: Namespace to select resources from.
+                              type: string
+                            version:
+                              description: Version of the API Group to select resources
+                                from. Together with Group and Kind it is capable of
+                                unambiguously identifying and/or selecting resources.
+                                https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
+                              type: string
+                          type: object
+                      required:
+                      - paths
+                      type: object
+                    type: array
+                  mode:
+                    description: Mode defines how differences should be handled between
+                      the Helm manifest and the manifest currently applied to the
+                      cluster. If not explicitly set, it defaults to DiffModeDisabled.
+                    enum:
+                    - enabled
+                    - warn
+                    - disabled
+                    type: string
+                type: object
               install:
                 description: Install holds the configuration for Helm install actions
                   for this HelmRelease.
@@ -1021,11 +1097,23 @@ spec:
                 description: LastAttemptedValuesChecksum is the SHA1 checksum of the
                   values of the last reconciliation attempt.
                 type: string
+              lastHandledForceAt:
+                description: "LastHandledForceAt holds the value of the most recent
+                  force request value, so a change of the annotation value can be
+                  detected. \n Note: this field is provisional to the v2beta2 API,
+                  and not actively used by v2beta1 HelmReleases."
+                type: string
               lastHandledReconcileAt:
                 description: LastHandledReconcileAt holds the value of the most recent
                   reconcile request value, so a change of the annotation value can
                   be detected.
                 type: string
+              lastHandledResetAt:
+                description: "LastHandledResetAt holds the value of the most recent
+                  reset request value, so a change of the annotation value can be
+                  detected. \n Note: this field is provisional to the v2beta2 API,
+                  and not actively used by v2beta1 HelmReleases."
+                type: string
               lastReleaseRevision:
                 description: LastReleaseRevision is the revision of the last successful
                   Helm release.

charts/flux2/templates/notification-controller.crds.yaml

@@ -1042,6 +1042,11 @@ spec:
                   should be posted.
                 maxLength: 2048
                 type: string
+              interval:
+                description: Interval at which to reconcile the Provider with its
+                  Secret references. Deprecated and not used in v1beta3.
+                pattern: ^([0-9]+(\.[0-9]+)?(ms|s|m|h))+$
+                type: string
               proxy:
                 description: Proxy the HTTP/S address of the proxy server.
                 maxLength: 2048

charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap

@@ -8,9 +8,9 @@ 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.2.0
+        app.kubernetes.io/version: 2.2.2
         control-plane: controller
-        helm.sh/chart: flux2-2.12.1
+        helm.sh/chart: flux2-2.12.2
         labeltestkey: labeltestvalue
         labeltestkey2: labeltestvalue2
       name: helm-controller
@@ -42,7 +42,7 @@ should match snapshot of default values:
                   valueFrom:
                     fieldRef:
                       fieldPath: metadata.namespace
-              image: ghcr.io/fluxcd/helm-controller:v0.37.0
+              image: ghcr.io/fluxcd/helm-controller:v0.37.2
               imagePullPolicy: IfNotPresent
               livenessProbe:
                 httpGet:

charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap

@@ -8,9 +8,9 @@ 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.2.0
+        app.kubernetes.io/version: 2.2.2
         control-plane: controller
-        helm.sh/chart: flux2-2.12.1
+        helm.sh/chart: flux2-2.12.2
       name: image-automation-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap

@@ -8,9 +8,9 @@ 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.2.0
+        app.kubernetes.io/version: 2.2.2
         control-plane: controller
-        helm.sh/chart: flux2-2.12.1
+        helm.sh/chart: flux2-2.12.2
       name: image-reflector-controller
     spec:
       replicas: 1

charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap

@@ -9,8 +9,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.2.0
-        helm.sh/chart: flux2-2.12.1
+        app.kubernetes.io/version: 2.2.2
+        helm.sh/chart: flux2-2.12.2
       name: test1
       namespace: NAMESPACE
     type: Opaque