From 5ce551154caade6a329f1b6b30a79d31f8fd96ff Mon Sep 17 00:00:00 2001 From: hayk99 Date: Tue, 29 Aug 2023 12:19:14 +0200 Subject: [PATCH 1/5] feat: add skiptls param --- charts/admission-controller/templates/webhook/configmap.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/admission-controller/templates/webhook/configmap.yaml b/charts/admission-controller/templates/webhook/configmap.yaml index 4a5194e58..7ade04a31 100644 --- a/charts/admission-controller/templates/webhook/configmap.yaml +++ b/charts/admission-controller/templates/webhook/configmap.yaml @@ -25,4 +25,5 @@ data: EXTERNAL_NATS_URL: {{ include "admissionController.natsUrl" . }} NATS_INSECURE: "{{.Values.webhook.v2.nats.insecure}}" {{- end}} - WORKERS: "{{.Values.webhook.workers | default 2 }}" + WORKERS: "{{.Values.webhook.workers.number | default 2 }}" + WORKER_SKIPTLS: "{{.Values.webhook.workers.skiptlsverify | default true }}" From 16731f50d5cf705deb9ccfebf6193dacdb3616b3 Mon Sep 17 00:00:00 2001 From: hayk99 Date: Tue, 29 Aug 2023 12:19:47 +0200 Subject: [PATCH 2/5] ci: bump version --- charts/admission-controller/Chart.yaml | 2 +- charts/admission-controller/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 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 ``` From f725b5f4e6363d1c14871c3128f35224243ccc1e Mon Sep 17 00:00:00 2001 From: hayk99 Date: Tue, 29 Aug 2023 12:34:19 +0200 Subject: [PATCH 3/5] fix: env vars --- .../admission-controller/templates/webhook/configmap.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/admission-controller/templates/webhook/configmap.yaml b/charts/admission-controller/templates/webhook/configmap.yaml index 7ade04a31..e622cd285 100644 --- a/charts/admission-controller/templates/webhook/configmap.yaml +++ b/charts/admission-controller/templates/webhook/configmap.yaml @@ -25,5 +25,10 @@ data: EXTERNAL_NATS_URL: {{ include "admissionController.natsUrl" . }} NATS_INSECURE: "{{.Values.webhook.v2.nats.insecure}}" {{- end}} + {{- if .Values.webhook.workers }} WORKERS: "{{.Values.webhook.workers.number | default 2 }}" - WORKER_SKIPTLS: "{{.Values.webhook.workers.skiptlsverify | default true }}" + WORKER_SKIPTLS: "{{.Values.webhook.workers.skiptlsverify | default "true" }}" + {{- else }} + WORKERS: 2 + WORKER_SKIPTLS: "true" + {{- end}} \ No newline at end of file From c744cc8eec3d6784f44cbed3ef023e51fe2b3a1a Mon Sep 17 00:00:00 2001 From: hayk99 Date: Tue, 29 Aug 2023 12:37:18 +0200 Subject: [PATCH 4/5] style: add blank line --- charts/admission-controller/templates/webhook/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/admission-controller/templates/webhook/configmap.yaml b/charts/admission-controller/templates/webhook/configmap.yaml index e622cd285..1bc93cb7c 100644 --- a/charts/admission-controller/templates/webhook/configmap.yaml +++ b/charts/admission-controller/templates/webhook/configmap.yaml @@ -31,4 +31,4 @@ data: {{- else }} WORKERS: 2 WORKER_SKIPTLS: "true" - {{- end}} \ No newline at end of file + {{- end}} From 83c639c86d9afb91a5d7cbf9710f3b1e4f290025 Mon Sep 17 00:00:00 2001 From: hayk99 Date: Tue, 29 Aug 2023 15:13:31 +0200 Subject: [PATCH 5/5] fix: use string --- charts/admission-controller/templates/webhook/configmap.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/admission-controller/templates/webhook/configmap.yaml b/charts/admission-controller/templates/webhook/configmap.yaml index 1bc93cb7c..16e10b26a 100644 --- a/charts/admission-controller/templates/webhook/configmap.yaml +++ b/charts/admission-controller/templates/webhook/configmap.yaml @@ -29,6 +29,6 @@ data: WORKERS: "{{.Values.webhook.workers.number | default 2 }}" WORKER_SKIPTLS: "{{.Values.webhook.workers.skiptlsverify | default "true" }}" {{- else }} - WORKERS: 2 + WORKERS: "2" WORKER_SKIPTLS: "true" {{- end}}