Skip to content

chore(shield): add ssl config mapping for windows host-shield #2286

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

Merged
merged 2 commits into from
Jun 16, 2025
Merged

chore(shield): add ssl config mapping for windows host-shield #2286

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
461beb9
chore(shield): add ssl config mapping for windows host-shield
francesco-furlan Jun 16, 2025
56cb021
test(shield): add test for ssl custom ca on windows host-shield
francesco-furlan Jun 16, 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
2 changes: 1 addition & 1 deletion charts/shield/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ maintainers:
- name: mavimo
email: marcovito.moscaritolo@sysdig.com
type: application
version: 1.8.2
version: 1.8.3
appVersion: "1.0.0"
8 changes: 8 additions & 0 deletions charts/shield/templates/host/_windows_configmap_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,14 @@
{{- end -}}
{{- $_ := set $config "cluster_config" $clusterConfig -}}

{{- $sslConfig := dict "verify" .Values.ssl.verify -}}
{{- if (include "common.custom_ca.enabled" .) }}
{{- $path := (include "common.custom_ca.path" (merge (dict) . (dict "CACertsPath" "certificates/"))) }}
{{- $_ := set $sslConfig "ca" (dict "cert_path" $path) }}
{{- end -}}

{{- $_ := set $config "ssl" $sslConfig -}}

{{- $config := merge $config (dict "proxy" (include "host.proxy_config" . | fromYaml)) }}

{{- if and (include "common.semver.is_valid" .Values.host_windows.image.tag) (semverCompare ">= 0.8.0" .Values.host_windows.image.tag) }}
Expand Down
19 changes: 19 additions & 0 deletions charts/shield/tests/host/configmap-windows-host-shield-config_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,3 +437,22 @@ tests:
additional_settings:
connection_timeout: 1000
k8s_cluster_name: test-cluster

- it: Test ssl custom ca settings
set:
ssl:
verify: true
ca:
certs:
- "-----BEGIN CERTIFICATE-----\nMIID...==\n-----END CERTIFICATE-----"
key_name: "rootCA.crt"
asserts:
- notExists:
path: data['dragent.yaml']
- matchRegex:
path: data['host-shield.yaml']
pattern: |
ssl:
ca:
cert_path: certificates/rootCA.crt
verify: true
Loading