From 5d39d4f02da9613453f137cbe7ffa22f8516876f Mon Sep 17 00:00:00 2001 From: Pepe Gomez Date: Mon, 18 Nov 2024 12:29:07 +0100 Subject: [PATCH 1/4] Fix usage of different Dapr NS Signed-off-by: Pepe Gomez --- chart/dapr-shared/templates/_daemondeployshared.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chart/dapr-shared/templates/_daemondeployshared.yaml b/chart/dapr-shared/templates/_daemondeployshared.yaml index 28d5446..f5d0813 100644 --- a/chart/dapr-shared/templates/_daemondeployshared.yaml +++ b/chart/dapr-shared/templates/_daemondeployshared.yaml @@ -34,6 +34,9 @@ args: - init - --config-map={{ .Release.Name }}-shared-cm + env: + - name: DAPR_CONTROL_PLANE_NAMESPACE + value: {{ default "dapr-system" .Values.shared.controlPlane.namespace }} containers: - name: daprd securityContext: @@ -62,7 +65,7 @@ - --enable-api-logging={{ .Values.shared.daprd.apiLogging.enabled }} - --app-channel-address={{ .Values.shared.remoteURL }} - --config={{ .Values.shared.daprd.config }} - {{- if .Values.shared.daprd.appHealth.enabled }} + {{- if .Values.shared.daprd.appHealth.enabled }} - --enable-app-health-check={{ .Values.shared.daprd.appHealth.enabled }} - --app-health-check-path={{ default "/healthz" .Values.shared.daprd.appHealth.checkPath }} - --app-health-probe-interval={{ .Values.shared.daprd.appHealth.probeInterval }} From bd124b6a96fdd78c3f043cd6e390b0e96ca3acea Mon Sep 17 00:00:00 2001 From: Pepe Gomez Date: Mon, 18 Nov 2024 12:29:25 +0100 Subject: [PATCH 2/4] Allow disable Secrets access Signed-off-by: Pepe Gomez --- chart/dapr-shared/templates/_daemondeployshared.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/chart/dapr-shared/templates/_daemondeployshared.yaml b/chart/dapr-shared/templates/_daemondeployshared.yaml index f5d0813..98adaf5 100644 --- a/chart/dapr-shared/templates/_daemondeployshared.yaml +++ b/chart/dapr-shared/templates/_daemondeployshared.yaml @@ -65,6 +65,7 @@ - --enable-api-logging={{ .Values.shared.daprd.apiLogging.enabled }} - --app-channel-address={{ .Values.shared.remoteURL }} - --config={{ .Values.shared.daprd.config }} + - --disableBuiltinK8sSecretStore={{ default "false" .Values.shared.daprd.disableBuiltinK8sSecretStore }} {{- if .Values.shared.daprd.appHealth.enabled }} - --enable-app-health-check={{ .Values.shared.daprd.appHealth.enabled }} - --app-health-check-path={{ default "/healthz" .Values.shared.daprd.appHealth.checkPath }} From 5b8adcd93fa184bcb9b0c27d256f48a557524a50 Mon Sep 17 00:00:00 2001 From: Pepe Gomez Date: Mon, 18 Nov 2024 15:24:21 +0100 Subject: [PATCH 3/4] Fix wrong ident Signed-off-by: Pepe Gomez --- chart/dapr-shared/templates/_daemondeployshared.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/dapr-shared/templates/_daemondeployshared.yaml b/chart/dapr-shared/templates/_daemondeployshared.yaml index 98adaf5..1d6dba7 100644 --- a/chart/dapr-shared/templates/_daemondeployshared.yaml +++ b/chart/dapr-shared/templates/_daemondeployshared.yaml @@ -66,7 +66,7 @@ - --app-channel-address={{ .Values.shared.remoteURL }} - --config={{ .Values.shared.daprd.config }} - --disableBuiltinK8sSecretStore={{ default "false" .Values.shared.daprd.disableBuiltinK8sSecretStore }} - {{- if .Values.shared.daprd.appHealth.enabled }} + {{- if .Values.shared.daprd.appHealth.enabled }} - --enable-app-health-check={{ .Values.shared.daprd.appHealth.enabled }} - --app-health-check-path={{ default "/healthz" .Values.shared.daprd.appHealth.checkPath }} - --app-health-probe-interval={{ .Values.shared.daprd.appHealth.probeInterval }} From 00fb286013288e6decc068b46313f15199a926cc Mon Sep 17 00:00:00 2001 From: Pepe Gomez Date: Mon, 25 Nov 2024 10:17:57 +0100 Subject: [PATCH 4/4] Disable secret dapr correctly Signed-off-by: Pepe Gomez --- chart/dapr-shared/templates/_daemondeployshared.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chart/dapr-shared/templates/_daemondeployshared.yaml b/chart/dapr-shared/templates/_daemondeployshared.yaml index 1d6dba7..51f4fea 100644 --- a/chart/dapr-shared/templates/_daemondeployshared.yaml +++ b/chart/dapr-shared/templates/_daemondeployshared.yaml @@ -65,7 +65,7 @@ - --enable-api-logging={{ .Values.shared.daprd.apiLogging.enabled }} - --app-channel-address={{ .Values.shared.remoteURL }} - --config={{ .Values.shared.daprd.config }} - - --disableBuiltinK8sSecretStore={{ default "false" .Values.shared.daprd.disableBuiltinK8sSecretStore }} + - --disable-builtin-k8s-secret-store={{ default "false" .Values.shared.daprd.disableBuiltinK8sSecretStore }} {{- if .Values.shared.daprd.appHealth.enabled }} - --enable-app-health-check={{ .Values.shared.daprd.appHealth.enabled }} - --app-health-check-path={{ default "/healthz" .Values.shared.daprd.appHealth.checkPath }}