From ed00c2d1573bcabd0fdde084b6ebcb9901149da5 Mon Sep 17 00:00:00 2001 From: "Felipe V.C. Serafim" <43246350+fevisera@users.noreply.github.com> Date: Wed, 24 May 2023 12:41:42 +0200 Subject: [PATCH] Update flux with valid CRDs (#16879) Signed-off-by: sfelipe --- .vib/flux/runtime-parameters.yaml | 6 +++--- bitnami/flux/Chart.yaml | 2 +- bitnami/flux/README.md | 2 +- .../notification.toolkit.fluxcd.io_receivers.yaml | 2 +- .../source.toolkit.fluxcd.io_gitrepositories.yaml | 2 +- bitnami/flux/values.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vib/flux/runtime-parameters.yaml b/.vib/flux/runtime-parameters.yaml index b407dff372..0bd44e8e4e 100644 --- a/.vib/flux/runtime-parameters.yaml +++ b/.vib/flux/runtime-parameters.yaml @@ -103,7 +103,7 @@ extraDeploy: kind: GitRepository name: vib-podinfo path: "./kustomize" - prune: true + prune: false # This is for helm-controller and source-controller # We use bitnami charts for not causing conflicts with the deployment above - apiVersion: source.toolkit.fluxcd.io/v1beta2 @@ -138,7 +138,7 @@ extraDeploy: # This is for image-notification-controller. We will use the metrics to ensure that it is consumed # and therefore RBAC is correct. The values do not need to be correct # Source: https://fluxcd.io/flux/components/notification/receiver/ - - apiVersion: notification.toolkit.fluxcd.io/v1 + - apiVersion: notification.toolkit.fluxcd.io/v1beta2 kind: Receiver metadata: name: vib-github-receiver @@ -151,7 +151,7 @@ extraDeploy: secretRef: name: receiver-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: bitnami-charts namespace: '{{ include "common.names.namespace" . }}' diff --git a/bitnami/flux/Chart.yaml b/bitnami/flux/Chart.yaml index f7c1b941f2..9b63831de1 100644 --- a/bitnami/flux/Chart.yaml +++ b/bitnami/flux/Chart.yaml @@ -25,4 +25,4 @@ maintainers: name: flux sources: - https://github.com/bitnami/charts/tree/main/bitnami/flux -version: 0.3.1 +version: 0.3.2 diff --git a/bitnami/flux/README.md b/bitnami/flux/README.md index 8cb60db2ca..d0b1775cc1 100644 --- a/bitnami/flux/README.md +++ b/bitnami/flux/README.md @@ -605,7 +605,7 @@ The command removes all the Kubernetes components associated with the chart and | `imageAutomationController.enabled` | Enable Image Automation Controller | `true` | | `imageAutomationController.image.registry` | Image Automation Controller image registry | `docker.io` | | `imageAutomationController.image.repository` | Image Automation Controller image repository | `bitnami/fluxcd-image-automation-controller` | -| `imageAutomationController.image.tag` | Image Automation Controller image tag (immutable tags are recommended) | `0.32.0-debian-11-r8` | +| `imageAutomationController.image.tag` | Image Automation Controller image tag (immutable tags are recommended) | `0.31.0-debian-11-r8` | | `imageAutomationController.image.digest` | Image Automation Controller image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag image tag (immutable tags are recommended) | `""` | | `imageAutomationController.image.pullPolicy` | Image Automation Controller image pull policy | `IfNotPresent` | | `imageAutomationController.image.pullSecrets` | Image Automation Controller image pull secrets | `[]` | diff --git a/bitnami/flux/crds/notification-controller/notification.toolkit.fluxcd.io_receivers.yaml b/bitnami/flux/crds/notification-controller/notification.toolkit.fluxcd.io_receivers.yaml index e41ccd8a71..021d1882b7 100644 --- a/bitnami/flux/crds/notification-controller/notification.toolkit.fluxcd.io_receivers.yaml +++ b/bitnami/flux/crds/notification-controller/notification.toolkit.fluxcd.io_receivers.yaml @@ -25,7 +25,7 @@ spec: - jsonPath: .status.conditions[?(@.type=="Ready")].message name: Status type: string - name: v1 + name: v1beta1 schema: openAPIV3Schema: description: Receiver is the Schema for the receivers API diff --git a/bitnami/flux/crds/source-controller/source.toolkit.fluxcd.io_gitrepositories.yaml b/bitnami/flux/crds/source-controller/source.toolkit.fluxcd.io_gitrepositories.yaml index 5ea092d1ab..5f370659a3 100644 --- a/bitnami/flux/crds/source-controller/source.toolkit.fluxcd.io_gitrepositories.yaml +++ b/bitnami/flux/crds/source-controller/source.toolkit.fluxcd.io_gitrepositories.yaml @@ -30,7 +30,7 @@ spec: - jsonPath: .metadata.creationTimestamp name: Age type: date - name: v1 + name: v1beta1 schema: openAPIV3Schema: description: GitRepository is the Schema for the gitrepositories API diff --git a/bitnami/flux/values.yaml b/bitnami/flux/values.yaml index 577049cc95..8f5a2db550 100644 --- a/bitnami/flux/values.yaml +++ b/bitnami/flux/values.yaml @@ -1971,7 +1971,7 @@ imageAutomationController: image: registry: docker.io repository: bitnami/fluxcd-image-automation-controller - tag: 0.32.0-debian-11-r8 + tag: 0.31.0-debian-11-r8 digest: "" ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'