Merge pull request #815 from semyonmor/2022.4

Update envoy configuration
aquasecurity · Dec 12, 2023 · aaab6dd · aaab6dd
2 parents d5dc26f + dcf05d4
commit aaab6dd
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/kube-enforcer/CHANGELOG.md b/kube-enforcer/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 * SLK-68752 - Change dnsNdots to global value
 * Fix dependencies repository - [#808](https://github.com/aquasecurity/aqua-helm/issues/808)
 * Fix README.md [#806](https://github.com/aquasecurity/aqua-helm/issues/806)
+* Add option to configure trivy securityContext
 
 ## 2022.4.34 ( Dec 7th, 2023 )
 * Updated starboard version to v0.15.18

diff --git a/kube-enforcer/templates/trivy-deployment.yaml b/kube-enforcer/templates/trivy-deployment.yaml
@@ -134,7 +134,10 @@ spec:
                 - ALL
             privileged: false
             readOnlyRootFilesystem: true
+      {{- with .Values.trivy.securityContext }}
       securityContext:
+      {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.trivy.nodeSelector }}
       nodeSelector:
         {{ toYaml . | nindent 8 }}

diff --git a/kube-enforcer/values.yaml b/kube-enforcer/values.yaml
@@ -377,6 +377,7 @@ trivy:
     failureThreshold: 10
   resources: {}
   nodeSelector: {}
+  securityContext: {}
 
 
 ##Kube Enforcer advance deployment options

diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md
@@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file.
 
 ## 2022.4.35 ( Dec 10th, 2023 )
 * Fix indentation and formatting for external DB - [#790](https://github.com/aquasecurity/aqua-helm/issues/790) 
-
+* Fix envoy configuration
+* 
 ## 2022.4.21 (Dec 5 th, 2023)
 * Allow the API version of PodDisruptionBudget to be overridden [#807](https://github.com/aquasecurity/aqua-helm/pull/807)
 

diff --git a/server/conf/envoy.yaml.tpl b/server/conf/envoy.yaml.tpl
@@ -41,7 +41,8 @@ static_resources:
               - name: "x-envoy-livenessprobe"
                 exact_match: "healthz"
           - name: envoy.filters.http.router
-            typed_config: {}
+            typed_config:
+              "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
       transport_socket:
         name: envoy.transport_sockets.tls
         typed_config: