From 1cac5c369c2a598f638dfac5abfc0fcf70c946f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?=
 <66256922+daniel-weisse@users.noreply.github.com>
Date: Fri, 20 Jan 2023 14:33:22 +0100
Subject: [PATCH] Merge develop branch (#39)
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/edgeless/Chart.yaml                        | 2 +-
 charts/edgeless/templates/csi-azuredisk-node.yaml | 2 +-
 charts/edgeless/values.yaml                       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/charts/edgeless/Chart.yaml b/charts/edgeless/Chart.yaml
index 44c7b5fe2..243a8d235 100644
--- a/charts/edgeless/Chart.yaml
+++ b/charts/edgeless/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "v1.1.0"
 description: Azure disk Container Storage Interface (CSI) Storage Plugin with on-node encryption support
 name: azuredisk-csi-driver
-version: v1.1.0
+version: v1.1.2
diff --git a/charts/edgeless/templates/csi-azuredisk-node.yaml b/charts/edgeless/templates/csi-azuredisk-node.yaml
index 1b2ede570..6ec55be8e 100644
--- a/charts/edgeless/templates/csi-azuredisk-node.yaml
+++ b/charts/edgeless/templates/csi-azuredisk-node.yaml
@@ -121,7 +121,7 @@ spec:
             - "--allow-empty-cloud-config={{ .Values.node.allowEmptyCloudConfig }}"
             - "--support-zone={{ .Values.node.supportZone }}"
             - "--get-node-info-from-labels={{ .Values.linux.getNodeInfoFromLabels }}"
-            - "--kms-addr={{ .Values.global.keyserviceName }}.{{ .Values.global.keyserviceNamespace | default .Release.Namespace }}:{{ .Values.global.keyservicePort }}"
+            - "--kms-addr={{ .Values.global.keyServiceName }}.{{ .Values.global.keyServiceNamespace | default .Release.Namespace }}:{{ .Values.global.keyServicePort }}"
           ports:
             - containerPort: {{ .Values.node.livenessProbe.healthPort }}
               name: healthz
diff --git a/charts/edgeless/values.yaml b/charts/edgeless/values.yaml
index 6a948806f..f8cfcfcbd 100644
--- a/charts/edgeless/values.yaml
+++ b/charts/edgeless/values.yaml
@@ -124,9 +124,9 @@ node:
   livenessProbe:
     healthPort: 29603
 global:
-  keyserviceName: "keyservice"
-  keyservicePort: 9000
-  keyserviceNamespace: "kube-system"
+  keyServiceName: "key-service"
+  keyServicePort: 9000
+  keyServiceNamespace: "kube-system"
 
 snapshot:
   enabled: false