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

POSIX and NFSv4 ACL support #21

Merged
merged 3 commits into from
Feb 24, 2022
Merged

POSIX and NFSv4 ACL support #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b13cc14
POSIX and NFSv4 ACL support
spriya-m Feb 24, 2022
5568a3a
Fixing unit tests
spriya-m Feb 24, 2022
4a30c8e
Fixing unit tests
spriya-m Feb 24, 2022
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
19 changes: 19 additions & 0 deletions config/samples/storage_v1_csipowerstore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,25 @@ spec:
value: "csi"
- name: X_CSI_FC_PORTS_FILTER_FILE_PATH
value: "/etc/fc-ports-filter"
controller:
envs:
# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"
node:
envs:
# Set to "true" to enable ISCSI CHAP Authentication
Expand Down
8 changes: 8 additions & 0 deletions driverconfig/powerstore_v220_v121.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@
"SetForNode": true,
"DefaultValueForController": "false",
"DefaultValueForNode": "false"
},
{
"Name": "X_CSI_NFS_ACLS",
"CSIEnvType": "String",
"SetForController": true,
"SetForNode": false,
"DefaultValueForController": "0777",
"DefaultValueForNode": ""
}
],
"driverNodeVolumes": [
Expand Down
8 changes: 8 additions & 0 deletions driverconfig/powerstore_v220_v122.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@
"SetForNode": true,
"DefaultValueForController": "false",
"DefaultValueForNode": "false"
},
{
"Name": "X_CSI_NFS_ACLS",
"CSIEnvType": "String",
"SetForController": true,
"SetForNode": false,
"DefaultValueForController": "0777",
"DefaultValueForNode": ""
}
],
"driverNodeVolumes": [
Expand Down
8 changes: 8 additions & 0 deletions driverconfig/powerstore_v220_v123.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@
"SetForNode": true,
"DefaultValueForController": "false",
"DefaultValueForNode": "false"
},
{
"Name": "X_CSI_NFS_ACLS",
"CSIEnvType": "String",
"SetForController": true,
"SetForNode": false,
"DefaultValueForController": "0777",
"DefaultValueForNode": ""
}
],
"driverNodeVolumes": [
Expand Down
18 changes: 18 additions & 0 deletions samples/powerstore_v220_k8s_121.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,24 @@ spec:
# Default value: false
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"

# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
Expand Down
18 changes: 18 additions & 0 deletions samples/powerstore_v220_k8s_122.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,24 @@ spec:
# Default value: false
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"

# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
Expand Down
19 changes: 19 additions & 0 deletions samples/powerstore_v220_k8s_123.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@ spec:
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"

# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"


# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
Expand Down
21 changes: 20 additions & 1 deletion samples/powerstore_v220_ops_48.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,26 @@ spec:
value: "csi"
- name: X_CSI_FC_PORTS_FILTER_FILE_PATH
value: "/etc/fc-ports-filter"
controller:
controller:
envs:
# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"

# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
Expand Down
21 changes: 20 additions & 1 deletion samples/powerstore_v220_ops_49.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,26 @@ spec:
value: "csi"
- name: X_CSI_FC_PORTS_FILTER_FILE_PATH
value: "/etc/fc-ports-filter"
controller:
controller:
envs:
# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"

# nodeSelector: Define node selection constraints for controller pods.
# For the pod to be eligible to run on a node, the node must have each
# of the indicated key-value pairs as labels.
Expand Down
19 changes: 19 additions & 0 deletions test/testdata/csipowerstore/01-simple-deployment/in-csipowerstore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,25 @@ spec:
sideCars:
- name: external-health-monitor
args: ["--monitor-interval=60s"]
controller:
envs:
# X_CSI_NFS_ACLS: enables setting permissions on NFS mount directory
# This value will be the default value if a storage class and array config in secret
# do not contain the NFS ACL (nfsAcls) parameter specified
# Permissions can be specified in two formats:
# 1) Unix mode (NFSv3)
# 2) NFSv4 ACLs (NFSv4)
# NFSv4 ACLs are supported on NFSv4 share only.
# Allowed values:
# 1) Unix mode: valid octal mode number
# Examples: "0777", "777", "0755"
# 2) NFSv4 acls: valid NFSv4 acls, seperated by comma
# Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
# Optional: true
# Default value: "0777"
# nfsAcls: "0777"
- name: X_CSI_NFS_ACLS
value: "0777"
node:
envs:
# Set to "true" to enable ISCSI CHAP Authentication
Expand Down
4 changes: 4 additions & 0 deletions test/testdata/csipowerstore/01-simple-deployment/out-csipowerstore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ spec:
image: dellemc/csi-powerstore:v2.2.0
imagePullPolicy: IfNotPresent
configVersion: v2.2.0
controller:
envs:
- name: X_CSI_NFS_ACLS
value: "0777"
node:
envs:
- name: "X_CSI_POWERSTORE_ENABLE_CHAP"
Expand Down
2 changes: 2 additions & 0 deletions test/testdata/csipowerstore/01-simple-deployment/out-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ spec:
value: /powerstore-config-params/driver-config-params.yaml
- name: X_CSI_HEALTH_MONITOR_ENABLED
value: "false"
- name: X_CSI_NFS_ACLS
value: "0777"
- name: X_CSI_POWERSTORE_NODE_NAME_PREFIX
value: csi
- name: X_CSI_FC_PORTS_FILTER_FILE_PATH
Expand Down