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

Jump to bottom

fix(agent): don't duplicate cointerface_enabled field in deployment agent configmaps #1299

Merged
merged 2 commits into from
Aug 21, 2023
Merged

fix(agent): don't duplicate cointerface_enabled field in deployment agent configmaps #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ed2b13
fix(agent): don't duplicate `cointerface_enabled` field in deployment…
aroberts87 Aug 16, 2023
4e9fefa
change proposal
mavimo Aug 18, 2023
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/agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Sysdig Monitor and Secure agent
type: application

# currently matching sysdig 1.14.32
version: 1.13.5
version: 1.13.6

appVersion: 12.16.0

Expand Down
54 changes: 27 additions & 27 deletions charts/agent/templates/configmap-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,34 @@ metadata:
{{ include "agent.labels" . | indent 4 }}
data:
dragent.yaml: |
new_k8s: true
{{- include "agent.clusterName" . | trim | nindent 4 }}
{{- include "agent.connectionSettings" . | trim | nindent 4 }}
feature:
mode: monitor_light
cointerface_enabled: true
k8s_delegated_nodes: {{ .Values.delegatedAgentDeployment.delegated_nodes | int }}
top_processes_in_sample: 0
container_engines:
bpm: false
cri: false
docker: false
libvirt_lxc: false
lxc: false
mesos: false
podman: false
rkt: false
app_checks_enabled: false
jmx:
enabled: false
prometheus:
enabled: false
statsd:
enabled: false
{{- $requiredOverrides := (dict
"new_k8s" true
"feature" (dict "mode" "monitor_light")
"cointerface_enabled" true
"k8s_delegated_nodes" (.Values.delegatedAgentDeployment.delegated_nodes | int)
"top_processes_in_sample" 0
"container_engines" (dict
"bpm" false
"cri" false
"docker" false
"libvirt_lxc" false
"lxc" false
"mesos" false
"podman" false
"rkt" false
)
"app_checks_enabled" false
"jmx" (dict "enabled" false)
"prometheus" (dict "enabled" false)
"statsd" (dict "enabled" false)
) }}
{{/* Calculate the leaderElection/k8s_colstart information.
The computed/combined results are merged with any overrides specified
in sysdig.settings and will be rendered with that block */}}
{{- include "agent.leaderElection" . }}
{{ include "agent.disableCaptures" . | nindent 4 }}
{{- include "agent.disableCaptures" . | nindent 4 }}
{{- $_ := mergeOverwrite .Values.secure (dict "enabled" false) }}
{{- (include "agent.secureFeatures" .) | nindent 4 }}
{{- include "agent.logSettings" . }}
Expand All @@ -47,12 +46,13 @@ data:
Checking here the user is using Custom CA and if http_proxy.ssl = true
If these conditions are true, then we use the agent.sslCaFileName for the http_proxy.ca_certificate
*/}}
{{- $baseSettings := .Values.sysdig.settings -}}
{{- if and (eq (include "sysdig.custom_ca.enabled" (dict "global" .Values.global.ssl "component" .Values.ssl)) "true") (.Values.sysdig.settings) (hasKey .Values.sysdig.settings "http_proxy") (hasKey .Values.sysdig.settings.http_proxy "ssl") (eq (get .Values.sysdig.settings.http_proxy "ssl") true) }}
{{- $baseSettings := .Values.sysdig.settings -}}
{{- $caFilePath := printf "%s%s" "/etc/ca-certs/" (include "sysdig.custom_ca.keyName" (dict "global" .Values.global.ssl "component" .Values.ssl)) }}
{{- $mergedSettings := mergeOverwrite $baseSettings (dict "http_proxy" (dict "ca_certificate" $caFilePath)) -}}
{{ toYaml $mergedSettings | nindent 4 }}
{{- else if .Values.sysdig.settings }}
{{ toYaml .Values.sysdig.settings | nindent 4 }}
{{- $finalSettings := mergeOverwrite $mergedSettings $requiredOverrides -}}
{{ toYaml $finalSettings | nindent 4 }}
{{- end }}
{{- $finalSettings := mergeOverwrite $baseSettings $requiredOverrides -}}
{{ toYaml $finalSettings | nindent 4 }}
{{- end }}
20 changes: 20 additions & 0 deletions charts/agent/tests/custom_settings_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ tests:
.*
first:
value: 1
.*
- matchRegex:
path: data['dragent.yaml']
pattern: |-
.*
second: example
.*
template: configmap.yaml
Expand Down Expand Up @@ -45,6 +50,11 @@ tests:
.*
first:
value: 1
.*
- matchRegex:
path: data['dragent.yaml']
pattern: |-
.*
second: example
.*
template: configmap.yaml
Expand All @@ -66,6 +76,11 @@ tests:
.*
first:
value: 1
.*
- matchRegex:
path: data['dragent.yaml']
pattern: |-
.*
second: example
.*
template: configmap-deployment.yaml
Expand Down Expand Up @@ -95,6 +110,11 @@ tests:
.*
first:
value: 1
.*
- matchRegex:
path: data['dragent.yaml']
pattern: |-
.*
second: example
.*
template: configmap-deployment.yaml
68 changes: 68 additions & 0 deletions charts/agent/tests/delegated_agent_deployment_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,3 +561,71 @@ tests:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: false'
template: templates/configmap-deployment.yaml

- it: Validate cointerface_enabled keys are not duplicated
set:
delegatedAgentDeployment:
enabled: true
sysdig:
settings:
cointerface_enabled: false
asserts:
- notMatchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: false'
template: templates/configmap-deployment.yaml
- matchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: true'
template: templates/configmap-deployment.yaml
- notMatchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: true'
template: templates/configmap.yaml
- matchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: false'
template: templates/configmap.yaml

- it: Validate cointerface_enabled keys are not duplicated
set:
delegatedAgentDeployment:
enabled: true
sysdig:
settings:
cointerface_enabled: true
asserts:
- notMatchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: false'
template: templates/configmap-deployment.yaml
- matchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: true'
template: templates/configmap-deployment.yaml
- notMatchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: false'
template: templates/configmap.yaml
- matchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: true'
template: templates/configmap.yaml

- it: Ensure settings overrides are still provided to deployment configmap
set:
delegatedAgentDeployment:
enabled: true
sysdig:
settings:
logs:
console_priority: debug
cointerface_enabled: false
asserts:
- matchRegex:
path: data['dragent.yaml']
pattern: 'logs:\n console_priority: debug'
- notMatchRegex:
path: data['dragent.yaml']
pattern: 'cointerface_enabled: false'
template: templates/configmap-deployment.yaml
Loading