Skip to content

Commit b6fed7f

Browse files
authored
feat(deploy/helm): move volumesnapshot CRDs to the template dir (#488)
Signed-off-by: Hrudaya <[email protected]>
1 parent d646e6b commit b6fed7f

File tree

6 files changed

+24
-8
lines changed

6 files changed

+24
-8
lines changed

Diff for: deploy/helm/charts/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
22
name: zfs-localpv
33
description: Helm chart for CSI Driver for dynamic provisioning of ZFS Persistent Local Volumes. For instructions on how to use this helm chart, see - https://openebs.github.io/zfs-localpv/
4-
version: 2.3.2
5-
appVersion: 2.3.0
4+
version: 2.4.0
5+
appVersion: 2.4.0
66
icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
77
home: https://openebs.io/
88
keywords:

Diff for: deploy/helm/charts/crds/zfsnode.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,13 @@ spec:
6060
description: Free specifies the available capacity of zfs pool.
6161
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
6262
x-kubernetes-int-or-string: true
63+
used:
64+
anyOf:
65+
- type: integer
66+
- type: string
67+
description: Used specifies the used capacity of zfs pool.
68+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
69+
x-kubernetes-int-or-string: true
6370
name:
6471
description: Name of the zfs pool.
6572
minLength: 1
@@ -70,6 +77,7 @@ spec:
7077
type: string
7178
required:
7279
- free
80+
- used
7381
- name
7482
- uuid
7583
type: object

Diff for: deploy/helm/charts/crds/volumesnapshotclasses.yaml renamed to deploy/helm/charts/templates/volumesnapshotclasses.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.crd.volumeSnapshot }}
12
---
23
apiVersion: apiextensions.k8s.io/v1
34
kind: CustomResourceDefinition
@@ -131,4 +132,5 @@ status:
131132
kind: ""
132133
plural: ""
133134
conditions: []
134-
storedVersions: []
135+
storedVersions: []
136+
{{- end }}

Diff for: deploy/helm/charts/crds/volumesnapshotcontents.yaml renamed to deploy/helm/charts/templates/volumesnapshotcontents.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.crd.volumeSnapshot }}
12
---
23
apiVersion: apiextensions.k8s.io/v1
34
kind: CustomResourceDefinition
@@ -398,4 +399,5 @@ status:
398399
kind: ""
399400
plural: ""
400401
conditions: []
401-
storedVersions: []
402+
storedVersions: []
403+
{{- end }}

Diff for: deploy/helm/charts/crds/volumesnapshots.yaml renamed to deploy/helm/charts/templates/volumesnapshots.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.crd.volumeSnapshot }}
12
---
23
apiVersion: apiextensions.k8s.io/v1
34
kind: CustomResourceDefinition
@@ -309,4 +310,5 @@ status:
309310
kind: ""
310311
plural: ""
311312
conditions: []
312-
storedVersions: []
313+
storedVersions: []
314+
{{- end }}

Diff for: deploy/helm/charts/values.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This is a YAML-formatted file.
33
# Declare variables to be passed into your templates.
44
release:
5-
version: "2.3.1"
5+
version: "2.4.0"
66

77
imagePullSecrets:
88
# - name: "image-pull-secret"
@@ -144,13 +144,15 @@ zfsPlugin:
144144
repository: openebs/zfs-driver
145145
pullPolicy: IfNotPresent
146146
# Overrides the image tag whose default is the chart appVersion.
147-
tag: 2.3.0
147+
tag: 2.4.0
148148

149149
role: openebs-zfs
150150

151151
crd:
152152
enableInstall: true
153-
153+
# Specify installation of the kubernetes-csi volume snapshot CRDs if your Kubernetes distribution
154+
# or another storage operator already manages them.
155+
volumeSnapshot: true
154156
serviceAccount:
155157
zfsController:
156158
# Specifies whether a service account should be created

0 commit comments

Comments
 (0)