Skip to content

Commit

Permalink
Update driver manifest files
Browse files Browse the repository at this point in the history
1) rename controller daemon set name and node stateful set name. This
resolves name collision when deploying multiple csi driver.
2) remove secret from node ebs-plugin since it is not needed
3) update sample manifest files with better names
  • Loading branch information
Cheng Pan committed Jan 20, 2019
1 parent 4cdb503 commit 9cb9fa5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 24 deletions.
8 changes: 4 additions & 4 deletions deploy/kubernetes/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,15 +108,15 @@ roleRef:
kind: StatefulSet
apiVersion: apps/v1beta1
metadata:
name: csi-controller
name: ebs-controller
namespace: kube-system
spec:
serviceName: csi-controller
serviceName: ebs-controller
replicas: 1
template:
metadata:
labels:
app: csi-controller
app: ebs-controller
spec:
serviceAccount: csi-controller-sa
priorityClassName: system-cluster-critical
Expand Down Expand Up @@ -196,4 +196,4 @@ spec:
- name: registration-dir
hostPath:
path: /var/lib/kubelet/plugins_registry/
type: Directory
type: Directory
16 changes: 3 additions & 13 deletions deploy/kubernetes/node.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
kind: DaemonSet
apiVersion: apps/v1beta2
metadata:
name: csi-node
name: ebs-node
namespace: kube-system
spec:
selector:
matchLabels:
app: csi-node
app: ebs-node
template:
metadata:
labels:
app: csi-node
app: ebs-node
spec:
hostNetwork: true
priorityClassName: system-node-critical
Expand All @@ -30,16 +30,6 @@ spec:
env:
- name: CSI_ENDPOINT
value: unix:/csi/csi.sock
- name: AWS_ACCESS_KEY_ID
valueFrom:
secretKeyRef:
name: aws-secret
key: key_id
- name: AWS_SECRET_ACCESS_KEY
valueFrom:
secretKeyRef:
name: aws-secret
key: access_key
volumeMounts:
- name: kubelet-dir
mountPath: /var/lib/kubelet
Expand Down
4 changes: 2 additions & 2 deletions deploy/kubernetes/sample_app/claim.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: claim1
name: ebs-claim
spec:
accessModes:
- ReadWriteOnce
storageClassName: slow
storageClassName: ebs-sc
resources:
requests:
storage: 4Gi
2 changes: 1 addition & 1 deletion deploy/kubernetes/sample_app/pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ spec:
volumes:
- name: persistent-storage
persistentVolumeClaim:
claimName: claim1
claimName: ebs-claim
6 changes: 2 additions & 4 deletions deploy/kubernetes/sample_app/storageclass.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: slow
annotations:
storageclass.kubernetes.io/is-default-class: "true"
name: ebs-sc
provisioner: ebs.csi.aws.com
volumeBindingMode: WaitForFirstConsumer
volumeBindingMode: WaitForFirstConsumer

0 comments on commit 9cb9fa5

Please sign in to comment.