Skip to content

Commit 289ff48

Browse files
fnonayfrancesco-furlan
fnonay
and
francesco-furlan
authored
chore(shield): remove default ca_certificate on http_proxy config for windows (#2228)
Co-authored-by: Francesco Furlan <[email protected]>
1 parent be2d6b1 commit 289ff48

File tree

3 files changed

+1
-24
lines changed

3 files changed

+1
-24
lines changed

‎charts/shield/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ maintainers:
1313
- name: mavimo
1414
email: [email protected]
1515
type: application
16-
version: 1.3.5
16+
version: 1.3.6
1717
appVersion: "1.0.0"

‎charts/shield/templates/host/_windows_configmap_helpers.tpl

-3
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@
8181
{{- if (include "common.proxy.enabled" . ) }}
8282
{{- $http_proxy := (include "host.dragent_proxy_config" . | fromYaml) -}}
8383
{{- $config := merge $config (dict "http_proxy" $http_proxy) -}}
84-
{{- if (not $http_proxy.ca_certificate) -}}
85-
{{- $_ := set $http_proxy "ca_certificate" "Certs/cacert.pem" -}}
86-
{{- end -}}
8784
{{- end }}
8885
8986
{{- if (include "host.windows.agent_runtime.log_level" . ) -}}

‎charts/shield/tests/host/configmap-windows-dragent-yaml_test.yaml

-20
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ tests:
8686
path: data['dragent.yaml']
8787
pattern: |
8888
http_proxy:
89-
ca_certificate: Certs/cacert.pem
9089
proxy_host: proxy.example.com
9190
proxy_port: "8080"
9291
ssl: false
@@ -112,7 +111,6 @@ tests:
112111
path: data['dragent.yaml']
113112
pattern: |
114113
http_proxy:
115-
ca_certificate: Certs/cacert.pem
116114
proxy_host: proxy-existing.example.com
117115
proxy_port: "8080"
118116
ssl: false
@@ -138,7 +136,6 @@ tests:
138136
path: data['dragent.yaml']
139137
pattern: |
140138
http_proxy:
141-
ca_certificate: Certs/cacert.pem
142139
proxy_host: proxy.example.com
143140
proxy_password: password
144141
proxy_port: "8080"
@@ -166,7 +163,6 @@ tests:
166163
path: data['dragent.yaml']
167164
pattern: |
168165
http_proxy:
169-
ca_certificate: Certs/cacert.pem
170166
proxy_host: proxy-existing.example.com
171167
proxy_password: passwordexisting
172168
proxy_port: "8080"
@@ -194,7 +190,6 @@ tests:
194190
path: data['dragent.yaml']
195191
pattern: |
196192
http_proxy:
197-
ca_certificate: Certs/cacert.pem
198193
proxy_host: proxy.example.com
199194
proxy_port: "8080"
200195
ssl: true
@@ -220,7 +215,6 @@ tests:
220215
path: data['dragent.yaml']
221216
pattern: |
222217
http_proxy:
223-
ca_certificate: Certs/cacert.pem
224218
proxy_host: proxy-existing.example.com
225219
proxy_port: "8080"
226220
ssl: true
@@ -246,7 +240,6 @@ tests:
246240
path: data['dragent.yaml']
247241
pattern: |
248242
http_proxy:
249-
ca_certificate: Certs/cacert.pem
250243
proxy_host: proxy.example.com
251244
proxy_password: password
252245
proxy_port: "8080"
@@ -274,7 +267,6 @@ tests:
274267
path: data['dragent.yaml']
275268
pattern: |
276269
http_proxy:
277-
ca_certificate: Certs/cacert.pem
278270
proxy_host: proxy-existing.example.com
279271
proxy_password: passwordexisting
280272
proxy_port: "8080"
@@ -302,7 +294,6 @@ tests:
302294
path: data['dragent.yaml']
303295
pattern: |
304296
http_proxy:
305-
ca_certificate: Certs/cacert.pem
306297
proxy_host: proxy.example.com
307298
proxy_port: "8080"
308299
ssl: false
@@ -328,7 +319,6 @@ tests:
328319
path: data['dragent.yaml']
329320
pattern: |
330321
http_proxy:
331-
ca_certificate: Certs/cacert.pem
332322
proxy_host: proxy-existing.example.com
333323
proxy_port: "8080"
334324
ssl: false
@@ -354,7 +344,6 @@ tests:
354344
path: data['dragent.yaml']
355345
pattern: |
356346
http_proxy:
357-
ca_certificate: Certs/cacert.pem
358347
proxy_host: proxy.example.com
359348
proxy_password: password
360349
proxy_port: "8080"
@@ -382,7 +371,6 @@ tests:
382371
path: data['dragent.yaml']
383372
pattern: |
384373
http_proxy:
385-
ca_certificate: Certs/cacert.pem
386374
proxy_host: proxy-existing.example.com
387375
proxy_password: passwordexisting
388376
proxy_port: "8080"
@@ -409,7 +397,6 @@ tests:
409397
path: data['dragent.yaml']
410398
pattern: |
411399
http_proxy:
412-
ca_certificate: Certs/cacert.pem
413400
proxy_host: proxy.example.com
414401
proxy_port: "8080"
415402
ssl: true
@@ -435,7 +422,6 @@ tests:
435422
path: data['dragent.yaml']
436423
pattern: |
437424
http_proxy:
438-
ca_certificate: Certs/cacert.pem
439425
proxy_host: proxy-existing.example.com
440426
proxy_port: "8080"
441427
ssl: true
@@ -460,7 +446,6 @@ tests:
460446
path: data['dragent.yaml']
461447
pattern: |
462448
http_proxy:
463-
ca_certificate: Certs/cacert.pem
464449
proxy_host: proxy.example.com
465450
proxy_password: password
466451
proxy_port: "8080"
@@ -488,7 +473,6 @@ tests:
488473
path: data['dragent.yaml']
489474
pattern: |
490475
http_proxy:
491-
ca_certificate: Certs/cacert.pem
492476
proxy_host: proxy-existing.example.com
493477
proxy_password: passwordexisting
494478
proxy_port: "8080"
@@ -516,7 +500,6 @@ tests:
516500
path: data['dragent.yaml']
517501
pattern: |
518502
http_proxy:
519-
ca_certificate: Certs/cacert.pem
520503
proxy_host: proxy.example.com
521504
proxy_password: password
522505
proxy_port: "8080"
@@ -544,7 +527,6 @@ tests:
544527
path: data['dragent.yaml']
545528
pattern: |
546529
http_proxy:
547-
ca_certificate: Certs/cacert.pem
548530
proxy_host: proxy-existing.example.com
549531
proxy_password: passwordexisting
550532
proxy_port: "8080"
@@ -572,7 +554,6 @@ tests:
572554
path: data['dragent.yaml']
573555
pattern: |
574556
http_proxy:
575-
ca_certificate: Certs/cacert.pem
576557
proxy_host: proxy.example.com
577558
proxy_password: password
578559
proxy_port: "8080"
@@ -600,7 +581,6 @@ tests:
600581
path: data['dragent.yaml']
601582
pattern: |
602583
http_proxy:
603-
ca_certificate: Certs/cacert.pem
604584
proxy_host: proxy-existing.example.com
605585
proxy_password: passwordexisting
606586
proxy_port: "8080"

0 commit comments

Comments
 (0)