Merge pull request #176 from jimid27/main

chore/update to 2.0.0-rc.3 app version
fluxcd-community · May 22, 2023 · e32fca4 · e32fca4
2 parents 9de9691 + b27ad1c
commit e32fca4
Show file tree

Hide file tree

Showing 30 changed files with 1,270 additions and 111 deletions.
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # ====================================================================================
 # Setup Project
 
-FLUX2_VERSION ?= v0.41.1
+FLUX2_VERSION ?= v2.0.0-rc.3
 
 # set the shell to bash always
 SHELL := /bin/bash

diff --git a/charts/flux2-notification/Chart.yaml b/charts/flux2-notification/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
 name: flux2-notification
 type: application
-version: 1.8.0
-appVersion: 0.41.1
+version: 1.9.0
+appVersion: 2.0.0-rc.3
 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: |
-    - "[Chore]: Update App Version to upstream 0.41.1"
+    - "[Chore]: Update App Version to upstream 2.0.0-rc.3"
diff --git a/charts/flux2-notification/README.md b/charts/flux2-notification/README.md
@@ -1,6 +1,6 @@
 # flux2-notification
 
-![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.1](https://img.shields.io/badge/AppVersion-0.41.1-informational?style=flat-square)
+![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc.3](https://img.shields.io/badge/AppVersion-2.0.0--rc.3-informational?style=flat-square)
 
 A Helm chart for flux2 alerts and the needed providers and secrets
 

diff --git a/charts/flux2-notification/templates/alert.yaml b/charts/flux2-notification/templates/alert.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.alertlist}}
 {{- range $key, $alert := .Values.alertlist }}
 ---
-apiVersion: notification.toolkit.fluxcd.io/v1beta1
+apiVersion: notification.toolkit.fluxcd.io/v1beta2
 kind: Alert
 metadata:
   labels:

diff --git a/charts/flux2-notification/templates/provider.yaml b/charts/flux2-notification/templates/provider.yaml
@@ -1,7 +1,7 @@
 {{- if .Values.providerlist}}
 {{- range $key, $provider := .Values.providerlist }}
 ---
-apiVersion: notification.toolkit.fluxcd.io/v1beta1
+apiVersion: notification.toolkit.fluxcd.io/v1beta2
 kind: Provider
 metadata:
   labels:

diff --git a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap
@@ -1,14 +1,14 @@
 should match snapshot:
   1: |
-    apiVersion: notification.toolkit.fluxcd.io/v1beta1
+    apiVersion: notification.toolkit.fluxcd.io/v1beta2
     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: 0.41.1
-        helm.sh/chart: flux2-notification-1.8.0
+        app.kubernetes.io/version: 2.0.0-rc.3
+        helm.sh/chart: flux2-notification-1.9.0
       name: all-kustomizations
       namespace: NAMESPACE
     spec:

diff --git a/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap
@@ -1,14 +1,14 @@
 should match snapshot:
   1: |
-    apiVersion: notification.toolkit.fluxcd.io/v1beta1
+    apiVersion: notification.toolkit.fluxcd.io/v1beta2
     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: 0.41.1
-        helm.sh/chart: flux2-notification-1.8.0
+        app.kubernetes.io/version: 2.0.0-rc.3
+        helm.sh/chart: flux2-notification-1.9.0
       name: on-call-slack
       namespace: NAMESPACE
     spec:

diff --git a/charts/flux2-notification/tests/__snapshot__/secret_test.yaml.snap b/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: 0.41.1
-        helm.sh/chart: flux2-notification-1.8.0
+        app.kubernetes.io/version: 2.0.0-rc.3
+        helm.sh/chart: flux2-notification-1.9.0
       name: webhook-url
       namespace: NAMESPACE
     stringData:

diff --git a/charts/flux2-sync/Chart.yaml b/charts/flux2-sync/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
 name: flux2-sync
 type: application
-version: 1.4.0
-appVersion: 0.41.1
+version: 1.5.0
+appVersion: 2.0.0-rc.3
 description: A Helm chart for flux2 GitRepository to sync with
 sources:
   - https://github.com/fluxcd-community/helm-charts
 annotations:
   artifacthub.io/changes: |
-    - "[Chore]: Update App Version to upstream 0.41.1"
+    - "[Chore]: Update App Version to upstream 2.0.0-rc.3"
diff --git a/charts/flux2-sync/README.md b/charts/flux2-sync/README.md
@@ -1,6 +1,6 @@
 # flux2-sync
 
-![Version: 1.4.0](https://img.shields.io/badge/Version-1.4.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.1](https://img.shields.io/badge/AppVersion-0.41.1-informational?style=flat-square)
+![Version: 1.5.0](https://img.shields.io/badge/Version-1.5.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc.3](https://img.shields.io/badge/AppVersion-2.0.0--rc.3-informational?style=flat-square)
 
 A Helm chart for flux2 GitRepository to sync with
 
@@ -17,7 +17,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | cli.affinity | object | `{}` |  |
 | cli.image | string | `"ghcr.io/fluxcd/flux-cli"` |  |
 | cli.nodeSelector | object | `{}` |  |
-| cli.tag | string | `"v0.41.1"` |  |
+| cli.tag | string | `"v2.0.0-rc.3"` |  |
 | cli.tolerations | list | `[]` |  |
 | gitRepository.annotations | object | `{}` |  |
 | gitRepository.labels | object | `{}` |  |

diff --git a/charts/flux2-sync/templates/flux-gitrepository.yaml b/charts/flux2-sync/templates/flux-gitrepository.yaml
@@ -1,4 +1,4 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta2
+apiVersion: source.toolkit.fluxcd.io/v1
 kind: GitRepository
 metadata:
   labels:

diff --git a/charts/flux2-sync/templates/flux-kustomization.yaml b/charts/flux2-sync/templates/flux-kustomization.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.kustomization }}
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   labels:
@@ -68,7 +68,7 @@ spec:
 {{- if .Values.kustomizationlist}}
 {{- range $key, $kust := .Values.kustomizationlist }}
 ---
-apiVersion: kustomize.toolkit.fluxcd.io/v1beta2
+apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   labels:

diff --git a/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap
@@ -1,13 +1,13 @@
 should match snapshot of default values:
   1: |
-    apiVersion: source.toolkit.fluxcd.io/v1beta2
+    apiVersion: source.toolkit.fluxcd.io/v1
     kind: GitRepository
     metadata:
       labels:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        helm.sh/chart: flux2-sync-1.4.0
+        helm.sh/chart: flux2-sync-1.5.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     spec:
@@ -17,14 +17,14 @@ should match snapshot of default values:
       url: repository_url
 should match snapshot with special values:
   1: |
-    apiVersion: source.toolkit.fluxcd.io/v1beta2
+    apiVersion: source.toolkit.fluxcd.io/v1
     kind: GitRepository
     metadata:
       labels:
         app.kubernetes.io/instance: NAMESPACE
         app.kubernetes.io/managed-by: Helm
         app.kubernetes.io/part-of: flux
-        helm.sh/chart: flux2-sync-1.4.0
+        helm.sh/chart: flux2-sync-1.5.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     spec:

diff --git a/charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap b/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.4.0
+        helm.sh/chart: flux2-sync-1.5.0
       name: RELEASE-NAME
       namespace: NAMESPACE
     type: Opaque
diff --git a/charts/flux2-sync/values.yaml b/charts/flux2-sync/values.yaml
@@ -17,7 +17,7 @@ secret:
 
 cli:
   image: ghcr.io/fluxcd/flux-cli
-  tag: v0.41.1
+  tag: v2.0.0-rc.3
   nodeSelector: {}
   affinity: {}
   tolerations: []

diff --git a/charts/flux2/Chart.yaml b/charts/flux2/Chart.yaml
@@ -1,11 +1,11 @@
 annotations:
   artifacthub.io/changes: |
-    - "[Chore]: Update App Version to upstream 0.41.1"
+    - "[Chore]: Update App Version to upstream 2.0.0-rc.3"
 apiVersion: v2
-appVersion: 0.41.1
+appVersion: 2.0.0-rc.3
 description: A Helm chart for flux2
 name: flux2
 sources:
 - https://github.com/fluxcd-community/helm-charts
 type: application
-version: 2.7.0
+version: 2.8.0
diff --git a/charts/flux2/README.md b/charts/flux2/README.md
@@ -1,6 +1,6 @@
 # flux2
 
-![Version: 2.7.0](https://img.shields.io/badge/Version-2.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.41.1](https://img.shields.io/badge/AppVersion-0.41.1-informational?style=flat-square)
+![Version: 2.8.0](https://img.shields.io/badge/Version-2.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0-rc.3](https://img.shields.io/badge/AppVersion-2.0.0--rc.3-informational?style=flat-square)
 
 A Helm chart for flux2
 
@@ -19,7 +19,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | cli.image | string | `"ghcr.io/fluxcd/flux-cli"` |  |
 | cli.nodeSelector | object | `{}` |  |
 | cli.serviceAccount.automount | bool | `true` |  |
-| cli.tag | string | `"v0.41.1"` |  |
+| cli.tag | string | `"v2.0.0-rc.3"` |  |
 | cli.tolerations | list | `[]` |  |
 | clusterDomain | string | `"cluster.local"` |  |
 | extraObjects | list | `[]` | Array of extra K8s manifests to deploy |
@@ -39,7 +39,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | helmController.serviceAccount.annotations | object | `{}` |  |
 | helmController.serviceAccount.automount | bool | `true` |  |
 | helmController.serviceAccount.create | bool | `true` |  |
-| helmController.tag | string | `"v0.31.1"` |  |
+| helmController.tag | string | `"v0.33.0"` |  |
 | helmController.tolerations | list | `[]` |  |
 | imageAutomationController.affinity | object | `{}` |  |
 | imageAutomationController.annotations."prometheus.io/port" | string | `"8080"` |  |
@@ -57,7 +57,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | imageAutomationController.serviceAccount.annotations | object | `{}` |  |
 | imageAutomationController.serviceAccount.automount | bool | `true` |  |
 | imageAutomationController.serviceAccount.create | bool | `true` |  |
-| imageAutomationController.tag | string | `"v0.31.0"` |  |
+| imageAutomationController.tag | string | `"v0.33.1"` |  |
 | imageAutomationController.tolerations | list | `[]` |  |
 | imagePullSecrets | list | `[]` | contents of pod imagePullSecret in form 'name=[secretName]'; applied to all controllers |
 | imageReflectionController.affinity | object | `{}` |  |
@@ -76,7 +76,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | imageReflectionController.serviceAccount.annotations | object | `{}` |  |
 | imageReflectionController.serviceAccount.automount | bool | `true` |  |
 | imageReflectionController.serviceAccount.create | bool | `true` |  |
-| imageReflectionController.tag | string | `"v0.26.0"` |  |
+| imageReflectionController.tag | string | `"v0.27.2"` |  |
 | imageReflectionController.tolerations | list | `[]` |  |
 | installCRDs | bool | `true` |  |
 | kustomizeController.affinity | object | `{}` |  |
@@ -100,7 +100,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | kustomizeController.serviceAccount.annotations | object | `{}` |  |
 | kustomizeController.serviceAccount.automount | bool | `true` |  |
 | kustomizeController.serviceAccount.create | bool | `true` |  |
-| kustomizeController.tag | string | `"v0.35.0"` |  |
+| kustomizeController.tag | string | `"v1.0.0-rc.3"` |  |
 | 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. |
@@ -124,7 +124,7 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | notificationController.serviceAccount.annotations | object | `{}` |  |
 | notificationController.serviceAccount.automount | bool | `true` |  |
 | notificationController.serviceAccount.create | bool | `true` |  |
-| notificationController.tag | string | `"v0.33.0"` |  |
+| notificationController.tag | string | `"v1.0.0-rc.3"` |  |
 | notificationController.tolerations | list | `[]` |  |
 | notificationController.webhookReceiver.service.annotations | object | `{}` |  |
 | notificationController.webhookReceiver.service.labels | object | `{}` |  |
@@ -155,6 +155,6 @@ This helm chart is maintain and released by the fluxcd-community on a best effor
 | sourceController.serviceAccount.annotations | object | `{}` |  |
 | sourceController.serviceAccount.automount | bool | `true` |  |
 | sourceController.serviceAccount.create | bool | `true` |  |
-| sourceController.tag | string | `"v0.36.0"` |  |
+| sourceController.tag | string | `"v1.0.0-rc.3"` |  |
 | sourceController.tolerations | list | `[]` |  |
 | watchAllNamespaces | bool | `true` |  |
diff --git a/charts/flux2/templates/helm-controller.crds.yaml b/charts/flux2/templates/helm-controller.crds.yaml
@@ -57,6 +57,27 @@ spec:
                 description: Chart defines the template of the v1beta2.HelmChart that
                   should be created for this HelmRelease.
                 properties:
+                  metadata:
+                    description: ObjectMeta holds the template for metadata like labels
+                      and annotations.
+                    properties:
+                      annotations:
+                        additionalProperties:
+                          type: string
+                        description: 'Annotations is an unstructured key value map
+                          stored with a resource that may be set by external tools
+                          to store and retrieve arbitrary metadata. They are not queryable
+                          and should be preserved when modifying objects. More info:
+                          https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/'
+                        type: object
+                      labels:
+                        additionalProperties:
+                          type: string
+                        description: 'Map of string keys and values that can be used
+                          to organize and categorize (scope and select) objects. More
+                          info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/'
+                        type: object
+                    type: object
                   spec:
                     description: Spec holds the template for the v1beta2.HelmChartSpec
                       for this HelmRelease.
@@ -307,6 +328,17 @@ spec:
                   this HelmRelease. Use '0' for an unlimited number of revisions;
                   defaults to '10'.
                 type: integer
+              persistentClient:
+                description: "PersistentClient tells the controller to use a persistent
+                  Kubernetes client for this release. When enabled, the client will
+                  be reused for the duration of the reconciliation, instead of being
+                  created and destroyed for each (step of a) Helm action. \n This
+                  can improve performance, but may cause issues with some Helm charts
+                  that for example do create Custom Resource Definitions during installation
+                  outside Helm's CRD lifecycle hooks, which are then not observed
+                  to be available by e.g. post-install hooks. \n If not set, it defaults
+                  to true."
+                type: boolean
               postRenderers:
                 description: PostRenderers holds an array of Helm PostRenderers, which
                   will be applied in order of their definition.
@@ -399,6 +431,8 @@ spec:
                                       selecting resources. https://github.com/kubernetes/community/blob/master/contributors/design-proposals/api-machinery/api-group.md
                                     type: string
                                 type: object
+                            required:
+                            - patch
                             type: object
                           type: array
                         patchesJson6902: