From d61eab5ad389975895dfa8280acf795aa6cd0322 Mon Sep 17 00:00:00 2001
From: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com>
Date: Tue, 8 Aug 2023 14:53:10 +0530
Subject: [PATCH] PowerFlex v2.8.0 release (#250)

---
 charts/container-storage-modules/values.yaml |  4 ++++
 charts/csi-vxflexos/values.yaml              | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/charts/container-storage-modules/values.yaml b/charts/container-storage-modules/values.yaml
index 7e781adc..60fb9367 100644
--- a/charts/container-storage-modules/values.yaml
+++ b/charts/container-storage-modules/values.yaml
@@ -247,7 +247,11 @@ csi-isilon:
 ########################
 csi-vxflexos:
   enabled: false
+<<<<<<< HEAD
   version: v2.9.0
+=======
+  version: v2.8.0
+>>>>>>> c08e212 (PowerFlex v2.8.0 release (#250))
   images:
     driverRepository: dellemc
     powerflexSdc: dellemc/sdc:3.6.1
diff --git a/charts/csi-vxflexos/values.yaml b/charts/csi-vxflexos/values.yaml
index dd890f46..a0864aee 100644
--- a/charts/csi-vxflexos/values.yaml
+++ b/charts/csi-vxflexos/values.yaml
@@ -3,7 +3,11 @@
 
 # "version" is used to verify the values file matches driver version
 # Not recommend to change
+<<<<<<< HEAD
 version: v2.9.0
+=======
+version: v2.8.0
+>>>>>>> c08e212 (PowerFlex v2.8.0 release (#250))
 
 images:
   # "driver" defines the container image, used for the driver container.
@@ -38,6 +42,11 @@ kubeletConfigDir: /var/lib/kubelet
 # Default value: none
 defaultFsType: ext4
 
+# externalAccess: allows to specify additional entries for host to access NFS volumes. Both single IP address and subnet are valid entries.
+# Allowed Values: x.x.x.x/xx or x.x.x.x
+# Default Value: None
+externalAccess:
+
 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container.
 # Allowed values:
 #  Always: Always pull the image.
@@ -87,11 +96,18 @@ allowRWOMultiPodAccess: "false"
 #   None: volumes will be mounted with no modifications.
 fsGroupPolicy: File
 
+<<<<<<< HEAD
 # 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
 # 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))
 maxVxflexosVolumesPerNode: 0
 
 # "controller" allows to configure controller specific parameters