Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add support for annotations for the source and kustomize controller deployments #227

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/flux2/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ name: flux2
sources:
- https://github.com/fluxcd-community/helm-charts
type: application
version: 2.13.0
version: 2.13.1
4 changes: 3 additions & 1 deletion charts/flux2/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# flux2

![Version: 2.13.0](https://img.shields.io/badge/Version-2.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)
![Version: 2.13.1](https://img.shields.io/badge/Version-2.13.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.3.0](https://img.shields.io/badge/AppVersion-2.3.0-informational?style=flat-square)

A Helm chart for flux2

Expand Down Expand Up @@ -88,6 +88,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
| kustomizeController.annotations."prometheus.io/scrape" | string | `"true"` | |
| kustomizeController.container.additionalArgs | list | `[]` | |
| kustomizeController.create | bool | `true` | |
| kustomizeController.deploymentAnnotations | object | `{}` | |
| kustomizeController.envFrom | object | `{"map":{"name":""},"secret":{"name":""}}` | Defines envFrom using a configmap and/or secret. |
| kustomizeController.extraEnv | list | `[]` | |
| kustomizeController.extraSecretMounts | list | `[]` | Defines additional mounts with secrets. Secrets must be manually created in the namespace or with kustomizeController.secret |
Expand Down Expand Up @@ -156,6 +157,7 @@ This helm chart is maintained and released by the fluxcd-community on a best eff
| sourceController.annotations."prometheus.io/scrape" | string | `"true"` | |
| sourceController.container.additionalArgs | list | `[]` | |
| sourceController.create | bool | `true` | |
| sourceController.deploymentAnnotations | object | `{}` | |
| sourceController.extraEnv | list | `[]` | |
| sourceController.image | string | `"ghcr.io/fluxcd/source-controller"` | |
| sourceController.imagePullPolicy | string | `""` | |
Expand Down
4 changes: 4 additions & 0 deletions charts/flux2/templates/kustomize-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ metadata:
{{- with .Values.kustomizeController.labels }}
{{- . | toYaml | nindent 4 }}
{{- end }}
{{- with .Values.kustomizeController.deploymentAnnotations }}
annotations:
{{- . | toYaml | nindent 4 }}
{{- end }}
name: kustomize-controller
spec:
{{- if kindIs "invalid" .Values.kustomizeController.replicas }}
Expand Down
4 changes: 4 additions & 0 deletions charts/flux2/templates/source-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ metadata:
{{- with .Values.sourceController.labels }}
{{- . | toYaml | nindent 4 }}
{{- end }}
{{- with .Values.sourceController.deploymentAnnotations }}
annotations:
{{- . | toYaml | nindent 4 }}
{{- end }}
name: source-controller
spec:
replicas: 1
Expand Down
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/part-of: flux
app.kubernetes.io/version: 2.3.0
control-plane: controller
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
labeltestkey: labeltestvalue
labeltestkey2: labeltestvalue2
name: helm-controller
Expand Down
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/part-of: flux
app.kubernetes.io/version: 2.3.0
control-plane: controller
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: image-automation-controller
spec:
replicas: 1
Expand Down
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/part-of: flux
app.kubernetes.io/version: 2.3.0
control-plane: controller
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: image-reflector-controller
spec:
replicas: 1
Expand Down
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/managed-by: Helm
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: 2.3.0
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: test1
namespace: NAMESPACE
type: Opaque
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/part-of: flux
app.kubernetes.io/version: 2.3.0
control-plane: controller
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: kustomize-controller
spec:
replicas: 1
Expand Down
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/part-of: flux
app.kubernetes.io/version: 2.3.0
control-plane: controller
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: notification-controller
spec:
replicas: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ should match snapshot of default values:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: 2.3.0
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: RELEASE-NAME-flux-check
spec:
backoffLimit: 1
Expand All @@ -23,7 +23,7 @@ should match snapshot of default values:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: 2.3.0
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: RELEASE-NAME
spec:
automountServiceAccountToken: true
Expand Down
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/part-of: flux
app.kubernetes.io/version: 2.3.0
control-plane: controller
helm.sh/chart: flux2-2.13.0
helm.sh/chart: flux2-2.13.1
name: source-controller
spec:
replicas: 1
Expand Down
2 changes: 2 additions & 0 deletions charts/flux2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ kustomizeController:
annotations:
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
deploymentAnnotations: {}
labels: {}
container:
additionalArgs: []
Expand Down Expand Up @@ -253,6 +254,7 @@ sourceController:
annotations:
prometheus.io/port: "8080"
prometheus.io/scrape: "true"
deploymentAnnotations: {}
labels: {}
container:
additionalArgs: []
Expand Down
Loading