Skip to content

feat(chart) : allow end users to vendor a helm-controller deployment #271

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.

Sign up for GitHub

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

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

feat(chart) : allow end users to vendor a helm-controller deployment #271

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb45c6e
feat(chart) : allow end users to vendor a helm-controller deployment
alexandreLamarre May 16, 2025
70cf3a1
feat(chart) : allow end users to vendor a helm-controller deployment
alexandreLamarre May 16, 2025
e6849f3
feat(chart): rework values structure to provide helmController top-le…
alexandreLamarre May 21, 2025
8ab98b8
e2e(ci): add helm debug logs for monitoring install
alexandreLamarre May 21, 2025
50becd9
ci(e2e) : add explicit value for prometheus.prometheusSpec.maximumSta…
alexandreLamarre May 21, 2025
418396c
fix envvars for helmcontroller
diogoasouza Oct 21, 2025
6acb37e
Adjust template conditions
mallardduck Oct 21, 2025
6f46af8
Add an "ExternalHelmControllerName" option to operator and chart
mallardduck Oct 21, 2025
8da3706
Ensure PromFed chart based HelmController has properly prefixed names
mallardduck Oct 21, 2025
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
6 changes: 3 additions & 3 deletions charts/prometheus-federator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ spec:
- --debug
- --debug-level={{ .Values.helmProjectOperator.debugLevel }}
{{- end }}
{{- if and (not .Values.helmProjectOperator.helmController.enabled) (.Values.helmController.deployment.enabled) }}
Copy link
Member

@mallardduck mallardduck Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that for a full fix we want this line, but with or instead of and.

Since the PromFed helm-controller should be disabled if the .Values.helmController.deployment.enabled is set true. Since it will not need the PromFed compiled version of helm-controller.

{{- if not .Values.helmProjectOperator.helmController.enabled }}
- --disable-embedded-helm-controller
{{- else }}
- --helm-job-image={{ template "system_default_registry" . }}{{ .Values.helmProjectOperator.helmController.job.image.repository }}:{{ .Values.helmProjectOperator.helmController.job.image.tag }}
Expand Down Expand Up @@ -132,11 +132,11 @@ spec:
{{- if .Values.helmProjectOperator.securityContext }}
securityContext: {{ toYaml .Values.helmProjectOperator.securityContext | nindent 8 }}
{{- end }}
nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
{{- if .Values.helmProjectOperator.nodeSelector }}
{{- toYaml .Values.helmProjectOperator.nodeSelector | nindent 8 }}
{{- end }}
tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
{{- if .Values.helmProjectOperator.tolerations }}
{{- toYaml .Values.helmProjectOperator.tolerations | nindent 8 }}
{{- end }}
Expand Down
6 changes: 4 additions & 2 deletions charts/prometheus-federator/templates/helmcontroller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
# this sets the `managedBy` annotations, must match the ones in prometheus-federator
- name: JOB_CLUSTER_ROLE
value: prometheus-federator-helm-controller
# this sets the `managedBy` annotations, must match the ones in prometheus-federator
- name: CONTROLLER_NAME
value: {{ template "prometheus-federator.name" . }}
# this sets the `systemNamespace` for the helm-controller to watch, should match the one in prometheus-federator
- name: SYSTEM_NAMESPACE
- name: NAMESPACE
value: {{ template "prometheus-federator.namespace" . }}
{{ end }}
Loading