From 73bd0ce8d4a65a1d8b5d6b334ebb411cfc9dba59 Mon Sep 17 00:00:00 2001
From: Rajshree Khare <69839943+khareRajshree@users.noreply.github.com>
Date: Mon, 4 Sep 2023 19:14:14 +0530
Subject: [PATCH] NFS ACL parameter removed (#289)

---
 charts/csi-vxflexos/values.yaml | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/charts/csi-vxflexos/values.yaml b/charts/csi-vxflexos/values.yaml
index 407bc129..dd890f46 100644
--- a/charts/csi-vxflexos/values.yaml
+++ b/charts/csi-vxflexos/values.yaml
@@ -46,24 +46,6 @@ defaultFsType: ext4
 # Default value: None
 imagePullPolicy: IfNotPresent
 
-<<<<<<< HEAD
-=======
-# nfsAcls: enables setting permissions on NFS mount directory
-# This value acts as default value for NFS ACL (nfsAcls), if not specified for an array config in secret
-# 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, separated by comma
-#      Examples: "A::OWNER@:RWX,A::GROUP@:RWX", "A::OWNER@:rxtncy"
-# Optional: true
-# Default value: "0777"
-nfsAcls: "0777"
-
->>>>>>> b9b7e1f (minor typo fixed (#258))
 # enableQuota: a boolean that, when enabled, will set quota limit for a newly provisioned NFS volume.
 # Allowed values:
 #   true: set quota for volume
@@ -105,25 +87,11 @@ allowRWOMultiPodAccess: "false"
 #   None: volumes will be mounted with no modifications.
 fsGroupPolicy: File
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 56df1f9 (PowerFlex  SDC  updated (#251))
 # maxVxflexosVolumesPerNode: Specify default value for maximum number of volumes that controller can publish to the node.
 # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node.
 # This limit is applicable to all the nodes in the cluster for which node label 'maxVxflexosVolumesPerNode' is not set.
 # Allowed values: n, where n >= 0
-<<<<<<< HEAD
-# Default value: 0
-=======
-# maxVxflexosVolumesPerNode - Maximum number of volumes that controller can publish to the node.
-# Allowed values: integer
-# Default value: 0
-# Examples : 0 , 1
->>>>>>> c08e212 (PowerFlex v2.8.0 release (#250))
-=======
 # Default value: 0
->>>>>>> 56df1f9 (PowerFlex  SDC  updated (#251))
 maxVxflexosVolumesPerNode: 0
 
 # "controller" allows to configure controller specific parameters