Merge pull request #235 from kubeservice-stack/helm-allow-configure

feat: allow storageclass value configure
alibaba · Sep 25, 2023 · 1b28a09 · 1b28a09
2 parents 255e6d8 + d9e29ca
commit 1b28a09
Show file tree

Hide file tree

Showing 15 changed files with 159 additions and 51 deletions.
diff --git a/docs/commandline/open-local.md b/docs/commandline/open-local.md
@@ -24,11 +24,11 @@
 
 ### SEE ALSO
 
-* [open-local agent](open-local_agent.md)	 - command for collecting local storage information
-* [open-local completion](open-local_completion.md)	 - Generate the autocompletion script for the specified shell
-* [open-local controller](open-local_controller.md)	 - command for starting a controller
-* [open-local csi](open-local_csi.md)	 - command for running csi plugin
-* [open-local gen-doc](open-local_gen-doc.md)	 - generate document for Open-Local CLI with MarkDown format
-* [open-local scheduler](open-local_scheduler.md)	 - scheduler is a scheduler extender implementation for local storage
-* [open-local version](open-local_version.md)	 - Print the version of open-local
+* [open-local agent](./open-local_agent.md)	 - command for collecting local storage information
+* [open-local completion](./open-local_completion.md)	 - Generate the autocompletion script for the specified shell
+* [open-local controller](./open-local_controller.md)	 - command for starting a controller
+* [open-local csi](./open-local_csi.md)	 - command for running csi plugin
+* [open-local gen-doc](./open-local_gen-doc.md)	 - generate document for Open-Local CLI with MarkDown format
+* [open-local scheduler](./open-local_scheduler.md)	 - scheduler is a scheduler extender implementation for local storage
+* [open-local version](./open-local_version.md)	 - Print the version of open-local
 
diff --git a/docs/commandline/open-local_agent.md b/docs/commandline/open-local_agent.md
@@ -41,5 +41,5 @@ open-local agent [flags]
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
+* [open-local](./open-local.md)	 - 
 
diff --git a/docs/commandline/open-local_completion.md b/docs/commandline/open-local_completion.md
@@ -35,9 +35,9 @@ See each sub-command's help for details on how to use the generated script.
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
-* [open-local completion bash](open-local_completion_bash.md)	 - Generate the autocompletion script for bash
-* [open-local completion fish](open-local_completion_fish.md)	 - Generate the autocompletion script for fish
-* [open-local completion powershell](open-local_completion_powershell.md)	 - Generate the autocompletion script for powershell
-* [open-local completion zsh](open-local_completion_zsh.md)	 - Generate the autocompletion script for zsh
+* [open-local](./open-local.md)	 - 
+* [open-local completion bash](./open-local_completion_bash.md)	 - Generate the autocompletion script for bash
+* [open-local completion fish](./open-local_completion_fish.md)	 - Generate the autocompletion script for fish
+* [open-local completion powershell](./open-local_completion_powershell.md)	 - Generate the autocompletion script for powershell
+* [open-local completion zsh](./open-local_completion_zsh.md)	 - Generate the autocompletion script for zsh
 
diff --git a/docs/commandline/open-local_completion_bash.md b/docs/commandline/open-local_completion_bash.md
@@ -58,5 +58,5 @@ open-local completion bash
 
 ### SEE ALSO
 
-* [open-local completion](open-local_completion.md)	 - Generate the autocompletion script for the specified shell
+* [open-local completion](./open-local_completion.md)	 - Generate the autocompletion script for the specified shell
 
diff --git a/docs/commandline/open-local_completion_fish.md b/docs/commandline/open-local_completion_fish.md
@@ -49,5 +49,5 @@ open-local completion fish [flags]
 
 ### SEE ALSO
 
-* [open-local completion](open-local_completion.md)	 - Generate the autocompletion script for the specified shell
+* [open-local completion](./open-local_completion.md)	 - Generate the autocompletion script for the specified shell
 
diff --git a/docs/commandline/open-local_completion_powershell.md b/docs/commandline/open-local_completion_powershell.md
@@ -46,5 +46,5 @@ open-local completion powershell [flags]
 
 ### SEE ALSO
 
-* [open-local completion](open-local_completion.md)	 - Generate the autocompletion script for the specified shell
+* [open-local completion](./open-local_completion.md)	 - Generate the autocompletion script for the specified shell
 
diff --git a/docs/commandline/open-local_completion_zsh.md b/docs/commandline/open-local_completion_zsh.md
@@ -60,5 +60,5 @@ open-local completion zsh [flags]
 
 ### SEE ALSO
 
-* [open-local completion](open-local_completion.md)	 - Generate the autocompletion script for the specified shell
+* [open-local completion](./open-local_completion.md)	 - Generate the autocompletion script for the specified shell
 
diff --git a/docs/commandline/open-local_controller.md b/docs/commandline/open-local_controller.md
@@ -41,5 +41,5 @@ open-local controller [flags]
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
+* [open-local](./open-local.md)	 - 
 
diff --git a/docs/commandline/open-local_csi.md b/docs/commandline/open-local_csi.md
@@ -54,5 +54,5 @@ open-local csi [flags]
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
+* [open-local](./open-local.md)	 - 
 
diff --git a/docs/commandline/open-local_gen-doc.md b/docs/commandline/open-local_gen-doc.md
@@ -34,5 +34,5 @@ open-local gen-doc [flags]
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
+* [open-local](./open-local.md)	 - 
 
diff --git a/docs/commandline/open-local_scheduler.md b/docs/commandline/open-local_scheduler.md
@@ -42,5 +42,5 @@ open-local scheduler [flags]
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
+* [open-local](./open-local.md)	 - 
 
diff --git a/docs/commandline/open-local_version.md b/docs/commandline/open-local_version.md
@@ -34,5 +34,5 @@ open-local version [flags]
 
 ### SEE ALSO
 
-* [open-local](open-local.md)	 - 
+* [open-local](./open-local.md)	 - 
 
diff --git a/helm/templates/storage-class.yaml b/helm/templates/storage-class.yaml
@@ -1,15 +1,21 @@
+{{- if .Values.storageclass.lvm.enabled }}
+---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   name: {{ .Values.storageclass.lvm.name }}
 {{ include "local.labels" . | indent 2 }}
 provisioner: {{ .Values.driver }}
 parameters:
-  volumeType: "LVM"
-  csi.storage.k8s.io/fstype: ext4
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: true
+  {{- range $key, $value := .Values.storageclass.lvm.parameters }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+reclaimPolicy: {{ .Values.storageclass.lvm.reclaimPolicy }}
+volumeBindingMode: {{ .Values.storageclass.lvm.volumeBindingMode }}
+allowVolumeExpansion: {{ .Values.storageclass.lvm.allowVolumeExpansion }}
+{{- end }}
+
+{{- if .Values.storageclass.lvm_xfs.enabled }}
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -18,11 +24,15 @@ metadata:
 {{ include "local.labels" . | indent 2 }}
 provisioner: {{ .Values.driver }}
 parameters:
-  volumeType: "LVM"
-  csi.storage.k8s.io/fstype: xfs
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: true
+  {{- range $key, $value := .Values.storageclass.lvm_xfs.parameters }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+reclaimPolicy: {{ .Values.storageclass.lvm_xfs.reclaimPolicy }}
+volumeBindingMode: {{ .Values.storageclass.lvm_xfs.volumeBindingMode }}
+allowVolumeExpansion: {{ .Values.storageclass.lvm_xfs.allowVolumeExpansion }}
+{{- end }}
+
+{{- if .Values.storageclass.device_hdd.enabled }}
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -31,12 +41,15 @@ metadata:
 {{ include "local.labels" . | indent 2 }}
 provisioner: {{ .Values.driver }}
 parameters:
-  csi.storage.k8s.io/fstype: ext4
-  volumeType: Device
-  mediaType: hdd
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: false
+  {{- range $key, $value := .Values.storageclass.device_hdd.parameters }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+reclaimPolicy: {{ .Values.storageclass.device_hdd.reclaimPolicy }}
+volumeBindingMode: {{ .Values.storageclass.device_hdd.volumeBindingMode }}
+allowVolumeExpansion: {{ .Values.storageclass.device_hdd.allowVolumeExpansion }}
+{{- end }}
+
+{{- if .Values.storageclass.device_ssd.enabled }}
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -45,12 +58,15 @@ metadata:
 {{ include "local.labels" . | indent 2 }}
 provisioner: {{ .Values.driver }}
 parameters:
-  csi.storage.k8s.io/fstype: ext4
-  volumeType: Device
-  mediaType: ssd
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: false
+  {{- range $key, $value := .Values.storageclass.device_ssd.parameters }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+reclaimPolicy: {{ .Values.storageclass.device_ssd.reclaimPolicy }}
+volumeBindingMode: {{ .Values.storageclass.device_ssd.volumeBindingMode }}
+allowVolumeExpansion: {{ .Values.storageclass.device_ssd.allowVolumeExpansion }}
+{{- end }}
+
+{{- if .Values.storageclass.lvm_throttle.enabled }}
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
@@ -59,12 +75,15 @@ metadata:
 {{ include "local.labels" . | indent 2 }}
 provisioner: local.csi.aliyun.com
 parameters:
-  volumeType: "LVM"
-  bps: "1048576"
-  iops: "1024"
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
-allowVolumeExpansion: true
+  {{- range $key, $value := .Values.storageclass.lvm_throttle.parameters }}
+  {{ $key }}: {{ $value }}
+  {{- end }}
+reclaimPolicy: {{ .Values.storageclass.lvm_throttle.reclaimPolicy }}
+volumeBindingMode: {{ .Values.storageclass.lvm_throttle.volumeBindingMode }}
+allowVolumeExpansion: {{ .Values.storageclass.lvm_throttle.allowVolumeExpansion }}
+{{- end }}
+
+{{- if .Values.storageclass.lvm.enabled }}
 ---
 apiVersion: snapshot.storage.k8s.io/v1
 kind: VolumeSnapshotClass
@@ -77,4 +96,5 @@ parameters:
   csi.aliyun.com/readonly: "true"
   csi.aliyun.com/snapshot-initial-size: 4Gi
   csi.aliyun.com/snapshot-expansion-size: 1Gi
-  csi.aliyun.com/snapshot-expansion-threshold: 50%
+  csi.aliyun.com/snapshot-expansion-threshold: 50%
+{{- end }}
diff --git a/helm/values-acka.yaml b/helm/values-acka.yaml
@@ -39,14 +39,59 @@ controller:
   update_nls: "false"
   framework_scheduler_names: ahe-scheduler
 storageclass:
+  # lvm StorageClass
   lvm:
+    enabled: true
     name: yoda-lvm-default
+    parameters:
+      volumeType: "LVM"
+      csi.storage.k8s.io/fstype: ext4
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: true
+  # lvm_xfs StorageClass
   lvm_xfs:
+    enabled: true
     name: yoda-lvm-xfs
+    parameters:
+      volumeType: LVM
+      csi.storage.k8s.io/fstype: xfs
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: true
+  # lvm_throttle StorageClass
+  lvm_throttle:
+    enabled: false
+    name: yoda-lvm-io-throttle
+    parameters:
+      volumeType: LVM
+      # bps: "1048576"
+      # iops: "1024"
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: true
+  # device_ssd StorageClass
   device_ssd:
+    enabled: true
     name: yoda-device-ssd
+    parameters:
+      csi.storage.k8s.io/fstype: ext4
+      volumeType: Device
+      mediaType: ssd
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: false
+  # device_hdd StorageClass
   device_hdd:
+    enabled: true
     name: yoda-device-hdd
+    parameters:
+      csi.storage.k8s.io/fstype: ext4
+      volumeType: Device
+      mediaType: hdd
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: false
 monitor:
   # install grafana dashboard
   enabled: false

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -44,16 +44,59 @@ extender:
 controller:
   update_nls: "true"
 storageclass:
+  # lvm StorageClass
   lvm:
+    enabled: true
     name: open-local-lvm
+    parameters:
+      volumeType: "LVM"
+      csi.storage.k8s.io/fstype: ext4
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: true
+  # lvm_xfs StorageClass
   lvm_xfs:
+    enabled: true
     name: open-local-lvm-xfs
+    parameters:
+      volumeType: LVM
+      csi.storage.k8s.io/fstype: xfs
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: true
+  # lvm_throttle StorageClass
   lvm_throttle:
+    enabled: true
     name: open-local-lvm-io-throttle
+    parameters:
+      volumeType: LVM
+      # bps: "1048576"
+      # iops: "1024"
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: true
+  # device_ssd StorageClass
   device_ssd:
+    enabled: true
     name: open-local-device-ssd
+    parameters:
+      csi.storage.k8s.io/fstype: ext4
+      volumeType: Device
+      mediaType: ssd
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: false
+  # device_hdd StorageClass
   device_hdd:
+    enabled: true
     name: open-local-device-hdd
+    parameters:
+      csi.storage.k8s.io/fstype: ext4
+      volumeType: Device
+      mediaType: hdd
+    reclaimPolicy: Delete
+    volumeBindingMode: WaitForFirstConsumer
+    allowVolumeExpansion: false
 monitor:
   # install grafana dashboard
   enabled: false