feat(KSPM admission controller): SSPROD-35354 - Make Dry Run mode con…

…figurable to a user in Chart Values. (#1560)
sysdiglabs · Jan 25, 2024 · 48a4f16 · 48a4f16
1 parent e270b0d
commit 48a4f16
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/charts/admission-controller/Chart.yaml b/charts/admission-controller/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: admission-controller
 description: Sysdig Admission Controller using Sysdig Secure inline image scanner
 type: application
-version: 0.14.19
+version: 0.14.20
 appVersion: 3.9.36
 home: https://sysdiglabs.github.io/admission-controller/
 icon: https://avatars.githubusercontent.com/u/5068817?s=200&v=4

diff --git a/charts/admission-controller/README.md b/charts/admission-controller/README.md
@@ -68,7 +68,7 @@ For example:
 
 ```bash
 helm upgrade --install admission-controller sysdig/admission-controller \
-    --create-namespace -n sysdig-admission-controller --version=0.14.19  \
+    --create-namespace -n sysdig-admission-controller --version=0.14.20  \
     --set sysdig.secureAPIToken=YOUR-KEY-HERE,clusterName=YOUR-CLUSTER-NAME
 ```
 
@@ -80,7 +80,7 @@ For example:
 
 ```bash
 helm upgrade --install admission-controller sysdig/admission-controller \
-     --create-namespace -n sysdig-admission-controller --version=0.14.19  \
+     --create-namespace -n sysdig-admission-controller --version=0.14.20  \
     --values values.yaml
 
 ```
@@ -142,7 +142,7 @@ The following table lists the configurable parameters of the `admission-controll
 | webhook.v2.http.port                               | HTTP serve port where the requests will be served from                                                                                                                                                                                                                                                                                                                                                                                                        | <code>6443</code>                                                                                                                                                                                  |
 | webhook.v2.image.registry                          | The KSPM Admission Controller image registry                                                                                                                                                                                                                                                                                                                                                                                                                  | <code>quay.io</code>                                                                                                                                                                               |
 | webhook.v2.image.repository                        | The KSPM Admission Controller image repository                                                                                                                                                                                                                                                                                                                                                                                                                | <code>sysdig/secure-admission-controller</code>                                                                                                                                                    |
-| webhook.v2.image.tag                               | The KSPM Admission Controller image tag                                                                                                                                                                                                                                                                                                                                                                                                                       | <code>1.0.1</code>                                                                                                                                                                                 |
+| webhook.v2.image.tag                               | The KSPM Admission Controller image tag                                                                                                                                                                                                                                                                                                                                                                                                                       | <code>1.27.0</code>                                                                                                                                                                                |
 | webhook.v2.image.digest                            | Specifies the image digest value.  If set, this value is used instead of the tag value                                                                                                                                                                                                                                                                                                                                                                        | <code></code>                                                                                                                                                                                      |
 | webhook.v2.image.pullPolicy                        | The PullPolicy for KSPM Admission Controller image                                                                                                                                                                                                                                                                                                                                                                                                            | <code></code>                                                                                                                                                                                      |
 | webhook.name                                       | The service name for Webhook deployment                                                                                                                                                                                                                                                                                                                                                                                                                       | <code>webhook</code>                                                                                                                                                                               |

diff --git a/charts/admission-controller/templates/webhook/deployment.yaml b/charts/admission-controller/templates/webhook/deployment.yaml
@@ -54,8 +54,12 @@ spec:
           image: {{ include "admissionController.kspm.image" . }}
           imagePullPolicy: {{ .Values.webhook.v2.image.pullPolicy | default .Values.global.image.pullPolicy }}
           env:
+            - name: DEFAULT_TIMEOUT
+              value: {{ .Values.webhook.timeoutSeconds | quote }}
+            - name: DENY_ON_ERROR
+              value: {{ .Values.webhook.denyOnError | default "false" | quote }}
             - name: DRY_RUN
-              value: "true"
+              value: {{ .Values.webhook.dryRun | default "true" | quote }}
             {{- if (or (include "webhook.httpProxy" .) (include "webhook.httpsProxy" .) (include "webhook.noProxy" .) )}}
             - name: HTTP_PROXY
               value: {{ include "webhook.httpProxy" . }}

diff --git a/charts/admission-controller/values.yaml b/charts/admission-controller/values.yaml
@@ -190,7 +190,7 @@ webhook:
       # The KSPM Admission Controller image repository
       repository: sysdig/secure-admission-controller
       # The KSPM Admission Controller image tag
-      tag: 1.0.1
+      tag: 1.27.0
       # Specifies the image digest value.  If set, this value is used instead of the tag value
       digest:
       # The PullPolicy for KSPM Admission Controller image

diff --git a/charts/sysdig-deploy/Chart.yaml b/charts/sysdig-deploy/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sysdig-deploy
 description: A chart with various Sysdig components for Kubernetes
 type: application
-version: 1.37.6
+version: 1.37.7
 maintainers:
   - name: AlbertoBarba
     email: [email protected]
@@ -20,7 +20,7 @@ dependencies:
   - name: admission-controller
     # repository: https://charts.sysdig.com
     repository: file://../admission-controller
-    version: ~0.14.19
+    version: ~0.14.20
     alias: admissionController
     condition: admissionController.enabled
   - name: agent