Skip to content

chore(shield): remove default ca_certificate on http_proxy config for windows #2228

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
Apr 16, 2025
Merged

chore(shield): remove default ca_certificate on http_proxy config for windows #2228

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
58091e1
chore(shield): remove default ca_certificate on http_proxy config for…
francesco-furlan Apr 9, 2025
3b5381d
chore(shield): bump
francesco-furlan Apr 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.3.5
version: 1.3.6
appVersion: "1.0.0"
3 changes: 0 additions & 3 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 @@ -81,9 +81,6 @@
{{- if (include "common.proxy.enabled" . ) }}
{{- $http_proxy := (include "host.dragent_proxy_config" . | fromYaml) -}}
{{- $config := merge $config (dict "http_proxy" $http_proxy) -}}
{{- if (not $http_proxy.ca_certificate) -}}
{{- $_ := set $http_proxy "ca_certificate" "Certs/cacert.pem" -}}
{{- end -}}
{{- end }}

{{- if (include "host.windows.agent_runtime.log_level" . ) -}}
Expand Down
20 changes: 0 additions & 20 deletions charts/shield/tests/host/configmap-windows-dragent-yaml_test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_port: "8080"
ssl: false
Expand All @@ -112,7 +111,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_port: "8080"
ssl: false
Expand All @@ -138,7 +136,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_password: password
proxy_port: "8080"
Expand Down Expand Up @@ -166,7 +163,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_password: passwordexisting
proxy_port: "8080"
Expand Down Expand Up @@ -194,7 +190,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_port: "8080"
ssl: true
Expand All @@ -220,7 +215,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_port: "8080"
ssl: true
Expand All @@ -246,7 +240,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_password: password
proxy_port: "8080"
Expand Down Expand Up @@ -274,7 +267,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_password: passwordexisting
proxy_port: "8080"
Expand Down Expand Up @@ -302,7 +294,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_port: "8080"
ssl: false
Expand All @@ -328,7 +319,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_port: "8080"
ssl: false
Expand All @@ -354,7 +344,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_password: password
proxy_port: "8080"
Expand Down Expand Up @@ -382,7 +371,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_password: passwordexisting
proxy_port: "8080"
Expand All @@ -409,7 +397,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_port: "8080"
ssl: true
Expand All @@ -435,7 +422,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_port: "8080"
ssl: true
Expand All @@ -460,7 +446,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_password: password
proxy_port: "8080"
Expand Down Expand Up @@ -488,7 +473,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_password: passwordexisting
proxy_port: "8080"
Expand Down Expand Up @@ -516,7 +500,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_password: password
proxy_port: "8080"
Expand Down Expand Up @@ -544,7 +527,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_password: passwordexisting
proxy_port: "8080"
Expand Down Expand Up @@ -572,7 +554,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy.example.com
proxy_password: password
proxy_port: "8080"
Expand Down Expand Up @@ -600,7 +581,6 @@ tests:
path: data['dragent.yaml']
pattern: |
http_proxy:
ca_certificate: Certs/cacert.pem
proxy_host: proxy-existing.example.com
proxy_password: passwordexisting
proxy_port: "8080"
Expand Down
Loading