From 640fa2e83bbb989eef40cc565555a0b5ff4c65dc Mon Sep 17 00:00:00 2001 From: Hayk Kocharyan Date: Tue, 29 Aug 2023 15:18:44 +0200 Subject: [PATCH] feat(admission-controller): Add support for worker skiptls (#1317) --- charts/admission-controller/Chart.yaml | 2 +- charts/admission-controller/README.md | 4 ++-- .../admission-controller/templates/webhook/configmap.yaml | 8 +++++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/charts/admission-controller/Chart.yaml b/charts/admission-controller/Chart.yaml index 63740ada4..6be9338d1 100644 --- 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.13.3 +version: 0.13.4 appVersion: 3.9.26 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 index 2f4437751..9a8d1c890 100644 --- 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.13.3 \ + --create-namespace -n sysdig-admission-controller --version=0.13.4 \ --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.13.3 \ + --create-namespace -n sysdig-admission-controller --version=0.13.4 \ --values values.yaml ``` diff --git a/charts/admission-controller/templates/webhook/configmap.yaml b/charts/admission-controller/templates/webhook/configmap.yaml index 4a5194e58..16e10b26a 100644 --- a/charts/admission-controller/templates/webhook/configmap.yaml +++ b/charts/admission-controller/templates/webhook/configmap.yaml @@ -25,4 +25,10 @@ data: EXTERNAL_NATS_URL: {{ include "admissionController.natsUrl" . }} NATS_INSECURE: "{{.Values.webhook.v2.nats.insecure}}" {{- end}} - WORKERS: "{{.Values.webhook.workers | default 2 }}" + {{- if .Values.webhook.workers }} + WORKERS: "{{.Values.webhook.workers.number | default 2 }}" + WORKER_SKIPTLS: "{{.Values.webhook.workers.skiptlsverify | default "true" }}" + {{- else }} + WORKERS: "2" + WORKER_SKIPTLS: "true" + {{- end}}