From 7df81079e18e07fb2963d8d385995214f840fa95 Mon Sep 17 00:00:00 2001 From: Jimi Dodd-o Date: Wed, 5 Jul 2023 13:27:57 -0400 Subject: [PATCH] chore: upgrade charts to Flux v2.0.0 (GA) (#177) Upgrade charts to Flux v2.0.0 (GA) Signed-off-by: Jimi Dodd-o --- .github/workflows/e2e-sync.yaml | 6 ++--- .github/workflows/lint-test.yaml | 4 +++- Makefile | 2 +- charts/flux2-notification/Chart.yaml | 6 ++--- charts/flux2-notification/README.md | 2 +- .../tests/__snapshot__/alert_test.yaml.snap | 4 ++-- .../__snapshot__/provider_test.yaml.snap | 4 ++-- .../tests/__snapshot__/secret_test.yaml.snap | 4 ++-- charts/flux2-sync/Chart.yaml | 6 ++--- charts/flux2-sync/README.md | 4 ++-- .../flux-gitrepository_test.yaml.snap | 4 ++-- .../tests/__snapshot__/secret_test.yaml.snap | 2 +- charts/flux2-sync/values.yaml | 2 +- charts/flux2/Chart.yaml | 6 ++--- charts/flux2/README.md | 16 ++++++------- .../flux2/templates/helm-controller.crds.yaml | 11 ++++++++- .../image-automation-controller.crds.yaml | 2 +- .../image-reflector-controller.crds.yaml | 4 ++-- .../templates/kustomize-controller.crds.yaml | 2 +- .../notification-controller.crds.yaml | 24 ++++++++++++------- .../templates/source-controller.crds.yaml | 10 ++++---- .../helm-controller_test.yaml.snap | 6 ++--- ...image-automation-controller_test.yaml.snap | 6 ++--- .../image-reflector-controller_test.yaml.snap | 6 ++--- ...kustomize-controller-secret_test.yaml.snap | 4 ++-- .../kustomize-controller_test.yaml.snap | 6 ++--- .../notification-controller_test.yaml.snap | 6 ++--- .../pre-install-job_test.yaml.snap | 10 ++++---- .../source-controller_test.yaml.snap | 6 ++--- charts/flux2/values.yaml | 14 +++++------ 30 files changed, 103 insertions(+), 86 deletions(-) diff --git a/.github/workflows/e2e-sync.yaml b/.github/workflows/e2e-sync.yaml index 9f8d143..90e2885 100644 --- a/.github/workflows/e2e-sync.yaml +++ b/.github/workflows/e2e-sync.yaml @@ -15,10 +15,10 @@ jobs: - name: Setup Flux CLI uses: fluxcd/flux2/action@main - name: Setup Kubernetes - uses: engineerd/setup-kind@v0.5.0 + uses: helm/kind-action@v1.4.0 with: - version: v0.11.1 - image: kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61 + cluster_name: kind + node_image: kindest/node:v1.24.15 - name: Setup Helm uses: fluxcd/pkg//actions/helm@main with: diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index bf45ce3..75dcbb1 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -42,8 +42,10 @@ jobs: if: steps.list-changed.outputs.changed == 'true' - name: Create kind cluster - uses: helm/kind-action@v1.2.0 + uses: helm/kind-action@v1.4.0 if: steps.list-changed.outputs.changed == 'true' + with: + node_image: kindest/node:v1.24.15 - name: Run chart-testing (install) for flux2 run: ct install --config ct.yaml --charts charts/flux2 diff --git a/Makefile b/Makefile index 8ddf905..77f78d6 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ==================================================================================== # Setup Project -FLUX2_VERSION ?= v2.0.0-rc.3 +FLUX2_VERSION ?= v2.0.0 # set the shell to bash always SHELL := /bin/bash diff --git a/charts/flux2-notification/Chart.yaml b/charts/flux2-notification/Chart.yaml index 4cc9fe7..768c44e 100644 --- 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.9.0 -appVersion: 2.0.0-rc.3 +version: 1.10.0 +appVersion: 2.0.0 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 2.0.0-rc.3" + - "[Chore]: Update App Version to upstream 2.0.0" diff --git a/charts/flux2-notification/README.md b/charts/flux2-notification/README.md index cdb0197..cba2603 100644 --- a/charts/flux2-notification/README.md +++ b/charts/flux2-notification/README.md @@ -1,6 +1,6 @@ # flux2-notification -![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) +![Version: 1.10.0](https://img.shields.io/badge/Version-1.10.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square) A Helm chart for flux2 alerts and the needed providers and secrets diff --git a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap b/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap index 396650a..7cc7ab4 100644 --- a/charts/flux2-notification/tests/__snapshot__/alert_test.yaml.snap +++ b/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.0.0-rc.3 - helm.sh/chart: flux2-notification-1.9.0 + app.kubernetes.io/version: 2.0.0 + helm.sh/chart: flux2-notification-1.10.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 index b3ee2d9..c6af901 100644 --- a/charts/flux2-notification/tests/__snapshot__/provider_test.yaml.snap +++ b/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.0.0-rc.3 - helm.sh/chart: flux2-notification-1.9.0 + app.kubernetes.io/version: 2.0.0 + helm.sh/chart: flux2-notification-1.10.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 index 88ed93e..2b05335 100644 --- 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: 2.0.0-rc.3 - helm.sh/chart: flux2-notification-1.9.0 + app.kubernetes.io/version: 2.0.0 + helm.sh/chart: flux2-notification-1.10.0 name: webhook-url namespace: NAMESPACE stringData: diff --git a/charts/flux2-sync/Chart.yaml b/charts/flux2-sync/Chart.yaml index 6cdeae8..426e1b8 100644 --- 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.5.0 -appVersion: 2.0.0-rc.3 +version: 1.6.0 +appVersion: 2.0.0 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 2.0.0-rc.3" + - "[Chore]: Update App Version to upstream 2.0.0" diff --git a/charts/flux2-sync/README.md b/charts/flux2-sync/README.md index df16595..00de84e 100644 --- a/charts/flux2-sync/README.md +++ b/charts/flux2-sync/README.md @@ -1,6 +1,6 @@ # flux2-sync -![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) +![Version: 1.6.0](https://img.shields.io/badge/Version-1.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-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 | `"v2.0.0-rc.3"` | | +| cli.tag | string | `"v2.0.0"` | | | cli.tolerations | list | `[]` | | | gitRepository.annotations | object | `{}` | | | gitRepository.labels | object | `{}` | | diff --git a/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap index 7f75007..bed4870 100644 --- a/charts/flux2-sync/tests/__snapshot__/flux-gitrepository_test.yaml.snap +++ b/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.5.0 + helm.sh/chart: flux2-sync-1.6.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.5.0 + helm.sh/chart: flux2-sync-1.6.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 index bc7073c..f57ecec 100644 --- 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.5.0 + helm.sh/chart: flux2-sync-1.6.0 name: RELEASE-NAME namespace: NAMESPACE type: Opaque diff --git a/charts/flux2-sync/values.yaml b/charts/flux2-sync/values.yaml index 96a4d2d..d746478 100644 --- 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: v2.0.0-rc.3 + tag: v2.0.0 nodeSelector: {} affinity: {} tolerations: [] diff --git a/charts/flux2/Chart.yaml b/charts/flux2/Chart.yaml index a6cf882..20cc0a6 100644 --- a/charts/flux2/Chart.yaml +++ b/charts/flux2/Chart.yaml @@ -1,11 +1,11 @@ annotations: artifacthub.io/changes: | - - "[Chore]: Update App Version to upstream 2.0.0-rc.3" + - "[Chore]: Update App Version to upstream 2.0.0" apiVersion: v2 -appVersion: 2.0.0-rc.3 +appVersion: 2.0.0 description: A Helm chart for flux2 name: flux2 sources: - https://github.com/fluxcd-community/helm-charts type: application -version: 2.8.0 +version: 2.9.0 diff --git a/charts/flux2/README.md b/charts/flux2/README.md index 7b824f7..0d8e8fd 100644 --- a/charts/flux2/README.md +++ b/charts/flux2/README.md @@ -1,6 +1,6 @@ # flux2 -![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) +![Version: 2.9.0](https://img.shields.io/badge/Version-2.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-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 | `"v2.0.0-rc.3"` | | +| cli.tag | string | `"v2.0.0"` | | | 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.33.0"` | | +| helmController.tag | string | `"v0.35.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.33.1"` | | +| imageAutomationController.tag | string | `"v0.35.0"` | | | 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.27.2"` | | +| imageReflectionController.tag | string | `"v0.29.0"` | | | 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 | `"v1.0.0-rc.3"` | | +| kustomizeController.tag | string | `"v1.0.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. | @@ -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 | `"v1.0.0-rc.3"` | | +| notificationController.tag | string | `"v1.0.0"` | | | 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 | `"v1.0.0-rc.3"` | | +| sourceController.tag | string | `"v1.0.0"` | | | sourceController.tolerations | list | `[]` | | | watchAllNamespaces | bool | `true` | | diff --git a/charts/flux2/templates/helm-controller.crds.yaml b/charts/flux2/templates/helm-controller.crds.yaml index 7d48d89..e00d897 100644 --- a/charts/flux2/templates/helm-controller.crds.yaml +++ b/charts/flux2/templates/helm-controller.crds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -632,6 +632,15 @@ spec: description: Uninstall holds the configuration for Helm uninstall actions for this HelmRelease. properties: + deletionPropagation: + default: background + description: DeletionPropagation specifies the deletion propagation + policy when a Helm uninstall is performed. + enum: + - background + - foreground + - orphan + type: string disableHooks: description: DisableHooks prevents hooks from running during the Helm rollback action. diff --git a/charts/flux2/templates/image-automation-controller.crds.yaml b/charts/flux2/templates/image-automation-controller.crds.yaml index e274d77..f4acd50 100644 --- a/charts/flux2/templates/image-automation-controller.crds.yaml +++ b/charts/flux2/templates/image-automation-controller.crds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' diff --git a/charts/flux2/templates/image-reflector-controller.crds.yaml b/charts/flux2/templates/image-reflector-controller.crds.yaml index 0f89281..934a11a 100644 --- a/charts/flux2/templates/image-reflector-controller.crds.yaml +++ b/charts/flux2/templates/image-reflector-controller.crds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -412,7 +412,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' diff --git a/charts/flux2/templates/kustomize-controller.crds.yaml b/charts/flux2/templates/kustomize-controller.crds.yaml index 4be4d6f..cff51f9 100644 --- a/charts/flux2/templates/kustomize-controller.crds.yaml +++ b/charts/flux2/templates/kustomize-controller.crds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' diff --git a/charts/flux2/templates/notification-controller.crds.yaml b/charts/flux2/templates/notification-controller.crds.yaml index f5d215c..ba4026e 100644 --- a/charts/flux2/templates/notification-controller.crds.yaml +++ b/charts/flux2/templates/notification-controller.crds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -250,9 +250,11 @@ spec: additionalProperties: type: string description: EventMetadata is an optional field for adding metadata - to events emitted by the controller. Metadata fields added by the - controller have priority over the fields added here, and the fields - added here have priority over fields originally present in the event. + to events dispatched by the controller. This can be used for enhancing + the context of the event. If a field would override one already + present on the original event as generated by the emitter, then + the override doesn't happen, i.e. the original value is preserved, + and an info log is printed. type: object eventSeverity: default: info @@ -440,7 +442,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -672,10 +674,12 @@ spec: description: ProviderSpec defines the desired state of the Provider. properties: address: - description: Address specifies the HTTP/S incoming webhook address - of this Provider. + description: Address specifies the endpoint, in a generic sense, to + where alerts are sent. What kind of endpoint depends on the specific + Provider type being used. For the generic Provider, for example, + this is an HTTP/S address. For other Provider types this could be + a project ID or a namespace. maxLength: 2048 - pattern: ^(http|https)://.*$ type: string certSecretRef: description: CertSecretRef specifies the Secret containing a PEM-encoded @@ -735,6 +739,7 @@ spec: - bitbucket - azuredevops - googlechat + - googlepubsub - webex - sentry - azureeventhub @@ -745,6 +750,7 @@ spec: - alertmanager - grafana - githubdispatch + - pagerduty type: string username: description: Username specifies the name under which events are posted. @@ -847,7 +853,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' diff --git a/charts/flux2/templates/source-controller.crds.yaml b/charts/flux2/templates/source-controller.crds.yaml index d4b9468..6f1bb72 100644 --- a/charts/flux2/templates/source-controller.crds.yaml +++ b/charts/flux2/templates/source-controller.crds.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -521,7 +521,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -1703,7 +1703,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -2300,7 +2300,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' @@ -2806,7 +2806,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.11.1 + controller-gen.kubebuilder.io/version: v0.12.0 creationTimestamp: null labels: app.kubernetes.io/instance: '{{ .Release.Namespace }}' diff --git a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap index 08e0449..1b72131 100644 --- a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap @@ -7,9 +7,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.0.0-rc.3 + app.kubernetes.io/version: 2.0.0 control-plane: controller - helm.sh/chart: flux2-2.8.0 + helm.sh/chart: flux2-2.9.0 name: helm-controller spec: replicas: 1 @@ -39,7 +39,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/helm-controller:v0.33.0 + image: ghcr.io/fluxcd/helm-controller:v0.35.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap index 0ac0863..7d7ef1a 100644 --- a/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/image-automation-controller_test.yaml.snap @@ -7,9 +7,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.0.0-rc.3 + app.kubernetes.io/version: 2.0.0 control-plane: controller - helm.sh/chart: flux2-2.8.0 + helm.sh/chart: flux2-2.9.0 name: image-automation-controller spec: replicas: 1 @@ -37,7 +37,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/image-automation-controller:v0.33.1 + image: ghcr.io/fluxcd/image-automation-controller:v0.35.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap index 6a087ff..60e4134 100644 --- a/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/image-reflector-controller_test.yaml.snap @@ -7,9 +7,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.0.0-rc.3 + app.kubernetes.io/version: 2.0.0 control-plane: controller - helm.sh/chart: flux2-2.8.0 + helm.sh/chart: flux2-2.9.0 name: image-reflector-controller spec: replicas: 1 @@ -37,7 +37,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/image-reflector-controller:v0.27.2 + image: ghcr.io/fluxcd/image-reflector-controller:v0.29.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap b/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap index a1d9022..4bbe47b 100644 --- a/charts/flux2/tests/__snapshot__/kustomize-controller-secret_test.yaml.snap +++ b/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.0.0-rc.3 - helm.sh/chart: flux2-2.8.0 + app.kubernetes.io/version: 2.0.0 + helm.sh/chart: flux2-2.9.0 name: test1 namespace: NAMESPACE type: Opaque diff --git a/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap index 8c3f93e..d412441 100644 --- a/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/kustomize-controller_test.yaml.snap @@ -7,9 +7,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.0.0-rc.3 + app.kubernetes.io/version: 2.0.0 control-plane: controller - helm.sh/chart: flux2-2.8.0 + helm.sh/chart: flux2-2.9.0 name: kustomize-controller spec: replicas: 1 @@ -37,7 +37,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/kustomize-controller:v1.0.0-rc.3 + image: ghcr.io/fluxcd/kustomize-controller:v1.0.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap index eae4179..c54256e 100644 --- a/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/notification-controller_test.yaml.snap @@ -7,9 +7,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.0.0-rc.3 + app.kubernetes.io/version: 2.0.0 control-plane: controller - helm.sh/chart: flux2-2.8.0 + helm.sh/chart: flux2-2.9.0 name: notification-controller spec: replicas: 1 @@ -36,7 +36,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/notification-controller:v1.0.0-rc.3 + image: ghcr.io/fluxcd/notification-controller:v1.0.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap b/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap index 380be2a..7f6800b 100644 --- a/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap @@ -11,8 +11,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.0.0-rc.3 - helm.sh/chart: flux2-2.8.0 + app.kubernetes.io/version: 2.0.0 + helm.sh/chart: flux2-2.9.0 name: RELEASE-NAME-flux-check spec: backoffLimit: 1 @@ -22,8 +22,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.0.0-rc.3 - helm.sh/chart: flux2-2.8.0 + app.kubernetes.io/version: 2.0.0 + helm.sh/chart: flux2-2.9.0 name: RELEASE-NAME spec: automountServiceAccountToken: true @@ -34,7 +34,7 @@ should match snapshot of default values: - --pre - --namespace - NAMESPACE - image: ghcr.io/fluxcd/flux-cli:v2.0.0-rc.3 + image: ghcr.io/fluxcd/flux-cli:v2.0.0 name: flux-cli securityContext: allowPrivilegeEscalation: false diff --git a/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap index c0c3514..4622016 100644 --- a/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap +++ b/charts/flux2/tests/__snapshot__/source-controller_test.yaml.snap @@ -7,9 +7,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.0.0-rc.3 + app.kubernetes.io/version: 2.0.0 control-plane: controller - helm.sh/chart: flux2-2.8.0 + helm.sh/chart: flux2-2.9.0 name: source-controller spec: replicas: 1 @@ -41,7 +41,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/source-controller:v1.0.0-rc.3 + image: ghcr.io/fluxcd/source-controller:v1.0.0 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/values.yaml b/charts/flux2/values.yaml index d9cecbc..8a28a97 100644 --- a/charts/flux2/values.yaml +++ b/charts/flux2/values.yaml @@ -20,7 +20,7 @@ clusterDomain: cluster.local cli: image: ghcr.io/fluxcd/flux-cli - tag: v2.0.0-rc.3 + tag: v2.0.0 nodeSelector: {} affinity: {} tolerations: [] @@ -33,7 +33,7 @@ cli: helmController: create: true image: ghcr.io/fluxcd/helm-controller - tag: v0.33.0 + tag: v0.35.0 resources: limits: {} # cpu: 1000m @@ -80,7 +80,7 @@ helmController: imageAutomationController: create: true image: ghcr.io/fluxcd/image-automation-controller - tag: v0.33.1 + tag: v0.35.0 resources: limits: {} # cpu: 1000m @@ -107,7 +107,7 @@ imageAutomationController: imageReflectionController: create: true image: ghcr.io/fluxcd/image-reflector-controller - tag: v0.27.2 + tag: v0.29.0 resources: limits: {} # cpu: 1000m @@ -134,7 +134,7 @@ imageReflectionController: kustomizeController: create: true image: ghcr.io/fluxcd/kustomize-controller - tag: v1.0.0-rc.3 + tag: v1.0.0 resources: limits: {} # cpu: 1000m @@ -181,7 +181,7 @@ kustomizeController: notificationController: create: true image: ghcr.io/fluxcd/notification-controller - tag: v1.0.0-rc.3 + tag: v1.0.0 resources: limits: {} # cpu: 1000m @@ -215,7 +215,7 @@ notificationController: sourceController: create: true image: ghcr.io/fluxcd/source-controller - tag: v1.0.0-rc.3 + tag: v1.0.0 resources: limits: {} # cpu: 1000m