Skip to content

fix(shield): do not set proxy configuration on host-shield when proxy is not configured #2319

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
AlbertoBarba merged 1 commit into from
Jul 16, 2025
Merged

fix(shield): do not set proxy configuration on host-shield when proxy is not configured #2319

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
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.12.5
version: 1.12.6
appVersion: "1.0.0"
4 changes: 3 additions & 1 deletion 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 @@ -73,7 +73,9 @@

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

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

{{- if and (include "common.semver.is_valid" .Values.host_windows.image.tag) (semverCompare ">= 0.8.0-0" .Values.host_windows.image.tag) }}
{{- $runtimeAdditionalSettings := (include "host.windows.runtime_config_override" .) | fromYaml }}
Expand Down
69 changes: 61 additions & 8 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 @@ -180,7 +180,7 @@ tests:
in_use:
enabled: true

- it: Default No Proxy
- it: Default Proxy
asserts:
- hasDocuments:
count: 1
Expand All @@ -193,11 +193,10 @@ tests:
value: shield-namespace
- exists:
path: data["host-shield.yaml"]
- matchRegex:
- notMatchRegex:
path: data["host-shield.yaml"]
pattern: |-
proxy:
no_proxy: 127.0.0.1,localhost,169.254.0.0/16,.cluster.local
pattern: |
proxy: .*

- it: With Only HTTP Proxy (http protocol)
set:
Expand All @@ -220,6 +219,7 @@ tests:
pattern: |-
proxy:
http_proxy: http://proxy.example.com:8080
no_proxy: 127.0.0.1,localhost,169.254.0.0/16,.cluster.local

- it: With Only HTTP Proxy (http protocol) [Existing Secret]
set:
Expand All @@ -242,6 +242,7 @@ tests:
pattern: |-
proxy:
http_proxy: http://proxy-existing.example.com:8080
no_proxy: 127.0.0.1,localhost,169.254.0.0/16,.cluster.local

- it: With Only HTTPS Proxy (https protocol)
set:
Expand All @@ -264,6 +265,7 @@ tests:
pattern: |
proxy:
https_proxy: https://proxy.example.com:8080
no_proxy: 127.0.0.1,localhost,169.254.0.0/16,.cluster.local

- it: With Only HTTPS Proxy (https protocol) [Existing Secret]
set:
Expand All @@ -286,6 +288,7 @@ tests:
pattern: |
proxy:
https_proxy: https://proxy-existing.example.com:8080
no_proxy: 127.0.0.1,localhost,169.254.0.0/16,.cluster.local

- it: With Only NO Proxy
set:
Expand All @@ -303,15 +306,63 @@ tests:
value: shield-namespace
- exists:
path: data["host-shield.yaml"]
- matchRegex:
- notMatchRegex:
path: data["host-shield.yaml"]
pattern: |
proxy: .*

- it: With Only NO Proxy [Existing Secret]
set:
proxy:
no_proxy_existing_secret: "proxy-secret"
asserts:
- hasDocuments:
count: 1
- containsDocument:
kind: ConfigMap
apiVersion: v1
name: release-name-shield-host-windows
- equal:
path: metadata.namespace
value: shield-namespace
- exists:
path: data["host-shield.yaml"]
- notMatchRegex:
path: data["host-shield.yaml"]
pattern: |
proxy: .*

- it: With No Proxy
set:
proxy:
http_proxy: "http://proxy.example.com:8080"
https_proxy: "https://proxy.example.com:8080"
no_proxy: "example.com"
asserts:
- hasDocuments:
count: 1
- containsDocument:
kind: ConfigMap
apiVersion: v1
name: release-name-shield-host-windows
- equal:
path: metadata.namespace
value: shield-namespace
- exists:
path: data["host-shield.yaml"]
- matchRegex:
path: data["host-shield.yaml"]
pattern: |-
proxy:
http_proxy: http://proxy.example.com:8080
https_proxy: https://proxy.example.com:8080
no_proxy: example.com,127.0.0.1,localhost,169.254.0.0/16,.cluster.local

- it: With Only NO Proxy [Existing Secret]
- it: With No Proxy [Existing Secret]
set:
proxy:
http_proxy_existing_secret: "proxy-secret"
https_proxy_existing_secret: "proxy-secret"
no_proxy_existing_secret: "proxy-secret"
asserts:
- hasDocuments:
Expand All @@ -327,8 +378,10 @@ tests:
path: data["host-shield.yaml"]
- matchRegex:
path: data["host-shield.yaml"]
pattern: |
pattern: |-
proxy:
http_proxy: http://proxy-existing.example.com:8080
https_proxy: https://proxy-existing.example.com:8080
no_proxy: example.com

- it: Alternative regions (default)
Expand Down
Loading