Skip to content

Commit

Permalink
Merge pull request #180 from ravilr/release-2.0.1
Browse files Browse the repository at this point in the history
chore: upgrade charts to Flux v2.0.1 release
  • Loading branch information
stefanprodan authored Jul 28, 2023
2 parents 13a96ef + 0bb7767 commit c544ff5
Show file tree
Hide file tree
Showing 29 changed files with 55 additions and 68 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.0.0
FLUX2_VERSION ?= v2.0.1

# 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.10.0
appVersion: 2.0.0
version: 1.10.1
appVersion: 2.0.1
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"
- "[Chore]: Update App Version to upstream 2.0.1"
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.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)
![Version: 1.10.1](https://img.shields.io/badge/Version-1.10.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.1](https://img.shields.io/badge/AppVersion-2.0.1-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.0.0
helm.sh/chart: flux2-notification-1.10.0
app.kubernetes.io/version: 2.0.1
helm.sh/chart: flux2-notification-1.10.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.0.0
helm.sh/chart: flux2-notification-1.10.0
app.kubernetes.io/version: 2.0.1
helm.sh/chart: flux2-notification-1.10.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.0.0
helm.sh/chart: flux2-notification-1.10.0
app.kubernetes.io/version: 2.0.1
helm.sh/chart: flux2-notification-1.10.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.6.0
appVersion: 2.0.0
version: 1.6.1
appVersion: 2.0.1
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"
- "[Chore]: Update App Version to upstream 2.0.1"
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.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)
![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.1](https://img.shields.io/badge/AppVersion-2.0.1-informational?style=flat-square)

A Helm chart for flux2 GitRepository to sync with

Expand All @@ -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"` | |
| cli.tag | string | `"v2.0.1"` | |
| 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.6.0
helm.sh/chart: flux2-sync-1.6.1
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.6.0
helm.sh/chart: flux2-sync-1.6.1
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.6.0
helm.sh/chart: flux2-sync-1.6.1
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.0.0
tag: v2.0.1
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: |
- "[Added]: Support extraEnv value setting for all flux controllers"
- "[Chore]: Update App Version to upstream 2.0.1"
apiVersion: v2
appVersion: 2.0.0
appVersion: 2.0.1
description: A Helm chart for flux2
name: flux2
sources:
- https://github.com/fluxcd-community/helm-charts
type: application
version: 2.9.1
version: 2.9.2
10 changes: 5 additions & 5 deletions charts/flux2/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# flux2

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

A Helm chart for flux2

Expand All @@ -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"` | |
| cli.tag | string | `"v2.0.1"` | |
| cli.tolerations | list | `[]` | |
| clusterDomain | string | `"cluster.local"` | |
| extraObjects | list | `[]` | Array of extra K8s manifests to deploy |
Expand Down Expand Up @@ -79,7 +79,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.29.0"` | |
| imageReflectionController.tag | string | `"v0.29.1"` | |
| imageReflectionController.tolerations | list | `[]` | |
| installCRDs | bool | `true` | |
| kustomizeController.affinity | object | `{}` | |
Expand All @@ -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.0.0"` | |
| kustomizeController.tag | string | `"v1.0.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. |
Expand Down Expand Up @@ -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.0.0"` | |
| sourceController.tag | string | `"v1.0.1"` | |
| sourceController.tolerations | list | `[]` | |
| watchAllNamespaces | bool | `true` | |
1 change: 0 additions & 1 deletion charts/flux2/templates/helm-controller.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down
2 changes: 0 additions & 2 deletions charts/flux2/templates/image-reflector-controller.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -413,7 +412,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down
1 change: 0 additions & 1 deletion charts/flux2/templates/kustomize-controller.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down
3 changes: 0 additions & 3 deletions charts/flux2/templates/notification-controller.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -443,7 +442,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -854,7 +852,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down
5 changes: 0 additions & 5 deletions charts/flux2/templates/source-controller.crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -522,7 +521,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -1704,7 +1702,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -2301,7 +2298,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down Expand Up @@ -2807,7 +2803,6 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.0
creationTimestamp: null
labels:
app.kubernetes.io/instance: '{{ .Release.Namespace }}'
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
app.kubernetes.io/version: 2.0.1
control-plane: controller
helm.sh/chart: flux2-2.9.1
helm.sh/chart: flux2-2.9.2
name: helm-controller
spec:
replicas: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
app.kubernetes.io/version: 2.0.1
control-plane: controller
helm.sh/chart: flux2-2.9.1
helm.sh/chart: flux2-2.9.2
name: image-automation-controller
spec:
replicas: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
app.kubernetes.io/version: 2.0.1
control-plane: controller
helm.sh/chart: flux2-2.9.1
helm.sh/chart: flux2-2.9.2
name: image-reflector-controller
spec:
replicas: 1
Expand Down Expand Up @@ -37,7 +37,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/image-reflector-controller:v0.29.0
image: ghcr.io/fluxcd/image-reflector-controller:v0.29.1
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.0.0
helm.sh/chart: flux2-2.9.1
app.kubernetes.io/version: 2.0.1
helm.sh/chart: flux2-2.9.2
name: test1
namespace: NAMESPACE
type: Opaque
Original file line number Diff line number Diff line change
Expand Up @@ -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
app.kubernetes.io/version: 2.0.1
control-plane: controller
helm.sh/chart: flux2-2.9.1
helm.sh/chart: flux2-2.9.2
name: kustomize-controller
spec:
replicas: 1
Expand Down Expand Up @@ -37,7 +37,7 @@ should match snapshot of default values:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/kustomize-controller:v1.0.0
image: ghcr.io/fluxcd/kustomize-controller:v1.0.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
app.kubernetes.io/version: 2.0.1
control-plane: controller
helm.sh/chart: flux2-2.9.1
helm.sh/chart: flux2-2.9.2
name: notification-controller
spec:
replicas: 1
Expand Down
Loading

0 comments on commit c544ff5

Please sign in to comment.