Merge branch 'master' into license

This commit is contained in:
Luis Pabón 2018-03-14 14:55:24 -04:00 committed by GitHub
commit 10273fdd70
2 changed files with 6 additions and 5 deletions

View File

@ -54,7 +54,7 @@ func NewDriver(nodeID, endpoint string) *driver {
// NFS plugin does not support ControllerServiceCapability now. // NFS plugin does not support ControllerServiceCapability now.
// If support is added, it should set to appropriate // If support is added, it should set to appropriate
// ControllerServiceCapability RPC types. // ControllerServiceCapability RPC types.
csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN}) csiDriver.AddControllerServiceCapabilities([]csi.ControllerServiceCapability_RPC_Type{csi.ControllerServiceCapability_RPC_UNKNOWN})
d.csiDriver = csiDriver d.csiDriver = csiDriver

View File

@ -4,16 +4,17 @@ metadata:
name: data-nfsplugin name: data-nfsplugin
labels: labels:
name: data-nfsplugin name: data-nfsplugin
annotations:
csi.volume.kubernetes.io/volume-attributes: '{"server": "10.10.10.10", "share": "share"}'
spec: spec:
accessModes: accessModes:
- ReadWriteOnce - ReadWriteMany
capacity: capacity:
storage: 100Gi storage: 100Gi
csi: csi:
driver: csi-nfsplugin driver: csi-nfsplugin
volumeHandle: data-id volumeHandle: data-id
volumeAttributes:
server: 127.0.0.1
share: /export
--- ---
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
@ -21,7 +22,7 @@ metadata:
name: data-nfsplugin name: data-nfsplugin
spec: spec:
accessModes: accessModes:
- ReadWriteOnce - ReadWriteMany
resources: resources:
requests: requests:
storage: 100Gi storage: 100Gi