conflict resolved

charts/openebs/Chart.yaml

@@ -1,7 +1,11 @@
 apiVersion: v2
+<<<<<<< HEAD
 version: 3.1.1
+=======
+version: 3.1.0
+>>>>>>> 5df6763e87283308cec4b147b4e5375735801364
 name: openebs
-appVersion: 3.0.1
+appVersion: 3.1.0
 description: Containerized Attached Storage for Kubernetes
 icon: https://raw.githubusercontent.com/cncf/artwork/HEAD/projects/openebs/icon/color/openebs-icon-color.png
 home: http://www.openebs.io/
@@ -24,30 +28,30 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: openebs-ndm
-    version: "1.7.1"
+    version: "1.8.0"
     repository: "https://openebs.github.io/node-disk-manager"
     condition: openebs-ndm.enabled
   - name: localpv-provisioner
-    version: "3.0.1"
+    version: "3.1.0"
     repository: "https://openebs.github.io/dynamic-localpv-provisioner"
     condition: localpv-provisioner.enabled
   - name: cstor
-    version: "3.0.1"
+    version: "3.1.0"
     repository: "https://openebs.github.io/cstor-operators"
     condition: cstor.enabled
   - name: jiva
-    version: "3.0.1"
+    version: "3.1.0"
     repository: "https://openebs.github.io/jiva-operator"
     condition: jiva.enabled
   - name: zfs-localpv
-    version: "1.9.8"
+    version: "2.0.0"
     repository: "https://openebs.github.io/zfs-localpv"
     condition: zfs-localpv.enabled
   - name: lvm-localpv
-    version: "0.8.5"
+    version: "0.8.6"
     repository: "https://openebs.github.io/lvm-localpv"
     condition: lvm-localpv.enabled
   - name: nfs-provisioner
-    version: "0.7.1"
+    version: "0.9.0"
     repository: "https://openebs.github.io/dynamic-nfs-provisioner"
     condition: nfs-provisioner.enabled

charts/openebs/README.md

@@ -109,10 +109,15 @@ The following table lists the common configurable parameters of the OpenEBS char
 | `cstor.volumeMgmt.image`                | Image for cStor Volume  Management            | `openebs/cstor-volume-mgmt`               |
 | `cstor.volumeMgmt.imageTag`             | Image Tag for cStor Volume Management         | `2.12.2`                                  |
 | `defaultStorageConfig.enabled`          | Enable default storage class installation     | `true`                                    |
+| `featureGates.enabled`                  | Enable feature gates                          | `true`                                    |
+| `featureGates.GPTBasedUUID.enabled`     | Enable feature gate : GPTBasedUUID            | `true`                                    |
+| `featureGates.APIService.enabled`       | Enable feature gate : APIService              | `false`                                   |
+| `featureGates.UseOSDisk.enabled`        | Enable feature gate : UseOSDisk               | `false`                                   |
+| `featureGates.ChangeDetection.enabled`  | Enable feature gate : ChangeDetection         | `false`                                   |
 | `healthCheck.initialDelaySeconds`       | Delay before liveness probe is initiated      | `30`                                      |
 | `healthCheck.periodSeconds`             | How often to perform the liveness probe       | `60`                                      |
 | `helper.image`                          | Image for helper                              | `openebs/linux-utils`                     |
-| `helper.imageTag`                       | Image Tag for helper                          | `3.0.0`                                  |
+| `helper.imageTag`                       | Image Tag for helper                          | `3.1.0`                                   |
 | `image.pullPolicy`                      | Container pull policy                         | `IfNotPresent`                            |
 | `image.repository`                      | Specify which docker registry to use          | `""`                                      |
 | `jiva.defaultStoragePath`               | hostpath used by default Jiva StorageClass    | `/var/openebs`                            |
@@ -122,7 +127,7 @@ The following table lists the common configurable parameters of the OpenEBS char
 | `localprovisioner.basePath`             | BasePath for hostPath volumes on Nodes        | `/var/openebs/local`                      |
 | `localprovisioner.enabled`              | Enable localProvisioner                       | `true`                                    |
 | `localprovisioner.image`                | Image for localProvisioner                    | `openebs/provisioner-localpv`             |
-| `localprovisioner.imageTag`             | Image Tag for localProvisioner                | `3.0.0`                                  |
+| `localprovisioner.imageTag`             | Image Tag for localProvisioner                | `3.1.0`                                   |
 | `ndm.enabled`                           | Enable Node Disk Manager                      | `true`                                    |
 | `ndm.filters.enableOsDiskExcludeFilter` | Enable filters of OS disk exclude             | `true`                                    |
 | `ndm.filters.enablePathFilter`          | Enable filters of paths                       | `true`                                    |
@@ -132,10 +137,10 @@ The following table lists the common configurable parameters of the OpenEBS char
 | `ndm.filters.includePaths`              | Include devices with specified path patterns  | `""`                                      |
 | `ndm.filters.osDiskExcludePaths`        | Paths/Mounts to be excluded by OS Disk Filter | `/,/etc/hosts,/boot`                      |
 | `ndm.image`                             | Image for Node Disk Manager                   | `openebs/node-disk-manager`               |
-| `ndm.imageTag`                          | Image Tag for Node Disk Manager               | `1.7.0`                                   |
+| `ndm.imageTag`                          | Image Tag for Node Disk Manager               | `1.8.0`                                   |
 | `ndmOperator.enabled`                   | Enable NDM Operator                           | `true`                                    |
 | `ndmOperator.image`                     | Image for NDM Operator                        | `openebs/node-disk-operator`              |
-| `ndmOperator.imageTag`                  | Image Tag for NDM Operator                    | `1.7.0`                                   |
+| `ndmOperator.imageTag`                  | Image Tag for NDM Operator                    | `1.8.0`                                   |
 | `ndm.probes.enableSeachest`             | Enable Seachest probe for NDM                 | `false`                                   |
 | `policies.monitoring.image`             | Image for Prometheus Exporter                 | `openebs/m-exporter`                      |
 | `policies.monitoring.imageTag`          | Image Tag for Prometheus Exporter             | `2.12.2`                                  |
@@ -165,4 +170,3 @@ helm install --name `my-release` -f values.yaml --namespace openebs openebs/open
 ```
 
 > **Tip**: You can use the default [values.yaml](values.yaml)
-

charts/openebs/templates/NOTES.txt

@@ -28,6 +28,26 @@ helm upgrade {{ .Release.Name }} openebs/openebs \
 	--reuse-values
 
 For more information, 
-- view the online documentation at https://openebs.io/ or
+- view the online documentation at https://openebs.io/docs or
 - connect with an active community on Kubernetes slack #openebs channel.
+{{- /*
+The section below can be removed once enableDeviceClass and enableHostpathClass
+options are removed.
+*/}}
+{{ if or (eq .Values.localprovisioner.enableHostpathClass false) (eq .Values.localprovisioner.enableDeviceClass false) }}
+
+DEPRECATION NOTICE:
+-------------------
+The options 'enableHostpathClass' and 'enableDeviceClass' are deprecated and
+will be removed in future releases.
+
+Please use the options hostpathClass.enabled and deviceClass.enabled instead.
+
+Example:
+
+helm install {{ .Release.Name }} openebs/openebs \
+	--namespace {{ .Release.Namespace }} \
+	--set localprovisioner.deviceClass.enabled="false"
+
+{{ end }}
 

charts/openebs/templates/legacy/deployment-maya-apiserver.yaml

@@ -158,9 +158,9 @@ spec:
         livenessProbe:
           exec:
             command:
-            - /usr/local/bin/mayactl
-            - -m $MY_POD_IP
-            - version
+            - /bin/sh
+            - -c
+            - /usr/local/bin/mayactl -m $MY_POD_IP version
           initialDelaySeconds: {{ .Values.apiserver.healthCheck.initialDelaySeconds }}
           periodSeconds: {{ .Values.apiserver.healthCheck.periodSeconds }}
 {{- if .Values.apiserver.nodeSelector }}

charts/openebs/templates/localprovisioner/deployment-local-provisioner.yaml

@@ -58,10 +58,10 @@ spec:
         # This is supported for openebs provisioner version 0.5.2 onwards
         #- name: OPENEBS_IO_KUBE_CONFIG
         #  value: "/home/ubuntu/.kube/config"
-        #  This sets the number of times the provisioner should try
-        #  with a polling interval of 5 seconds, to get the Blockdevice
-        #  Name from a BlockDeviceClaim, before the BlockDeviceClaim
-        #  is deleted. E.g. 12 * 5 seconds = 60 seconds timeout
+        # This sets the number of times the provisioner should try
+        # with a polling interval of 5 seconds, to get the Blockdevice
+        # Name from a BlockDeviceClaim, before the BlockDeviceClaim
+        # is deleted. E.g. 12 * 5 seconds = 60 seconds timeout
         - name: BDC_BD_BIND_RETRIES
           value: "{{ .Values.localprovisioner.waitForBDBindTimeoutRetryCount }}"
         # OPENEBS_NAMESPACE is the namespace that this provisioner will

charts/openebs/templates/localprovisioner/device-class.yaml

@@ -1,19 +1,38 @@
 {{- if .Values.localprovisioner.enabled }}
 {{- $localpvprovisionerValues := index .Values "localpv-provisioner" }}
 {{- if not $localpvprovisionerValues.enabled }}
-{{- if .Values.localprovisioner.enableDeviceClass }}
+# The second operand in the AND operation can be removed
+# when enableDeviceClass is deprecated.
+{{- if and .Values.localprovisioner.deviceClass.enabled .Values.localprovisioner.enableDeviceClass }}
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: openebs-device
+  name: {{ .Values.localprovisioner.deviceClass.name }}
   annotations:
     openebs.io/cas-type: local
     cas.openebs.io/config: |
       - name: StorageType
         value: "device"
+{{- if .Values.localprovisioner.deviceClass.fsType }}
+      - name: FSType
+        value: {{ .Values.localprovisioner.deviceClass.fsType | quote }}
+{{- end }}
+{{- if .Values.localprovisioner.deviceClass.blockDeviceSelectors }}
+      - name: BlockDeviceSelectors
+        data:
+{{ toYaml .Values.localprovisioner.deviceClass.blockDeviceSelectors | indent 10 }}
+{{- end }}
+{{- if .Values.localprovisioner.deviceClass.nodeAffinityLabels }}
+      - name: NodeAffinityLabels
+        list:
+{{ toYaml .Values.localprovisioner.deviceClass.nodeAffinityLabels | indent 10 }}
+{{- end }}
+{{- if .Values.localprovisioner.deviceClass.isDefaultClass }}
+    storageclass.kubernetes.io/is-default-class: "true"
+{{- end }}
 provisioner: openebs.io/local
 volumeBindingMode: WaitForFirstConsumer
-reclaimPolicy: Delete
+reclaimPolicy: {{ .Values.localprovisioner.deviceClass.reclaimPolicy }}
 {{- end }}
 {{- end }}
 {{- end }}

charts/openebs/templates/localprovisioner/hostpath-class.yaml

@@ -1,23 +1,33 @@
 {{- if .Values.localprovisioner.enabled }}
 {{- $localpvprovisionerValues := index .Values "localpv-provisioner" }}
 {{- if not $localpvprovisionerValues.enabled }}
-{{- if .Values.localprovisioner.enableHostpathClass }}
+# The second operand in the AND operation can be removed
+# when enableHostpathClass is deprecated.
+{{- if and .Values.localprovisioner.hostpathClass.enabled .Values.localprovisioner.enableHostpathClass }}
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: openebs-hostpath
+  name: {{ .Values.localprovisioner.hostpathClass.name }}
   annotations:
     openebs.io/cas-type: local
     cas.openebs.io/config: |
       - name: StorageType
         value: "hostpath"
-{{- if .Values.localprovisioner.basePath }}
+{{- if or .Values.localprovisioner.basePath .Values.localprovisioner.hostpathClass.basePath }}
       - name: BasePath
-        value: "{{ .Values.localprovisioner.basePath }}"
+        value: {{ .Values.localprovisioner.hostpathClass.basePath | default .Values.localprovisioner.basePath | quote }}
+{{- end }}
+{{- if .Values.localprovisioner.hostpathClass.nodeAffinityLabels }}
+      - name: NodeAffinityLabels
+        list:
+{{ toYaml .Values.localprovisioner.hostpathClass.nodeAffinityLabels | indent 10 }}
+{{- end }}
+{{- if .Values.localprovisioner.hostpathClass.isDefaultClass }}
+    storageclass.kubernetes.io/is-default-class: "true"
 {{- end }}
 provisioner: openebs.io/local
 volumeBindingMode: WaitForFirstConsumer
-reclaimPolicy: Delete
+reclaimPolicy: {{ .Values.localprovisioner.hostpathClass.reclaimPolicy }}
 {{- end }}
 {{- end }}
 {{- end }}

charts/openebs/templates/ndm/daemonset-ndm.yaml

@@ -63,6 +63,9 @@ spec:
 {{- if .Values.featureGates.ChangeDetection.enabled }}
           - --feature-gates={{ .Values.featureGates.ChangeDetection.featureGateFlag }}
 {{- end}}
+{{- if .Values.featureGates.PartitionTableUUID.enabled }}
+          - --feature-gates={{ .Values.featureGates.PartitionTableUUID.featureGateFlag }}
+{{- end}}
 {{- end}}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
 {{- if .Values.ndm.resources }}