From c3bc304371ca09ecb503154fc31c47970405f214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?=
 <66256922+daniel-weisse@users.noreply.github.com>
Date: Mon, 16 Jan 2023 10:47:24 +0100
Subject: [PATCH] Merge develop branch (#34)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weiße <dw@edgeless.systems>
---
 charts/templates/node.yaml | 2 +-
 charts/values.yaml         | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/templates/node.yaml b/charts/templates/node.yaml
index 7b589710..819be7a7 100644
--- a/charts/templates/node.yaml
+++ b/charts/templates/node.yaml
@@ -41,7 +41,7 @@ spec:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
             - "--run-controller-service=false"
-            - "--kms-addr=kms.{{ .Values.csiNode.kmsNamespace | default .Release.Namespace }}:{{ .Values.csiNode.kmsPort }}"
+            - "--kms-addr={{ .Values.global.keyserviceName }}.{{ .Values.global.keyserviceNamespace | default .Release.Namespace }}:{{ .Values.global.keyservicePort }}"
           securityContext:
             privileged: true
           volumeMounts:
diff --git a/charts/values.yaml b/charts/values.yaml
index 135725a8..3c5e0fde 100644
--- a/charts/values.yaml
+++ b/charts/values.yaml
@@ -29,8 +29,9 @@ csiController:
   replicas: 1
   runOnControlPlane: true
 
-csiNode:
-  kmsPort: "9000"
-  kmsNamespace: "kube-system"
+global:
+  keyserviceName: "keyservice"
+  keyservicePort: 9000
+  keyserviceNamespace: "kube-system"
 
 createStorageClass: true