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

Author: AlbertoBarba

charts/shield/Chart.yaml

@@ -13,5 +13,5 @@ maintainers:
   - name: mavimo
     email: [email protected]
 type: application
-version: 1.12.5
+version: 1.12.6
 appVersion: "1.0.0"

charts/shield/templates/host/_windows_configmap_helpers.tpl

@@ -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 }}

charts/shield/tests/host/configmap-windows-host-shield-config_test.yaml

@@ -180,7 +180,7 @@ tests:
                 in_use:
                   enabled: true
 
-  - it: Default No Proxy
+  - it: Default Proxy
     asserts:
       - hasDocuments:
           count: 1
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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)