Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update driver name and topology key #105

Merged
merged 1 commit into from
Nov 15, 2018
Merged

Update driver name and topology key #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/kubernetes/v1.12+/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ spec:
- name: ADDRESS
value: /csi/csi.sock
- name: DRIVER_REG_SOCK_PATH
value: /var/lib/kubelet/plugins/com.amazon.aws.csi.ebs/csi.sock
value: /var/lib/kubelet/plugins/ebs.csi.aws.com/csi.sock
- name: KUBE_NODE_NAME
valueFrom:
fieldRef:
Expand Down Expand Up @@ -128,7 +128,7 @@ spec:
type: Directory
- name: plugin-dir
hostPath:
path: /var/lib/kubelet/plugins/com.amazon.aws.csi.ebs/
path: /var/lib/kubelet/plugins/ebs.csi.aws.com/
type: DirectoryOrCreate
- name: registration-dir
hostPath:
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/v1.12+/provisioner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
allowPrivilegeEscalation: true
image: quay.io/k8scsi/csi-provisioner:v0.4.1
args:
- --provisioner=com.amazon.aws.csi.ebs
- --provisioner=ebs.csi.aws.com
- --csi-address=$(ADDRESS)
- --v=5
- --feature-gates=Topology=true
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/v1.12+/sample_app/storageclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: slow
annotations:
storageclass.kubernetes.io/is-default-class: "true"
provisioner: com.amazon.aws.csi.ebs
provisioner: ebs.csi.aws.com
2 changes: 1 addition & 1 deletion deploy/kubernetes/v1.[10,11]/node.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ spec:
type: Directory
- name: plugin-dir
hostPath:
path: /var/lib/kubelet/plugins/com.amazon.aws.csi.ebs/
path: /var/lib/kubelet/plugins/ebs.csi.aws.com/
type: DirectoryOrCreate
- name: device-dir
hostPath:
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/v1.[10,11]/provisioner.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ spec:
allowPrivilegeEscalation: true
image: quay.io/k8scsi/csi-provisioner:v0.4.1
args:
- --provisioner=com.amazon.aws.csi.ebs
- --provisioner=ebs.csi.aws.com
- --csi-address=$(ADDRESS)
- --v=5
env:
Expand Down
2 changes: 1 addition & 1 deletion deploy/kubernetes/v1.[10,11]/sample_app/storageclass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ metadata:
name: slow
annotations:
storageclass.kubernetes.io/is-default-class: "true"
provisioner: com.amazon.aws.csi.ebs
provisioner: ebs.csi.aws.com
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ There are several optional parameters that could be passed into `CreateVolumeReq
| "kmsKeyId" | | | The full ARN of the key to use when encrypting the volume. When not specified, the default KMS key is used |

### Topology
`com.amazon.aws.csi.ebs/zone` is the only topology key that represents the availability zone of which a volume is accessible.
`topology.ebs.csi.aws.com/zone` is the only topology key that represents the availability zone of which a volume is accessible.

To enable topology support on kuberetes, make sure `CSINodeInfo` and `CSIDriverRegistry` feature flags are enabled on both kubelet and kube-apiserver and `CSINodeInfo` CRD is installed on the cluster using:

Expand Down
4 changes: 2 additions & 2 deletions pkg/driver/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
)

const (
driverName = "com.amazon.aws.csi.ebs"
topologyKey = driverName + "/zone"
driverName = "ebs.csi.aws.com"
topologyKey = "topology." + driverName + "/zone"
)

var (
Expand Down