From 402d33158055edda70b945e6f7e282670ee7b2c8 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Tue, 24 Oct 2023 06:26:22 -0700 Subject: [PATCH] Update to Flux 2.1.2 Signed-off-by: Tamal Saha --- Makefile | 2 +- charts/flux2-notification/Chart.yaml | 6 +++--- charts/flux2-notification/README.md | 2 +- .../tests/__snapshot__/alert_test.yaml.snap | 4 ++-- .../tests/__snapshot__/provider_test.yaml.snap | 4 ++-- .../tests/__snapshot__/secret_test.yaml.snap | 4 ++-- charts/flux2-sync/Chart.yaml | 6 +++--- charts/flux2-sync/README.md | 2 +- .../__snapshot__/flux-gitrepository_test.yaml.snap | 4 ++-- .../__snapshot__/flux-kustomization_test.yaml.snap | 2 +- .../tests/__snapshot__/secret_test.yaml.snap | 2 +- charts/flux2/Chart.yaml | 6 +++--- charts/flux2/README.md | 10 +++++----- .../tests/__snapshot__/helm-controller_test.yaml.snap | 6 +++--- .../image-automation-controller_test.yaml.snap | 4 ++-- .../image-reflector-controller_test.yaml.snap | 4 ++-- .../kustomize-controller-secret_test.yaml.snap | 4 ++-- .../__snapshot__/kustomize-controller_test.yaml.snap | 6 +++--- .../notification-controller_test.yaml.snap | 4 ++-- .../tests/__snapshot__/pre-install-job_test.yaml.snap | 10 +++++----- .../__snapshot__/source-controller_test.yaml.snap | 6 +++--- charts/flux2/values.yaml | 8 ++++---- 22 files changed, 53 insertions(+), 53 deletions(-) diff --git a/Makefile b/Makefile index bb69bb0..be3298b 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # ==================================================================================== # Setup Project -FLUX2_VERSION ?= v2.1.1 +FLUX2_VERSION ?= v2.1.2 # set the shell to bash always SHELL := /bin/bash diff --git a/charts/flux2-notification/Chart.yaml b/charts/flux2-notification/Chart.yaml index ca501cd..8c2472e 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.12.2 -appVersion: 2.1.1 +version: 1.12.3 +appVersion: 2.1.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: | - - "[Chore]: Update App Version to upstream 2.1.1" + - "[Chore]: Update App Version to upstream 2.1.2" diff --git a/charts/flux2-notification/README.md b/charts/flux2-notification/README.md index 0caf94b..c46e657 100644 --- a/charts/flux2-notification/README.md +++ b/charts/flux2-notification/README.md @@ -1,6 +1,6 @@ # flux2-notification -![Version: 1.12.2](https://img.shields.io/badge/Version-1.12.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 1.12.3](https://img.shields.io/badge/Version-1.12.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) 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 c6b8470..97df4d0 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.1.1 - helm.sh/chart: flux2-notification-1.12.2 + app.kubernetes.io/version: 2.1.2 + helm.sh/chart: flux2-notification-1.12.3 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 037eeb0..5fa74d8 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.1.1 - helm.sh/chart: flux2-notification-1.12.2 + app.kubernetes.io/version: 2.1.2 + helm.sh/chart: flux2-notification-1.12.3 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 76a24af..515cdfd 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.1.1 - helm.sh/chart: flux2-notification-1.12.2 + app.kubernetes.io/version: 2.1.2 + helm.sh/chart: flux2-notification-1.12.3 name: webhook-url namespace: NAMESPACE stringData: diff --git a/charts/flux2-sync/Chart.yaml b/charts/flux2-sync/Chart.yaml index 462c10d..0f191a4 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.7.1 -appVersion: 2.1.1 +version: 1.7.2 +appVersion: 2.1.2 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.1.1" + - "[Chore]: Update App Version to upstream 2.1.2" diff --git a/charts/flux2-sync/README.md b/charts/flux2-sync/README.md index 8189e45..55872f2 100644 --- a/charts/flux2-sync/README.md +++ b/charts/flux2-sync/README.md @@ -1,6 +1,6 @@ # flux2-sync -![Version: 1.7.1](https://img.shields.io/badge/Version-1.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 1.7.2](https://img.shields.io/badge/Version-1.7.2-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 GitRepository to sync with 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 6893046..01edcee 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.7.1 + helm.sh/chart: flux2-sync-1.7.2 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.1 + helm.sh/chart: flux2-sync-1.7.2 name: RELEASE-NAME namespace: NAMESPACE spec: diff --git a/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap b/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap index b136367..b063132 100644 --- a/charts/flux2-sync/tests/__snapshot__/flux-kustomization_test.yaml.snap +++ b/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.1 + helm.sh/chart: flux2-sync-1.7.2 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 ed95941..86f6557 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.7.1 + helm.sh/chart: flux2-sync-1.7.2 name: RELEASE-NAME namespace: NAMESPACE type: Opaque diff --git a/charts/flux2/Chart.yaml b/charts/flux2/Chart.yaml index 359fa4e..b4e7e9b 100644 --- a/charts/flux2/Chart.yaml +++ b/charts/flux2/Chart.yaml @@ -1,11 +1,11 @@ annotations: artifacthub.io/changes: | - - "feat: enable labeling of deployments" + - "feat: upgrade to FluxCD 2.1.2" apiVersion: v2 -appVersion: 2.1.1 +appVersion: 2.1.2 description: A Helm chart for flux2 name: flux2 sources: - https://github.com/fluxcd-community/helm-charts type: application -version: 2.10.4 +version: 2.10.5 diff --git a/charts/flux2/README.md b/charts/flux2/README.md index 2848fb6..cab4ac5 100644 --- a/charts/flux2/README.md +++ b/charts/flux2/README.md @@ -1,6 +1,6 @@ # flux2 -![Version: 2.10.4](https://img.shields.io/badge/Version-2.10.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 2.10.5](https://img.shields.io/badge/Version-2.10.5-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 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.1.1"` | | +| cli.tag | string | `"v2.1.2"` | | | cli.tolerations | list | `[]` | | | clusterDomain | string | `"cluster.local"` | | | extraObjects | list | `[]` | Array of extra K8s manifests to deploy | @@ -40,7 +40,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.36.1"` | | +| helmController.tag | string | `"v0.36.2"` | | | helmController.tolerations | list | `[]` | | | imageAutomationController.affinity | object | `{}` | | | imageAutomationController.annotations."prometheus.io/port" | string | `"8080"` | | @@ -104,7 +104,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.1.0"` | | +| kustomizeController.tag | string | `"v1.1.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. | @@ -160,6 +160,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.1.1"` | | +| sourceController.tag | string | `"v1.1.2"` | | | sourceController.tolerations | list | `[]` | | | watchAllNamespaces | bool | `true` | | diff --git a/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap b/charts/flux2/tests/__snapshot__/helm-controller_test.yaml.snap index e5b9f83..acba473 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.1.1 + app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.4 + helm.sh/chart: flux2-2.10.5 labeltestkey: labeltestvalue labeltestkey2: labeltestvalue2 name: helm-controller @@ -41,7 +41,7 @@ should match snapshot of default values: valueFrom: fieldRef: fieldPath: metadata.namespace - image: ghcr.io/fluxcd/helm-controller:v0.36.1 + image: ghcr.io/fluxcd/helm-controller:v0.36.2 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 cda61b9..7d8ff3a 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.1.1 + app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.4 + helm.sh/chart: flux2-2.10.5 name: image-automation-controller spec: replicas: 1 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 da123a6..04810ce 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.1.1 + app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.4 + helm.sh/chart: flux2-2.10.5 name: image-reflector-controller spec: replicas: 1 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 2b55c42..f5271e4 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.1.1 - helm.sh/chart: flux2-2.10.4 + app.kubernetes.io/version: 2.1.2 + helm.sh/chart: flux2-2.10.5 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 2cd14af..007cb3d 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.1.1 + app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.4 + helm.sh/chart: flux2-2.10.5 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.1.0 + image: ghcr.io/fluxcd/kustomize-controller:v1.1.1 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 d7ab094..ef99137 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.1.1 + app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.4 + helm.sh/chart: flux2-2.10.5 name: notification-controller spec: replicas: 1 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 2bece5b..c33a728 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.1.1 - helm.sh/chart: flux2-2.10.4 + app.kubernetes.io/version: 2.1.2 + helm.sh/chart: flux2-2.10.5 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.1.1 - helm.sh/chart: flux2-2.10.4 + app.kubernetes.io/version: 2.1.2 + helm.sh/chart: flux2-2.10.5 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.1.1 + image: ghcr.io/fluxcd/flux-cli:v2.1.2 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 cd6f36a..58e415f 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.1.1 + app.kubernetes.io/version: 2.1.2 control-plane: controller - helm.sh/chart: flux2-2.10.4 + helm.sh/chart: flux2-2.10.5 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.1.1 + image: ghcr.io/fluxcd/source-controller:v1.1.2 imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/charts/flux2/values.yaml b/charts/flux2/values.yaml index 92d1068..9cbafdb 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.1.1 + tag: v2.1.2 nodeSelector: {} affinity: {} tolerations: [] @@ -33,7 +33,7 @@ cli: helmController: create: true image: ghcr.io/fluxcd/helm-controller - tag: v0.36.1 + tag: v0.36.2 resources: limits: {} # cpu: 1000m @@ -137,7 +137,7 @@ imageReflectionController: kustomizeController: create: true image: ghcr.io/fluxcd/kustomize-controller - tag: v1.1.0 + tag: v1.1.1 resources: limits: {} # cpu: 1000m @@ -220,7 +220,7 @@ notificationController: sourceController: create: true image: ghcr.io/fluxcd/source-controller - tag: v1.1.1 + tag: v1.1.2 resources: limits: {} # cpu: 1000m