From 003593fa21c11e8254f24f82c9a16d01c95a8f39 Mon Sep 17 00:00:00 2001 From: Otto Bittner Date: Thu, 12 Jan 2023 17:21:07 +0100 Subject: [PATCH] Revert changes to CSI driver charts These changes will be made once they are release in the upstream repos. --- .../azuredisk-csi-driver/templates/csi-azuredisk-node.yaml | 2 +- .../charts/azuredisk-csi-driver/values.yaml | 3 ++- .../templates/node.yaml | 2 +- .../charts/gcp-compute-persistent-disk-csi-driver/values.yaml | 3 ++- cli/internal/helm/loader.go | 4 ++-- .../azuredisk-csi-driver/templates/csi-azuredisk-node.yaml | 2 +- .../templates/node.yaml | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cli/internal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml index fc4aa3279a3..3b0ef9a62bd 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml +++ b/cli/internal/helm/charts/edgeless/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/cli/internal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml index 218911f81cb..5b52761ef72 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/azuredisk-csi-driver/values.yaml +++ b/cli/internal/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/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml index cc850180993..7b589710e09 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml +++ b/cli/internal/helm/charts/edgeless/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/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml b/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml index ee1cb03f34d..135725a8b9f 100644 --- a/cli/internal/helm/charts/edgeless/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/values.yaml +++ b/cli/internal/helm/charts/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 index 37c30012763..422236f6d81 100644 --- 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/cli/internal/helm/testdata/Azure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/cli/internal/helm/testdata/Azure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml index dbb225d36fc..061263a227f 100644 --- a/cli/internal/helm/testdata/Azure/constellation-services/charts/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml +++ b/cli/internal/helm/testdata/Azure/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/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml b/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml index a1e1963c2aa..441edae3c7c 100644 --- a/cli/internal/helm/testdata/GCP/constellation-services/charts/gcp-compute-persistent-disk-csi-driver/templates/node.yaml +++ b/cli/internal/helm/testdata/GCP/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: