From e133baaba1d7f1d1b848fc250015568fc6a4e6dc Mon Sep 17 00:00:00 2001 From: Cyrill Troxler Date: Thu, 16 May 2019 18:15:45 +0200 Subject: [PATCH] Clean up old references to encryptionKey --- deploy/kubernetes/csi-s3.yaml | 25 ------------------------- deploy/kubernetes/provisioner.yaml | 25 ------------------------- pkg/s3/config.go | 1 - pkg/s3/s3-client.go | 1 - test/secret.yaml | 5 ----- 5 files changed, 57 deletions(-) diff --git a/deploy/kubernetes/csi-s3.yaml b/deploy/kubernetes/csi-s3.yaml index 69bbc5c..d820195 100644 --- a/deploy/kubernetes/csi-s3.yaml +++ b/deploy/kubernetes/csi-s3.yaml @@ -92,31 +92,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: accessKeyID - - name: SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: secretAccessKey - - name: S3_ENDPOINT - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: endpoint - - name: REGION - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: region - - name: ENCRYPTION_KEY - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: encryptionKey imagePullPolicy: "Always" volumeMounts: - name: plugin-dir diff --git a/deploy/kubernetes/provisioner.yaml b/deploy/kubernetes/provisioner.yaml index fd7cc07..bc1887f 100644 --- a/deploy/kubernetes/provisioner.yaml +++ b/deploy/kubernetes/provisioner.yaml @@ -91,31 +91,6 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - - name: ACCESS_KEY_ID - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: accessKeyID - - name: SECRET_ACCESS_KEY - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: secretAccessKey - - name: S3_ENDPOINT - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: endpoint - - name: REGION - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: region - - name: ENCRYPTION_KEY - valueFrom: - secretKeyRef: - name: csi-s3-secret - key: encryptionKey imagePullPolicy: "Always" volumeMounts: - name: socket-dir diff --git a/pkg/s3/config.go b/pkg/s3/config.go index f5b1714..e3d0b9a 100644 --- a/pkg/s3/config.go +++ b/pkg/s3/config.go @@ -7,5 +7,4 @@ type Config struct { Region string Endpoint string Mounter string - EncryptionKey string } diff --git a/pkg/s3/s3-client.go b/pkg/s3/s3-client.go index b85bc67..0f6c727 100644 --- a/pkg/s3/s3-client.go +++ b/pkg/s3/s3-client.go @@ -55,7 +55,6 @@ func newS3ClientFromSecrets(secrets map[string]string) (*s3Client, error) { SecretAccessKey: secrets["secretAccessKey"], Region: secrets["region"], Endpoint: secrets["endpoint"], - EncryptionKey: secrets["encryptionKey"], // Mounter is set in the volume preferences, not secrets Mounter: "", }) diff --git a/test/secret.yaml b/test/secret.yaml index 1f08c2f..50a57c4 100644 --- a/test/secret.yaml +++ b/test/secret.yaml @@ -3,28 +3,23 @@ CreateVolumeSecret: secretAccessKey: DSG643HGDS endpoint: http://127.0.0.1:9000 region: "" - encryptionKey: "" DeleteVolumeSecret: accessKeyID: FJDSJ secretAccessKey: DSG643HGDS endpoint: http://127.0.0.1:9000 region: "" - encryptionKey: "" NodeStageVolumeSecret: accessKeyID: FJDSJ secretAccessKey: DSG643HGDS endpoint: http://127.0.0.1:9000 region: "" - encryptionKey: "" NodePublishVolumeSecret: accessKeyID: FJDSJ secretAccessKey: DSG643HGDS endpoint: http://127.0.0.1:9000 region: "" - encryptionKey: "" ControllerValidateVolumeCapabilitiesSecret: accessKeyID: FJDSJ secretAccessKey: DSG643HGDS endpoint: http://127.0.0.1:9000 region: "" - encryptionKey: "" \ No newline at end of file