chore(charts): localpv-provisioner separate directory w/ storageclass (…

…#257) * localpv-provisioner separate directory w/ storageclass * Bump version * Update charts to use 2.12.1 version of images. Jiva 2.12.2 Signed-off-by: Niladri Halder <[email protected]>
openebs · Sep 7, 2021 · 63d38e5 · 63d38e5
1 parent 5186756
commit 63d38e5
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 26 deletions.
diff --git a/charts/openebs/Chart.yaml b/charts/openebs/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
-version: 2.12.2
+version: 2.12.3
 name: openebs
-appVersion: 2.12.0
+appVersion: 2.12.1
 description: Containerized Storage for Containers
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/openebs/icon/color/openebs-icon-color.png
 home: http://www.openebs.io/
@@ -23,7 +23,7 @@ dependencies:
     repository: "https://openebs.github.io/node-disk-manager"
     condition: openebs-ndm.enabled
   - name: localpv-provisioner
-    version: "2.12.0"
+    version: "2.12.1"
     repository: "https://openebs.github.io/dynamic-localpv-provisioner"
     condition: localpv-provisioner.enabled
   - name: cstor

diff --git a/...mplates/deployment-local-provisioner.yaml → ...isioner/deployment-local-provisioner.yaml b/...mplates/deployment-local-provisioner.yaml → ...isioner/deployment-local-provisioner.yaml
@@ -121,6 +121,6 @@ spec:
 {{- if .Values.localprovisioner.affinity }}
       affinity:
 {{ toYaml .Values.localprovisioner.affinity | indent 8 }}
-{{- end }}
-{{- end }}
-{{- end }}
+{{ end }}
+{{ end }}
+{{ end }}
diff --git a/charts/openebs/templates/localprovisioner/device-class.yaml b/charts/openebs/templates/localprovisioner/device-class.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.localprovisioner.enabled -}}
+{{- $localpvprovisionerValues := index .Values "localpv-provisioner" -}}
+{{- if not $localpvprovisionerValues.enabled -}}
+{{- if .Values.localprovisioner.enableDeviceClass -}}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: openebs-device
+  annotations:
+    openebs.io/cas-type: local
+    cas.openebs.io/config: |
+      - name: StorageType
+        value: "device"
+provisioner: openebs.io/local
+volumeBindingMode: WaitForFirstConsumer
+reclaimPolicy: Delete
+{{ end }}
+{{ end }}
+{{ end }}
diff --git a/charts/openebs/templates/localprovisioner/hostpath-class.yaml b/charts/openebs/templates/localprovisioner/hostpath-class.yaml
@@ -0,0 +1,23 @@
+{{- if .Values.localprovisioner.enabled -}}
+{{- $localpvprovisionerValues := index .Values "localpv-provisioner" -}}
+{{- if not $localpvprovisionerValues.enabled -}}
+{{- if .Values.localprovisioner.enableHostpathClass -}}
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: openebs-hostpath
+  annotations:
+    openebs.io/cas-type: local
+    cas.openebs.io/config: |
+      - name: StorageType
+        value: "hostpath"
+{{ if .Values.localprovisioner.basePath }}
+      - name: BasePath
+        value: {{ .Values.localprovisioner.basePath }}
+{{ end -}}
+provisioner: openebs.io/local
+volumeBindingMode: WaitForFirstConsumer
+reclaimPolicy: Delete
+{{ end }}
+{{ end }}
+{{ end }}
diff --git a/charts/openebs/values.yaml b/charts/openebs/values.yaml
@@ -18,7 +18,7 @@ imagePullSecrets: []
 
 release:
   # "openebs.io/version" label for control plane components
-  version: "2.12.0"
+  version: "2.12.1"
 
 # Legacy components will be installed if it is enabled.
 # Legacy components are - admission-server, api-server, snapshot-operator
@@ -33,7 +33,7 @@ image:
 apiserver:
   enabled: true
   image: "openebs/m-apiserver"
-  imageTag: "2.12.0"
+  imageTag: "2.12.1"
   replicas: 1
   ports:
     externalPort: 5656
@@ -68,7 +68,7 @@ varDirectoryPath:
 provisioner:
   enabled: true
   image: "openebs/openebs-k8s-provisioner"
-  imageTag: "2.12.0"
+  imageTag: "2.12.1"
   replicas: 1
   enableLeaderElection: true
   patchJivaNodeAffinity: enabled
@@ -95,9 +95,11 @@ provisioner:
 localprovisioner:
   enabled: true
   image: "openebs/provisioner-localpv"
-  imageTag: "2.12.0"
+  imageTag: "2.12.1"
   replicas: 1
   enableLeaderElection: true
+  enableDeviceClass: true
+  enableHostpathClass: true
   basePath: "/var/openebs/local"
   # This sets the number of times the provisioner should try
   # with a polling interval of 5 seconds, to get the Blockdevice
@@ -124,7 +126,7 @@ snapshotOperator:
   enabled: true
   controller:
     image: "openebs/snapshot-controller"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
     ## snapshot controller resource requests and limits
     ## Reference: http://kubernetes.io/docs/user-guide/compute-resources/
     resources: {}
@@ -136,7 +138,7 @@ snapshotOperator:
       #   memory: 1Gi
   provisioner:
     image: "openebs/snapshot-provisioner"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
     ## snapshot provisioner resource requests and limits
     ## Reference: http://kubernetes.io/docs/user-guide/compute-resources/
     resources: {}
@@ -247,7 +249,7 @@ ndmExporter:
 webhook:
   enabled: true
   image: "openebs/admission-server"
-  imageTag: "2.12.0"
+  imageTag: "2.12.1"
   failurePolicy: "Fail"
   replicas: 1
   healthCheck:
@@ -271,7 +273,7 @@ webhook:
 # then put this configuration under `localpv-provisioner` and `openebs-ndm` key.
 helper:
   image: "openebs/linux-utils"
-  imageTag: "2.12.0"
+  imageTag: "2.12.1"
 
 # These are ndm related configuration. If you want to enable openebs as a dependency
 # chart then set `ndm.enabled: false`, `ndmOperator.enabled: false` and enable it as
@@ -302,7 +304,7 @@ policies:
   monitoring:
     enabled: true
     image: "openebs/m-exporter"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
 
 analytics:
   enabled: true
@@ -313,7 +315,7 @@ jiva:
 
   # non csi configuration
   image: "openebs/jiva"
-  imageTag: "2.12.1"
+  imageTag: "2.12.2"
   replicas: 3
   defaultStoragePath: "/var/openebs"
 
@@ -356,41 +358,41 @@ jiva:
 #      image:
 #        registry: quay.io/
 #        repository: openebs/jiva
-#        tag: 2.12.1
+#        tag: 2.12.2
 #    replica:
 #      image:
 #        registry: quay.io/
 #        repository: openebs/jiva
-#        tag: 2.12.1
+#        tag: 2.12.2
 #    image:
 #      registry: quay.io/
 #      repository: openebs/jiva-operator
 #      pullPolicy: IfNotPresent
-#      tag: 2.12.1
+#      tag: 2.12.2
 #
 #  jivaCSIPlugin:
 #    remount: "true"
 #    image:
 #      registry: quay.io/
 #      repository: openebs/jiva-csi
 #      pullPolicy: IfNotPresent
-#      tag: 2.12.1
+#      tag: 2.12.2
 
 cstor:
 
   # non csi configuration
   pool:
     image: "openebs/cstor-pool"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
   poolMgmt:
     image: "openebs/cstor-pool-mgmt"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
   target:
     image: "openebs/cstor-istgt"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
   volumeMgmt:
     image: "openebs/cstor-volume-mgmt"
-    imageTag: "2.12.0"
+    imageTag: "2.12.1"
 
   # cstor csi driver configuration
   # do not enable or configure any sub dependency here
@@ -575,7 +577,7 @@ localpv-provisioner:
 #    image:
 #      registry: quay.io/
 #      repository: openebs/provisioner-localpv
-#      tag: 2.12.0
+#      tag: 2.12.1
 #      pullPolicy: IfNotPresent
 #    healthCheck:
 #      initialDelaySeconds: 30
@@ -589,7 +591,7 @@ localpv-provisioner:
 #      registry: quay.io/
 #      repository: openebs/linux-utils
 #      pullPolicy: IfNotPresent
-#      tag: 2.12.0
+#      tag: 2.12.1
 
 # zfs local pv configuration goes here
 # ref - https://openebs.github.io/zfs-localpv