-
Notifications
You must be signed in to change notification settings - Fork 1k
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
[NPM-2758] Update System Probe Chart to include liveness and readiness probes #1163
base: main
Are you sure you want to change the base?
Conversation
@@ -209,6 +209,30 @@ More information about this change: https://github.com/DataDog/helm-charts/pull/ | |||
{{- fail "You are using datadog.systemProbe.enabled which has been superseded by networkMonitoring.enabled, systemProbe.enableTCPQueueLength, systemProbe.enableOOMKill, and securityAgent.runtime.enabled. These options provide a more granular control of which features should be activated." }} | |||
{{- end }} | |||
|
|||
{{- if eq (include "should-enable-system-probe" .) "true" }} | |||
{{- $healthPort := .Values.agents.containers.systemProbe.healthPort }} | |||
{{- with $liveness := .Values.agents.containers.systemProbe.livenessProbe.httpGet }} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is .Values.agents.containers.systemProbe.livenessProbe.httpGet
specified?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting. I followed a similar pattern to how the core agent checks for misconfiguration here: https://github.com/DataDog/helm-charts/blob/main/charts/datadog/templates/NOTES.txt#L29-L49, but I can't seem to find where .Values.agents.containers.agent.livenessProbe.httpGet
is specified either.
Maybe I am missing something, but if not, I'll add the appropriate fields to the .Values.agents.containers.systemProbe.livenessProbe
object.
@@ -21,6 +21,9 @@ | |||
{{- include "containers-common-env" . | nindent 4 }} | |||
- name: DD_LOG_LEVEL | |||
value: {{ .Values.agents.containers.systemProbe.logLevel | default .Values.datadog.logLevel | quote }} | |||
- name: DD_SYSTEM_PROBE_HEALTH_PORT |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this always going to be present? There should be a check for the health port value being > 0 to add this env var.
@@ -151,4 +154,10 @@ | |||
{{- if .Values.agents.volumeMounts }} | |||
{{ toYaml .Values.agents.volumeMounts | indent 4 }} | |||
{{- end }} | |||
livenessProbe: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we gate these behind a config value so that it can be disabled with one config?
What this PR does / why we need it:
As a follow up to DataDog/datadog-agent#19297, this PR updates the external charts for
system-probe
.Checklist
[Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fields.]
.github/helm-docs.sh
)CHANGELOG.md
has been updatedREADME.md
make update-test-baselines
)