Skip to content

Commit

Permalink
Merge pull request #211 from ravilr/release-v2.2.3
Browse files Browse the repository at this point in the history
chore: upgrade charts to Flux v2.2.3 release
  • Loading branch information
stefanprodan authored Feb 27, 2024
2 parents 246ec24 + dbc271a commit 7d1ecac
Show file tree
Hide file tree
Showing 25 changed files with 69 additions and 64 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ====================================================================================
# Setup Project

FLUX2_VERSION ?= v2.2.2
FLUX2_VERSION ?= v2.2.3

# set the shell to bash always
SHELL := /bin/bash
Expand Down
6 changes: 3 additions & 3 deletions charts/flux2-notification/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: v2
name: flux2-notification
type: application
version: 1.14.0
appVersion: 2.2.2
version: 1.14.1
appVersion: 2.2.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 2.2.2"
- "[Chore]: Update App Version to upstream 2.2.3"
2 changes: 1 addition & 1 deletion charts/flux2-notification/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# flux2-notification

![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-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)
![Version: 1.14.1](https://img.shields.io/badge/Version-1.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)

A Helm chart for flux2 alerts and the needed providers and secrets

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
helm.sh/chart: flux2-notification-1.14.0
app.kubernetes.io/version: 2.2.3
helm.sh/chart: flux2-notification-1.14.1
name: all-kustomizations
namespace: NAMESPACE
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
helm.sh/chart: flux2-notification-1.14.0
app.kubernetes.io/version: 2.2.3
helm.sh/chart: flux2-notification-1.14.1
name: on-call-slack
namespace: NAMESPACE
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
helm.sh/chart: flux2-notification-1.14.0
app.kubernetes.io/version: 2.2.3
helm.sh/chart: flux2-notification-1.14.1
name: webhook-url
namespace: NAMESPACE
stringData:
Expand Down
6 changes: 3 additions & 3 deletions charts/flux2-sync/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: v2
name: flux2-sync
type: application
version: 1.8.1
appVersion: 2.2.2
version: 1.8.2
appVersion: 2.2.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 2.2.2"
- "[Chore]: Update App Version to upstream 2.2.3"
4 changes: 2 additions & 2 deletions charts/flux2-sync/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# flux2-sync

![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)
![Version: 1.8.2](https://img.shields.io/badge/Version-1.8.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)

A Helm chart for flux2 GitRepository to sync with

Expand All @@ -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.2.2"` | |
| cli.tag | string | `"v2.2.3"` | |
| cli.tolerations | list | `[]` | |
| gitRepository.annotations | object | `{}` | |
| gitRepository.labels | object | `{}` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
helm.sh/chart: flux2-sync-1.8.2
name: RELEASE-NAME
namespace: NAMESPACE
spec:
Expand All @@ -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.1
helm.sh/chart: flux2-sync-1.8.2
name: RELEASE-NAME
namespace: NAMESPACE
spec:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
helm.sh/chart: flux2-sync-1.8.2
name: RELEASE-NAME
namespace: NAMESPACE
spec:
Expand Down
2 changes: 1 addition & 1 deletion charts/flux2-sync/tests/__snapshot__/secret_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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.1
helm.sh/chart: flux2-sync-1.8.2
name: RELEASE-NAME
namespace: NAMESPACE
type: Opaque
2 changes: 1 addition & 1 deletion charts/flux2-sync/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ secret:

cli:
image: ghcr.io/fluxcd/flux-cli
tag: v2.2.2
tag: v2.2.3
nodeSelector: {}
affinity: {}
tolerations: []
Expand Down
6 changes: 3 additions & 3 deletions charts/flux2/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
annotations:
artifacthub.io/changes: |
- "[Chore]: Update App Version to upstream 2.2.2"
- "[Chore]: Update App Version to upstream 2.2.3"
apiVersion: v2
appVersion: 2.2.2
appVersion: 2.2.3
description: A Helm chart for flux2
name: flux2
sources:
- https://github.com/fluxcd-community/helm-charts
type: application
version: 2.12.2
version: 2.12.3
16 changes: 8 additions & 8 deletions charts/flux2/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# flux2

![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)
![Version: 2.12.3](https://img.shields.io/badge/Version-2.12.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.2.3](https://img.shields.io/badge/AppVersion-2.2.3-informational?style=flat-square)

A Helm chart for flux2

Expand All @@ -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.2"` | |
| cli.tag | string | `"v2.2.3"` | |
| cli.tolerations | list | `[]` | |
| clusterDomain | string | `"cluster.local"` | |
| crds.annotations | object | `{}` | Add annotations to all CRD resources, e.g. "helm.sh/resource-policy": keep |
Expand All @@ -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.2"` | |
| helmController.tag | string | `"v0.37.4"` | |
| helmController.tolerations | list | `[]` | |
| imageAutomationController.affinity | object | `{}` | |
| imageAutomationController.annotations."prometheus.io/port" | string | `"8080"` | |
Expand All @@ -60,7 +60,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
| imageAutomationController.serviceAccount.annotations | object | `{}` | |
| imageAutomationController.serviceAccount.automount | bool | `true` | |
| imageAutomationController.serviceAccount.create | bool | `true` | |
| imageAutomationController.tag | string | `"v0.37.0"` | |
| imageAutomationController.tag | string | `"v0.37.1"` | |
| imageAutomationController.tolerations | list | `[]` | |
| imagePullSecrets | list | `[]` | contents of pod imagePullSecret in form 'name=[secretName]'; applied to all controllers |
| imageReflectionController.affinity | object | `{}` | |
Expand All @@ -80,7 +80,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
| imageReflectionController.serviceAccount.annotations | object | `{}` | |
| imageReflectionController.serviceAccount.automount | bool | `true` | |
| imageReflectionController.serviceAccount.create | bool | `true` | |
| imageReflectionController.tag | string | `"v0.31.1"` | |
| imageReflectionController.tag | string | `"v0.31.2"` | |
| imageReflectionController.tolerations | list | `[]` | |
| installCRDs | bool | `true` | |
| kustomizeController.affinity | object | `{}` | |
Expand All @@ -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.1"` | |
| kustomizeController.tag | string | `"v1.2.2"` | |
| 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. |
Expand All @@ -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.3"` | |
| notificationController.tag | string | `"v1.2.4"` | |
| notificationController.tolerations | list | `[]` | |
| notificationController.webhookReceiver.ingress.annotations | object | `{}` | |
| notificationController.webhookReceiver.ingress.create | bool | `false` | |
Expand Down Expand Up @@ -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.3"` | |
| sourceController.tag | string | `"v1.2.4"` | |
| sourceController.tolerations | list | `[]` | |
| watchAllNamespaces | bool | `true` | |
3 changes: 3 additions & 0 deletions charts/flux2/templates/notification-controller.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ metadata:
{{- . | toYaml | nindent 4 }}
{{- end }}
labels:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/part-of: flux
Expand Down Expand Up @@ -584,6 +585,7 @@ metadata:
{{- . | toYaml | nindent 4 }}
{{- end }}
labels:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/part-of: flux
Expand Down Expand Up @@ -1122,6 +1124,7 @@ metadata:
{{- . | toYaml | nindent 4 }}
{{- end }}
labels:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
app.kubernetes.io/part-of: flux
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
app.kubernetes.io/version: 2.2.3
control-plane: controller
helm.sh/chart: flux2-2.12.2
helm.sh/chart: flux2-2.12.3
labeltestkey: labeltestvalue
labeltestkey2: labeltestvalue2
name: helm-controller
Expand Down Expand Up @@ -42,7 +42,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/helm-controller:v0.37.2
image: ghcr.io/fluxcd/helm-controller:v0.37.4
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
app.kubernetes.io/version: 2.2.3
control-plane: controller
helm.sh/chart: flux2-2.12.2
helm.sh/chart: flux2-2.12.3
name: image-automation-controller
spec:
replicas: 1
Expand Down Expand Up @@ -38,7 +38,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/image-automation-controller:v0.37.0
image: ghcr.io/fluxcd/image-automation-controller:v0.37.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
app.kubernetes.io/version: 2.2.3
control-plane: controller
helm.sh/chart: flux2-2.12.2
helm.sh/chart: flux2-2.12.3
name: image-reflector-controller
spec:
replicas: 1
Expand Down Expand Up @@ -38,7 +38,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/image-reflector-controller:v0.31.1
image: ghcr.io/fluxcd/image-reflector-controller:v0.31.2
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
helm.sh/chart: flux2-2.12.2
app.kubernetes.io/version: 2.2.3
helm.sh/chart: flux2-2.12.3
name: test1
namespace: NAMESPACE
type: Opaque
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
app.kubernetes.io/version: 2.2.3
control-plane: controller
helm.sh/chart: flux2-2.12.2
helm.sh/chart: flux2-2.12.3
name: kustomize-controller
spec:
replicas: 1
Expand Down Expand Up @@ -38,7 +38,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/kustomize-controller:v1.2.1
image: ghcr.io/fluxcd/kustomize-controller:v1.2.2
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.2
app.kubernetes.io/version: 2.2.3
control-plane: controller
helm.sh/chart: flux2-2.12.2
helm.sh/chart: flux2-2.12.3
name: notification-controller
spec:
replicas: 1
Expand All @@ -37,7 +37,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/notification-controller:v1.2.3
image: ghcr.io/fluxcd/notification-controller:v1.2.4
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
10 changes: 5 additions & 5 deletions charts/flux2/tests/__snapshot__/pre-install-job_test.yaml.snap
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.2
helm.sh/chart: flux2-2.12.2
app.kubernetes.io/version: 2.2.3
helm.sh/chart: flux2-2.12.3
name: RELEASE-NAME-flux-check
spec:
backoffLimit: 1
Expand All @@ -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.2.2
helm.sh/chart: flux2-2.12.2
app.kubernetes.io/version: 2.2.3
helm.sh/chart: flux2-2.12.3
name: RELEASE-NAME
spec:
automountServiceAccountToken: true
Expand All @@ -34,7 +34,7 @@ should match snapshot of default values:
- --pre
- --namespace
- NAMESPACE
image: ghcr.io/fluxcd/flux-cli:v2.2.2
image: ghcr.io/fluxcd/flux-cli:v2.2.3
name: flux-cli
securityContext:
allowPrivilegeEscalation: false
Expand Down
Loading

0 comments on commit 7d1ecac

Please sign in to comment.