Unverified Commit 29c10b94 authored by Cyrill Troxler's avatar Cyrill Troxler Committed by GitHub
Browse files

Merge pull request #19 from ctrox/cleanup 

Clean up old references to encryptionKey and fix up deployment
parents b59a7f21 a0902d86

deploy/kubernetes/attacher.yaml

+3 −1
Original line number Diff line number Diff line 
---

apiVersion: v1

kind: ServiceAccount

metadata:

  name: csi-attacher-sa

  namespace: kube-system

---

kind: ClusterRole

apiVersion: rbac.authorization.k8s.io/v1
@@ -43,6 +43,7 @@ kind: Service 
apiVersion: v1

metadata:

  name: csi-attacher-s3

  namespace: kube-system

  labels:

    app: csi-attacher-s3

spec:
@@ -56,6 +57,7 @@ kind: StatefulSet 
apiVersion: apps/v1beta1

metadata:

  name: csi-attacher-s3

  namespace: kube-system

spec:

  serviceName: "csi-attacher-s3"

  replicas: 1

deploy/kubernetes/csi-s3.yaml

+2 −26
Original line number Diff line number Diff line 
---

apiVersion: v1

kind: ServiceAccount

metadata:

  name: csi-s3

  namespace: kube-system

---

kind: ClusterRole

apiVersion: rbac.authorization.k8s.io/v1
@@ -42,6 +42,7 @@ kind: DaemonSet 
apiVersion: apps/v1beta2

metadata:

  name: csi-s3

  namespace: kube-system

spec:

  selector:

    matchLabels:
@@ -92,31 +93,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

+3 −26
Original line number Diff line number Diff line 
---

apiVersion: v1

kind: ServiceAccount

metadata:

  name: csi-provisioner-sa

  namespace: kube-system

---

kind: ClusterRole

apiVersion: rbac.authorization.k8s.io/v1
@@ -42,6 +42,7 @@ kind: Service 
apiVersion: v1

metadata:

  name: csi-provisioner-s3

  namespace: kube-system

  labels:

    app: csi-provisioner-s3

spec:
@@ -55,6 +56,7 @@ kind: StatefulSet 
apiVersion: apps/v1beta1

metadata:

  name: csi-provisioner-s3

  namespace: kube-system

spec:

  serviceName: "csi-provisioner-s3"

  replicas: 1
@@ -91,31 +93,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

}