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.

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

[prometheus-node-exporter] Add Termination Msg Params to Daemonset #4191

Merged
merged 16 commits into from
Feb 1, 2024
Merged

[prometheus-node-exporter] Add Termination Msg Params to Daemonset #4191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
904a44f
added more customizable vars for volumes and where termination messag…
nfrazier08 Jan 25, 2024
d193c12
added additional vars for termination msg pts, env vars for kuberbacp…
nfrazier08 Jan 26, 2024
15c4c5b
flip kuberbacproxy to false again
nfrazier08 Jan 26, 2024
377ddfa
added notes for env var and for restart policy
nfrazier08 Jan 26, 2024
cdfd292
added definition in values file for volumemounts type
nfrazier08 Jan 26, 2024
cf95ed6
remove small fix for bug for later pr
nfrazier08 Jan 29, 2024
711ecd8
fix version
nfrazier08 Jan 29, 2024
7f2f9a5
remove most changes except for termination params
nfrazier08 Jan 30, 2024
e8b022d
remove env from the ds
nfrazier08 Jan 30, 2024
f9fd7c6
using suggestion, used a toggle instead for setting termination messa…
nfrazier08 Jan 30, 2024
e4964d7
revert krp and terminationmsgpath back to false from true that was se…
nfrazier08 Jan 30, 2024
05955e8
Added with statement for termination grace period
nfrazier08 Jan 31, 2024
cbb5b88
disable termination msg path
nfrazier08 Jan 31, 2024
ac69e25
added null or 30 default message
nfrazier08 Jan 31, 2024
a564954
Merge branch 'main' into add_terminationMsgPath
nfrazier08 Jan 31, 2024
626347a
Merge branch 'main' into add_terminationMsgPath
nfrazier08 Feb 1, 2024
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/prometheus-node-exporter/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ keywords:
- prometheus
- exporter
type: application
version: 4.26.1
version: 4.27.0
appVersion: 1.7.0
home: https://github.com/prometheus/node_exporter/
sources:
Expand Down
15 changes: 15 additions & 0 deletions charts/prometheus-node-exporter/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
serviceAccountName: {{ include "prometheus-node-exporter.serviceAccountName" . }}
{{- with .Values.terminationGracePeriodSeconds }}
terminationGracePeriodSeconds: {{ . }}
{{- end }}
containers:
{{- $servicePort := ternary .Values.kubeRBACProxy.port .Values.service.port .Values.kubeRBACProxy.enabled }}
- name: node-exporter
Expand Down Expand Up @@ -124,6 +127,12 @@ spec:
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
{{- if .Values.terminationMessageParams.enabled }}
{{- with .Values.terminationMessageParams }}
terminationMessagePath: {{ .terminationMessagePath }}
terminationMessagePolicy: {{ .terminationMessagePolicy }}
{{- end }}
{{- end }}
volumeMounts:
- name: proc
mountPath: /host/proc
Expand Down Expand Up @@ -209,6 +218,12 @@ spec:
resources:
{{ toYaml .Values.kubeRBACProxy.resources | nindent 12 }}
{{- end }}
{{- if .Values.terminationMessageParams.enabled }}
{{- with .Values.terminationMessageParams }}
terminationMessagePath: {{ .terminationMessagePath }}
terminationMessagePolicy: {{ .terminationMessagePolicy }}
{{- end }}
{{- end }}
{{- if .Values.kubeRBACProxy.containerSecurityContext }}
securityContext:
{{ toYaml .Values.kubeRBACProxy.containerSecurityContext | nindent 12 }}
Expand Down
15 changes: 14 additions & 1 deletion charts/prometheus-node-exporter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ kubeRBACProxy:
sha: ""
pullPolicy: IfNotPresent

# List of additional cli arguments to configure kube-rbac-prxy
# List of additional cli arguments to configure kube-rbac-proxy
# for example: --tls-cipher-suites, --log-file, etc.
# all the possible args can be found here: https://github.com/brancz/kube-rbac-proxy#usage
extraArgs: []
Expand Down Expand Up @@ -361,10 +361,23 @@ nodeSelector:
kubernetes.io/os: linux
# kubernetes.io/arch: amd64

# Specify grace period for graceful termination of pods. Defaults to 30 if null or not specified
terminationGracePeriodSeconds: null

tolerations:
- effect: NoSchedule
operator: Exists

# Enable or disable container termination message settings
# https://kubernetes.io/docs/tasks/debug/debug-application/determine-reason-pod-failure/
terminationMessageParams:
enabled: false
# If enabled, specify the path for termination messages
terminationMessagePath: /dev/termination-log
# If enabled, specify the policy for termination messages
terminationMessagePolicy: File


## Assign a PriorityClassName to pods if set
# priorityClassName: ""

Expand Down
Loading