From 20b8eed718cd437a3ea093d2338fa1724c8e38dd Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 13 Sep 2022 09:31:52 +0300 Subject: [PATCH 1/3] fix(tailscale): render secret --- charts/common/Chart.yaml | 2 +- charts/common/templates/addons/vpn/tailscale/_addon.tpl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml index b825a4b0..e51d3791 100644 --- a/charts/common/Chart.yaml +++ b/charts/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 10.5.9 +version: 10.5.10 diff --git a/charts/common/templates/addons/vpn/tailscale/_addon.tpl b/charts/common/templates/addons/vpn/tailscale/_addon.tpl index f393c692..b97464e3 100644 --- a/charts/common/templates/addons/vpn/tailscale/_addon.tpl +++ b/charts/common/templates/addons/vpn/tailscale/_addon.tpl @@ -9,5 +9,6 @@ Template to render Tailscale addon. It will add the container to the list of add {{- $_ := set .Values.additionalContainers "addon-tailscale" $container -}} {{ include "tailscale.sa" . }} {{ include "tailscale.rbac" . }} + {{ include "tailscale.secret" . }} {{- end -}} {{- end -}} From 6fb5ef88fbd1907b904f7ddc8f4a4fbbc0f2955f Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 13 Sep 2022 09:39:23 +0300 Subject: [PATCH 2/3] change run user when userspace is not checked --- .../templates/addons/vpn/tailscale/_container.tpl | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/charts/common/templates/addons/vpn/tailscale/_container.tpl b/charts/common/templates/addons/vpn/tailscale/_container.tpl index c4fa4f72..409eb4ff 100644 --- a/charts/common/templates/addons/vpn/tailscale/_container.tpl +++ b/charts/common/templates/addons/vpn/tailscale/_container.tpl @@ -11,14 +11,23 @@ command: ["ash", "/tailscale/run.sh"] tty: true -# It should run rootless. But needs test securityContext: +{{- if .Values.addons.vpn.tailscale.userspace }} runAsUser: 1000 runAsGroup: 1000 + runAsNonRoot: true + readOnlyRootFilesystem: true +{{- else }} + runAsUser: 0 + runAsGroup: 0 + runAsNonRoot: false + readOnlyRootFilesystem: false +{{- end }} capabilities: add: - NET_ADMIN + envFrom: - secretRef: name: {{ $secretName }} From d069e60d1f6d79bb78b9b91352a03ec3349af57a Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Tue, 13 Sep 2022 09:39:59 +0300 Subject: [PATCH 3/3] empty space --- charts/common/templates/addons/vpn/tailscale/_container.tpl | 1 - 1 file changed, 1 deletion(-) diff --git a/charts/common/templates/addons/vpn/tailscale/_container.tpl b/charts/common/templates/addons/vpn/tailscale/_container.tpl index 409eb4ff..98b69861 100644 --- a/charts/common/templates/addons/vpn/tailscale/_container.tpl +++ b/charts/common/templates/addons/vpn/tailscale/_container.tpl @@ -27,7 +27,6 @@ securityContext: add: - NET_ADMIN - envFrom: - secretRef: name: {{ $secretName }}