Skip to content

feat: allow logs daemonset to run as non-privileged #297

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 1 commit into
base: main
Choose a base branch
from
Open

feat: allow logs daemonset to run as non-privileged #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 8 additions & 13 deletions charts/agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,12 +290,10 @@ Chart to install K8s collection stack based on Observe Agent
| node-logs-metrics.extraVolumeMounts[2].mountPath | string | `"/var/lib/docker/containers"` | |
| node-logs-metrics.extraVolumeMounts[2].name | string | `"varlibdockercontainers"` | |
| node-logs-metrics.extraVolumeMounts[2].readOnly | bool | `true` | |
| node-logs-metrics.extraVolumeMounts[3].mountPath | string | `"/var/lib/otelcol"` | |
| node-logs-metrics.extraVolumeMounts[3].name | string | `"varlibotelcol"` | |
| node-logs-metrics.extraVolumeMounts[4].mountPath | string | `"/hostfs"` | |
| node-logs-metrics.extraVolumeMounts[4].mountPropagation | string | `"HostToContainer"` | |
| node-logs-metrics.extraVolumeMounts[4].name | string | `"hostfs"` | |
| node-logs-metrics.extraVolumeMounts[4].readOnly | bool | `true` | |
| node-logs-metrics.extraVolumeMounts[3].mountPath | string | `"/hostfs"` | |
| node-logs-metrics.extraVolumeMounts[3].mountPropagation | string | `"HostToContainer"` | |
| node-logs-metrics.extraVolumeMounts[3].name | string | `"hostfs"` | |
| node-logs-metrics.extraVolumeMounts[3].readOnly | bool | `true` | |
| node-logs-metrics.extraVolumes[0].configMap.defaultMode | int | `420` | |
| node-logs-metrics.extraVolumes[0].configMap.items[0].key | string | `"relay"` | |
| node-logs-metrics.extraVolumes[0].configMap.items[0].path | string | `"observe-agent.yaml"` | |
Expand All @@ -305,11 +303,8 @@ Chart to install K8s collection stack based on Observe Agent
| node-logs-metrics.extraVolumes[1].name | string | `"varlogpods"` | |
| node-logs-metrics.extraVolumes[2].hostPath.path | string | `"/var/lib/docker/containers"` | |
| node-logs-metrics.extraVolumes[2].name | string | `"varlibdockercontainers"` | |
| node-logs-metrics.extraVolumes[3].hostPath.path | string | `"/var/lib/otelcol"` | |
| node-logs-metrics.extraVolumes[3].hostPath.type | string | `"DirectoryOrCreate"` | |
| node-logs-metrics.extraVolumes[3].name | string | `"varlibotelcol"` | |
| node-logs-metrics.extraVolumes[4].hostPath.path | string | `"/"` | |
| node-logs-metrics.extraVolumes[4].name | string | `"hostfs"` | |
| node-logs-metrics.extraVolumes[3].hostPath.path | string | `"/"` | |
| node-logs-metrics.extraVolumes[3].name | string | `"hostfs"` | |
| node-logs-metrics.image.pullPolicy | string | `"IfNotPresent"` | |
| node-logs-metrics.image.repository | string | `"observeinc/observe-agent"` | |
| node-logs-metrics.image.tag | string | `"1.4.0"` | |
Expand Down Expand Up @@ -341,8 +336,8 @@ Chart to install K8s collection stack based on Observe Agent
| node-logs-metrics.readinessProbe.initialDelaySeconds | int | `30` | |
| node-logs-metrics.readinessProbe.periodSeconds | int | `5` | |
| node-logs-metrics.resources | object | `{"requests":{"cpu":"250m","memory":"256Mi"}}` | --------------------------------------- # Same for each deployment/daemonset # |
| node-logs-metrics.securityContext.runAsGroup | int | `0` | |
| node-logs-metrics.securityContext.runAsUser | int | `0` | |
| node-logs-metrics.securityContext.runAsGroup | int | `79` | |
| node-logs-metrics.securityContext.runAsUser | int | `79` | |
| node-logs-metrics.serviceAccount.create | bool | `false` | |
| node-logs-metrics.serviceAccount.name | string | `"observe-agent-service-account"` | |
| node-logs-metrics.tolerations | list | `[]` | |
Expand Down
4 changes: 1 addition & 3 deletions charts/agent/templates/_node-logs-metrics-config.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

extensions:
{{- include "config.extensions.health_check" . | nindent 2 }}
{{- include "config.extensions.file_storage" . | nindent 2 }}

exporters:
{{- include "config.exporters.debug" . | nindent 2 }}
Expand Down Expand Up @@ -134,7 +133,6 @@ receivers:
max_interval: {{ .Values.node.containers.logs.retryOnFailure.maxInterval }}
max_elapsed_time: {{ .Values.node.containers.logs.retryOnFailure.maxElapsedTime }}
start_at: {{ .Values.node.containers.logs.startAt }}
storage: file_storage
{{ end }}
processors:
{{- include "config.processors.memory_limiter" . | nindent 2 }}
Expand Down Expand Up @@ -164,7 +162,7 @@ processors:
value: kubeletstats_metrics

service:
extensions: [health_check, file_storage]
extensions: [health_check]
pipelines:
{{- if .Values.node.containers.logs.enabled }}
logs:
Expand Down
16 changes: 8 additions & 8 deletions charts/agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,10 @@ node-logs-metrics:
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
- name: varlibotelcol
hostPath:
path: /var/lib/otelcol
type: DirectoryOrCreate
# - name: varlibotelcol
# hostPath:
# path: /var/lib/otelcol
# type: DirectoryOrCreate
- name: hostfs
hostPath:
path: /
Expand All @@ -552,16 +552,16 @@ node-logs-metrics:
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
- name: varlibotelcol
mountPath: /var/lib/otelcol
# - name: varlibotelcol
# mountPath: /var/lib/otelcol
- name: hostfs
mountPath: /hostfs
readOnly: true
mountPropagation: HostToContainer

securityContext:
runAsUser: 0
runAsGroup: 0
runAsUser: 0117
runAsGroup: 0117
# ----------------------------------------- #

################################################
Expand Down
Loading