Skip to content
This repository was archived by the owner on May 8, 2024. It is now read-only.

Commit 5df6763

Browse files
niladrihniladrih
authored
release(helm-chart): changes for OpenEBS v3.1.0 helm chart (#299)
* release(helm-chart): changes for OpenEBS v3.1.0 helm chart Signed-off-by: Niladri Halder <[email protected]> * add NDM PartitionTableUUID changes Signed-off-by: Niladri Halder <[email protected]> * Fix typo remove-->removed Signed-off-by: Niladri Halder <[email protected]> * Fix typo OR-->AND Signed-off-by: Niladri Halder <[email protected]> * simplify deviceClass/hostpathClass enable/disable template logic Signed-off-by: Niladri Halder <[email protected]> * Update README.md default image version values Signed-off-by: Niladri Halder <[email protected]> * Fix localpvprovisioner file comment indentation Signed-off-by: Niladri Halder <[email protected]> * Link reclaimPolicy and name parameters to templates for LocalPV storageClasses Signed-off-by: Niladri Halder <[email protected]> * Remove 3 trailing space characters Signed-off-by: Niladri Halder <[email protected]> * Remove 1 trailing space character Signed-off-by: Niladri Halder <[email protected]>
1 parent 3183937 commit 5df6763

File tree

8 files changed

+183
-56
lines changed

8 files changed

+183
-56
lines changed

‎charts/openebs/Chart.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
2-
version: 3.0.6
2+
version: 3.1.0
33
name: openebs
4-
appVersion: 3.0.1
4+
appVersion: 3.1.0
55
description: Containerized Attached Storage for Kubernetes
66
icon: https://raw.githubusercontent.com/cncf/artwork/HEAD/projects/openebs/icon/color/openebs-icon-color.png
77
home: http://www.openebs.io/
@@ -24,30 +24,30 @@ maintainers:
2424
email: [email protected]
2525
dependencies:
2626
- name: openebs-ndm
27-
version: "1.7.1"
27+
version: "1.8.0"
2828
repository: "https://openebs.github.io/node-disk-manager"
2929
condition: openebs-ndm.enabled
3030
- name: localpv-provisioner
31-
version: "3.0.1"
31+
version: "3.1.0"
3232
repository: "https://openebs.github.io/dynamic-localpv-provisioner"
3333
condition: localpv-provisioner.enabled
3434
- name: cstor
35-
version: "3.0.2"
35+
version: "3.1.0"
3636
repository: "https://openebs.github.io/cstor-operators"
3737
condition: cstor.enabled
3838
- name: jiva
39-
version: "3.0.5"
39+
version: "3.1.0"
4040
repository: "https://openebs.github.io/jiva-operator"
4141
condition: jiva.enabled
4242
- name: zfs-localpv
43-
version: "1.9.8"
43+
version: "2.0.0"
4444
repository: "https://openebs.github.io/zfs-localpv"
4545
condition: zfs-localpv.enabled
4646
- name: lvm-localpv
47-
version: "0.8.5"
47+
version: "0.8.6"
4848
repository: "https://openebs.github.io/lvm-localpv"
4949
condition: lvm-localpv.enabled
5050
- name: nfs-provisioner
51-
version: "0.8.0"
51+
version: "0.9.0"
5252
repository: "https://openebs.github.io/dynamic-nfs-provisioner"
5353
condition: nfs-provisioner.enabled

‎charts/openebs/README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ The following table lists the common configurable parameters of the OpenEBS char
117117
| `healthCheck.initialDelaySeconds` | Delay before liveness probe is initiated | `30` |
118118
| `healthCheck.periodSeconds` | How often to perform the liveness probe | `60` |
119119
| `helper.image` | Image for helper | `openebs/linux-utils` |
120-
| `helper.imageTag` | Image Tag for helper | `3.0.0` |
120+
| `helper.imageTag` | Image Tag for helper | `3.1.0` |
121121
| `image.pullPolicy` | Container pull policy | `IfNotPresent` |
122122
| `image.repository` | Specify which docker registry to use | `""` |
123123
| `jiva.defaultStoragePath` | hostpath used by default Jiva StorageClass | `/var/openebs` |
@@ -127,7 +127,7 @@ The following table lists the common configurable parameters of the OpenEBS char
127127
| `localprovisioner.basePath` | BasePath for hostPath volumes on Nodes | `/var/openebs/local` |
128128
| `localprovisioner.enabled` | Enable localProvisioner | `true` |
129129
| `localprovisioner.image` | Image for localProvisioner | `openebs/provisioner-localpv` |
130-
| `localprovisioner.imageTag` | Image Tag for localProvisioner | `3.0.0` |
130+
| `localprovisioner.imageTag` | Image Tag for localProvisioner | `3.1.0` |
131131
| `ndm.enabled` | Enable Node Disk Manager | `true` |
132132
| `ndm.filters.enableOsDiskExcludeFilter` | Enable filters of OS disk exclude | `true` |
133133
| `ndm.filters.enablePathFilter` | Enable filters of paths | `true` |
@@ -137,10 +137,10 @@ The following table lists the common configurable parameters of the OpenEBS char
137137
| `ndm.filters.includePaths` | Include devices with specified path patterns | `""` |
138138
| `ndm.filters.osDiskExcludePaths` | Paths/Mounts to be excluded by OS Disk Filter | `/,/etc/hosts,/boot` |
139139
| `ndm.image` | Image for Node Disk Manager | `openebs/node-disk-manager` |
140-
| `ndm.imageTag` | Image Tag for Node Disk Manager | `1.7.0` |
140+
| `ndm.imageTag` | Image Tag for Node Disk Manager | `1.8.0` |
141141
| `ndmOperator.enabled` | Enable NDM Operator | `true` |
142142
| `ndmOperator.image` | Image for NDM Operator | `openebs/node-disk-operator` |
143-
| `ndmOperator.imageTag` | Image Tag for NDM Operator | `1.7.0` |
143+
| `ndmOperator.imageTag` | Image Tag for NDM Operator | `1.8.0` |
144144
| `ndm.probes.enableSeachest` | Enable Seachest probe for NDM | `false` |
145145
| `policies.monitoring.image` | Image for Prometheus Exporter | `openebs/m-exporter` |
146146
| `policies.monitoring.imageTag` | Image Tag for Prometheus Exporter | `2.12.2` |
@@ -170,4 +170,3 @@ helm install --name `my-release` -f values.yaml --namespace openebs openebs/open
170170
```
171171

172172
> **Tip**: You can use the default [values.yaml](values.yaml)
173-

‎charts/openebs/templates/NOTES.txt‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,26 @@ helm upgrade {{ .Release.Name }} openebs/openebs \
2828
--reuse-values
2929

3030
For more information,
31-
- view the online documentation at https://openebs.io/ or
31+
- view the online documentation at https://openebs.io/docs or
3232
- connect with an active community on Kubernetes slack #openebs channel.
33+
{{- /*
34+
The section below can be removed once enableDeviceClass and enableHostpathClass
35+
options are removed.
36+
*/}}
37+
{{ if or (eq .Values.localprovisioner.enableHostpathClass false) (eq .Values.localprovisioner.enableDeviceClass false) }}
38+
39+
DEPRECATION NOTICE:
40+
-------------------
41+
The options 'enableHostpathClass' and 'enableDeviceClass' are deprecated and
42+
will be removed in future releases.
43+
44+
Please use the options hostpathClass.enabled and deviceClass.enabled instead.
45+
46+
Example:
47+
48+
helm install {{ .Release.Name }} openebs/openebs \
49+
--namespace {{ .Release.Namespace }} \
50+
--set localprovisioner.deviceClass.enabled="false"
51+
52+
{{ end }}
3353

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ spec:
5858
# This is supported for openebs provisioner version 0.5.2 onwards
5959
#- name: OPENEBS_IO_KUBE_CONFIG
6060
# value: "/home/ubuntu/.kube/config"
61-
# This sets the number of times the provisioner should try
62-
# with a polling interval of 5 seconds, to get the Blockdevice
63-
# Name from a BlockDeviceClaim, before the BlockDeviceClaim
64-
# is deleted. E.g. 12 * 5 seconds = 60 seconds timeout
61+
# This sets the number of times the provisioner should try
62+
# with a polling interval of 5 seconds, to get the Blockdevice
63+
# Name from a BlockDeviceClaim, before the BlockDeviceClaim
64+
# is deleted. E.g. 12 * 5 seconds = 60 seconds timeout
6565
- name: BDC_BD_BIND_RETRIES
6666
value: "{{ .Values.localprovisioner.waitForBDBindTimeoutRetryCount }}"
6767
# OPENEBS_NAMESPACE is the namespace that this provisioner will

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

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,38 @@
11
{{- if .Values.localprovisioner.enabled }}
22
{{- $localpvprovisionerValues := index .Values "localpv-provisioner" }}
33
{{- if not $localpvprovisionerValues.enabled }}
4-
{{- if .Values.localprovisioner.enableDeviceClass }}
4+
# The second operand in the AND operation can be removed
5+
# when enableDeviceClass is deprecated.
6+
{{- if and .Values.localprovisioner.deviceClass.enabled .Values.localprovisioner.enableDeviceClass }}
57
apiVersion: storage.k8s.io/v1
68
kind: StorageClass
79
metadata:
8-
name: openebs-device
10+
name: {{ .Values.localprovisioner.deviceClass.name }}
911
annotations:
1012
openebs.io/cas-type: local
1113
cas.openebs.io/config: |
1214
- name: StorageType
1315
value: "device"
16+
{{- if .Values.localprovisioner.deviceClass.fsType }}
17+
- name: FSType
18+
value: {{ .Values.localprovisioner.deviceClass.fsType | quote }}
19+
{{- end }}
20+
{{- if .Values.localprovisioner.deviceClass.blockDeviceSelectors }}
21+
- name: BlockDeviceSelectors
22+
data:
23+
{{ toYaml .Values.localprovisioner.deviceClass.blockDeviceSelectors | indent 10 }}
24+
{{- end }}
25+
{{- if .Values.localprovisioner.deviceClass.nodeAffinityLabels }}
26+
- name: NodeAffinityLabels
27+
list:
28+
{{ toYaml .Values.localprovisioner.deviceClass.nodeAffinityLabels | indent 10 }}
29+
{{- end }}
30+
{{- if .Values.localprovisioner.deviceClass.isDefaultClass }}
31+
storageclass.kubernetes.io/is-default-class: "true"
32+
{{- end }}
1433
provisioner: openebs.io/local
1534
volumeBindingMode: WaitForFirstConsumer
16-
reclaimPolicy: Delete
35+
reclaimPolicy: {{ .Values.localprovisioner.deviceClass.reclaimPolicy }}
1736
{{- end }}
1837
{{- end }}
1938
{{- end }}

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,33 @@
11
{{- if .Values.localprovisioner.enabled }}
22
{{- $localpvprovisionerValues := index .Values "localpv-provisioner" }}
33
{{- if not $localpvprovisionerValues.enabled }}
4-
{{- if .Values.localprovisioner.enableHostpathClass }}
4+
# The second operand in the AND operation can be removed
5+
# when enableHostpathClass is deprecated.
6+
{{- if and .Values.localprovisioner.hostpathClass.enabled .Values.localprovisioner.enableHostpathClass }}
57
apiVersion: storage.k8s.io/v1
68
kind: StorageClass
79
metadata:
8-
name: openebs-hostpath
10+
name: {{ .Values.localprovisioner.hostpathClass.name }}
911
annotations:
1012
openebs.io/cas-type: local
1113
cas.openebs.io/config: |
1214
- name: StorageType
1315
value: "hostpath"
14-
{{- if .Values.localprovisioner.basePath }}
16+
{{- if or .Values.localprovisioner.basePath .Values.localprovisioner.hostpathClass.basePath }}
1517
- name: BasePath
16-
value: "{{ .Values.localprovisioner.basePath }}"
18+
value: {{ .Values.localprovisioner.hostpathClass.basePath | default .Values.localprovisioner.basePath | quote }}
19+
{{- end }}
20+
{{- if .Values.localprovisioner.hostpathClass.nodeAffinityLabels }}
21+
- name: NodeAffinityLabels
22+
list:
23+
{{ toYaml .Values.localprovisioner.hostpathClass.nodeAffinityLabels | indent 10 }}
24+
{{- end }}
25+
{{- if .Values.localprovisioner.hostpathClass.isDefaultClass }}
26+
storageclass.kubernetes.io/is-default-class: "true"
1727
{{- end }}
1828
provisioner: openebs.io/local
1929
volumeBindingMode: WaitForFirstConsumer
20-
reclaimPolicy: Delete
30+
reclaimPolicy: {{ .Values.localprovisioner.hostpathClass.reclaimPolicy }}
2131
{{- end }}
2232
{{- end }}
2333
{{- end }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ spec:
6363
{{- if .Values.featureGates.ChangeDetection.enabled }}
6464
- --feature-gates={{ .Values.featureGates.ChangeDetection.featureGateFlag }}
6565
{{- end}}
66+
{{- if .Values.featureGates.PartitionTableUUID.enabled }}
67+
- --feature-gates={{ .Values.featureGates.PartitionTableUUID.featureGateFlag }}
68+
{{- end}}
6669
{{- end}}
6770
imagePullPolicy: {{ .Values.image.pullPolicy }}
6871
{{- if .Values.ndm.resources }}

0 commit comments

Comments
 (0)