Revert changes to CSI driver charts

These changes will be made once they are release in the upstream repos.
edgelesssys · Jan 12, 2023 · 003593f · 003593f
1 parent 52607c5
commit 003593f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/...less/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/...less/constellation-services/charts/azuredisk-csi-driver/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=keyservice.{{ .Values.node.keyserviceNamespace | default .Release.Namespace }}:{{ .Values.global.keyservicePort }}"
+            - "--kms-addr=kms.{{ .Values.node.kmsNamespace | default .Release.Namespace }}:{{ .Values.node.kmsPort }}"
           ports:
             - containerPort: {{ .Values.node.livenessProbe.healthPort }}
               name: healthz

diff --git a/...ernal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml b/...ernal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml
@@ -123,7 +123,8 @@ node:
   logLevel: 5
   livenessProbe:
     healthPort: 29603
-  keyserviceNamespace: "kube-system"
+  kmsPort: "9000"
+  kmsNamespace: "kube-system"
 
 snapshot:
   enabled: false

diff --git a/.../constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/.../constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
@@ -41,7 +41,7 @@ spec:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
             - "--run-controller-service=false"
-            - "--kms-addr=keyservice.{{ .Values.csiNode.keyserviceNamespace | default .Release.Namespace }}:{{ .Values.global.keyservicePort }}"
+            - "--kms-addr=kms.{{ .Values.csiNode.kmsNamespace | default .Release.Namespace }}:{{ .Values.csiNode.kmsPort }}"
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/...edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml b/...edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml
@@ -30,6 +30,7 @@ csiController:
   runOnControlPlane: true
 
 csiNode:
-  keyserviceNamespace: "kube-system"
+  kmsPort: "9000"
+  kmsNamespace: "kube-system"
 
 createStorageClass: true
diff --git a/cli/internal/helm/loader.go b/cli/internal/helm/loader.go
@@ -422,7 +422,7 @@ func (i *ChartLoader) loadConstellationServicesValues(config *config.Config, mas
 
 		values["azuredisk-csi-driver"] = map[string]any{
 			"node": map[string]any{
-				"keyserviceNamespace": "", // empty namespace means we use the release namespace
+				"kmsNamespace": "", // empty namespace means we use the release namespace
 			},
 		}
 
@@ -445,7 +445,7 @@ func (i *ChartLoader) loadConstellationServicesValues(config *config.Config, mas
 
 		values["gcp-compute-persistent-disk-csi-driver"] = map[string]any{
 			"csiNode": map[string]any{
-				"keyserviceNamespace": "", // empty namespace means we use the release namespace
+				"kmsNamespace": "", // empty namespace means we use the release namespace
 			},
 		}
 

diff --git a/...zure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/...zure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -107,7 +107,7 @@ spec:
             - "--allow-empty-cloud-config=true"
             - "--support-zone=true"
             - "--get-node-info-from-labels=false"
-            - "--kms-addr=keyservice.testNamespace:9000"
+            - "--kms-addr=kms.testNamespace:9000"
           ports:
             - containerPort: 29603
               name: healthz

diff --git a/.../constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/.../constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml
@@ -41,7 +41,7 @@ spec:
             - "--v=5"
             - "--endpoint=unix:/csi/csi.sock"
             - "--run-controller-service=false"
-            - "--kms-addr=keyservice.testNamespace:9000"
+            - "--kms-addr=kms.testNamespace:9000"
           securityContext:
             privileged: true
           volumeMounts: