Commit e133baab authored by Cyrill Troxler's avatar Cyrill Troxler
Browse files

Clean up old references to encryptionKey

parent b59a7f21

deploy/kubernetes/csi-s3.yaml

+0 −25
Original line number Diff line number Diff line
@@ -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

deploy/kubernetes/provisioner.yaml

+0 −25
Original line number Diff line number Diff line
@@ -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

pkg/s3/config.go

+0 −1
Original line number Diff line number Diff line
@@ -7,5 +7,4 @@ type Config struct { 
	Region          string

	Endpoint        string

	Mounter         string

	EncryptionKey   string

}

pkg/s3/s3-client.go

+0 −1
Original line number Diff line number Diff line
@@ -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: "",

	})

test/secret.yaml

+0 −5
Original line number Diff line number Diff line
@@ -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