Merge pull request #432 from bluezd/iomesh-1.2

Update IOMesh Charts to v1.2.0
kubesphere · Jan 16, 2025 · 6ff50ca · 6ff50ca
2 parents a55b087 + a9c1c09
commit 6ff50ca
Show file tree

Hide file tree

Showing 21 changed files with 150 additions and 53 deletions.
diff --git a/src/stable/iomesh/Chart.yaml b/src/stable/iomesh/Chart.yaml
@@ -1,36 +1,28 @@
 apiVersion: v2
-appVersion: v5.5.0-rc27
+appVersion: v5.6.0-rc112
 dependencies:
 - name: zookeeper-operator
-  repository: file://charts/zookeeper-operator
   version: 0.2.15-1
 - name: hostpath-provisioner
-  repository: file://charts/hostpath-provisioner
   version: 0.5.3-1
 - condition: openebs-ndm.enabled
   name: openebs-ndm
-  repository: file://charts/openebs-ndm
-  version: 1.8.0-1
+  version: 1.8.0-3
 - name: csi-driver
-  repository: file://charts/csi-driver
-  version: 2.7.2
+  version: 2.8.0
 - name: blockdevice-monitor
-  repository: file://charts/blockdevice-monitor
-  version: 0.1.0
+  version: 0.2.1
 - condition: iomesh-localpv-manager.enabled
   name: iomesh-localpv-manager
-  repository: file://charts/iomesh-localpv-manager
   version: 0.2.0
 - name: deck
-  repository: file://charts/deck
-  version: 0.1.0
+  version: 0.2.0
 - name: deck-plugin-iomesh
-  repository: file://charts/deck-plugin-iomesh
-  version: 0.1.0
+  version: 0.2.0
 description: Enterprise Kubernetes-Native Distributed Storage
 name: IOMesh
 type: application
-version: v1.1.0
+version: v1.2.0
 home: https://www.iomesh.com
 icon: https://www.iomesh.com/IOMesh_logo_on_white.svg
 maintainers:

diff --git a/src/stable/iomesh/charts/blockdevice-monitor/Chart.yaml b/src/stable/iomesh/charts/blockdevice-monitor/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: v0.1.0
+appVersion: v0.2.1
 description: A disk health component
 name: blockdevice-monitor
 type: application
-version: 0.1.0
+version: 0.2.1
diff --git a/src/stable/iomesh/charts/blockdevice-monitor/templates/role.yaml b/src/stable/iomesh/charts/blockdevice-monitor/templates/role.yaml
@@ -27,4 +27,16 @@ rules:
   - openebs.io
   resources:
   - blockdevices
-  verbs: [list,watch]
+  verbs:
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+  - update
+  - patch
diff --git a/src/stable/iomesh/charts/blockdevice-monitor/values.yaml b/src/stable/iomesh/charts/blockdevice-monitor/values.yaml
@@ -74,7 +74,7 @@ prober:
       memory: 100Mi
   metrics:
     portName: http-metrics
-    port: 8443
+    port: 3269
     path: /metrics
   podMonitor:
     # RelabelConfigs to apply to samples before scraping.

diff --git a/src/stable/iomesh/charts/csi-driver/Chart.yaml b/src/stable/iomesh/charts/csi-driver/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.7.2
+appVersion: v2.8.0
 description: 'The IOMesh Container Storage Interface CSI Driver provides a CSI interface
   used by Container Orchestrators to manage the lifecycle of IOMesh volumes. '
 home: http://iomesh.com
 kubeVersion: ^1.13.0-0
 name: csi-driver
 type: application
-version: 2.7.2
+version: 2.8.0
diff --git a/src/stable/iomesh/charts/csi-driver/templates/_helpers.tpl b/src/stable/iomesh/charts/csi-driver/templates/_helpers.tpl
@@ -212,5 +212,5 @@ com.smartx.{{ include "csi-driver.name" . }}
 Prepare-csi image
 */}}
 {{- define "prepareCSI.image" -}}
-{{ .Values.global.registry }}{{ .Values.prepareCSI.image.repository | default "iomesh/prepare-csi"}}:{{ .Values.prepareCSI.image.tag | default "v1.0.2" }}
+{{ .Values.global.registry }}{{ .Values.prepareCSI.image.repository | default "iomesh/prepare-csi"}}:{{ .Values.prepareCSI.image.tag | default "v1.0.3-rc0" }}
 {{- end }}
diff --git a/src/stable/iomesh/charts/csi-driver/templates/controller.yaml b/src/stable/iomesh/charts/csi-driver/templates/controller.yaml
@@ -40,7 +40,7 @@ spec:
               path: /healthz
               port: health
           command:
-          - /usr/bin/bash          
+          - /usr/bin/bash
           args:
             - /usr/sbin/csi-entrypoint.sh
             - --csi_addr=unix:///csi/csi.sock
@@ -54,6 +54,7 @@ spec:
             - --deployment_mode={{ .Values.driver.deploymentMode }}
             - --namespace=$(NAMESPACE)
             - --node_map={{ include "csi-driver.fullname" . }}-node-map
+            - --auto_capacity_align={{ .Values.driver.autoCapacityAlign | default false }}
             - --enable_nvmf={{ .Values.driver.nvmf.enable }}
             - --pod_delete_policy={{ .Values.driver.controller.driver.podDeletePolicy | default "no-delete-pod" }}
             - --pod_delete_latency={{ .Values.driver.controller.driver.podDeleteLatency | default "90s" }}
@@ -84,6 +85,10 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.driver.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       volumes:
         - name: socket-dir
           emptyDir: {}
diff --git a/src/stable/iomesh/charts/csi-driver/templates/node.yaml b/src/stable/iomesh/charts/csi-driver/templates/node.yaml
@@ -89,4 +89,8 @@ spec:
       affinity:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.driver.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- include "csi-driver.node.volumes" . | nindent 6 -}}
diff --git a/src/stable/iomesh/charts/csi-driver/templates/snapshotter-controller.yaml b/src/stable/iomesh/charts/csi-driver/templates/snapshotter-controller.yaml
@@ -793,6 +793,10 @@ spec:
             - "--v=5"
             - "--leader-election=true"
           imagePullPolicy: IfNotPresent
+      {{- with .Values.driver.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
 
 {{- if and (eq $kubeMajorVersion 1) (ge $kubeMinorVersion 17) (le $kubeMinorVersion 21)}}
@@ -1421,5 +1425,9 @@ spec:
             - "--v=5"
             - "--leader-election=false"
           imagePullPolicy: IfNotPresent
+      {{- with .Values.driver.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
 {{- end }}
diff --git a/src/stable/iomesh/charts/csi-driver/values.yaml b/src/stable/iomesh/charts/csi-driver/values.yaml
@@ -53,6 +53,8 @@ driver:
   iscsiPortal: "127.0.0.1:3260"
   # The maximum number of volumes attachable per node
   maxVolumesPerNode: 128
+  # Automatic capacity alignment, ensuring the volume size is a multiple of 2Gi.
+  autoCapacityAlign: false
   # EXTERNAL / HCI
   deploymentMode: "EXTERNAL"
   nvmf:
@@ -61,7 +63,11 @@ driver:
     nvmfAgentIntervalSecond: 90
     nvmfAgentConnectTimeoutSecond: 15
     nvmfAgentDisconnectTimeoutSecond: 15
-
+  # tolerations of csi-controller-plugin, csi-node-plugin and snapshot-controller
+  tolerations: []
+  # - key: "node-role.kubernetes.io/master"
+  #   operator: "Exists"
+  #   effect: "NoSchedule"
 
   controller:
     # controller replicas

diff --git a/src/stable/iomesh/charts/deck-plugin-iomesh/Chart.yaml b/src/stable/iomesh/charts/deck-plugin-iomesh/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: v0.1.0
+appVersion: v0.2.0
 description: A Helm chart for Kubernetes
 name: deck-plugin-iomesh
 type: application
-version: 0.1.0
+version: 0.2.0
diff --git a/src/stable/iomesh/charts/deck/Chart.yaml b/src/stable/iomesh/charts/deck/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: v0.1.0
+appVersion: v0.2.0
 description: A Helm chart for Kubernetes
 name: deck
 type: application
-version: 0.1.0
+version: 0.2.0
diff --git a/src/stable/iomesh/charts/openebs-ndm/Chart.yaml b/src/stable/iomesh/charts/openebs-ndm/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.8.0-1
+appVersion: 1.8.0-3
 description: Helm chart for OpenEBS Node Disk Manager - a Kubernetes native storage
   device management solution. For instructions on how to install, refer to https://openebs.github.io/node-disk-manager/.
 home: http://www.openebs.io/
@@ -20,4 +20,4 @@ maintainers:
 name: openebs-ndm
 sources:
 - https://github.com/openebs/node-disk-manager
-version: 1.8.0-1
+version: 1.8.0-3
diff --git a/src/stable/iomesh/charts/openebs-ndm/values.yaml b/src/stable/iomesh/charts/openebs-ndm/values.yaml
@@ -2,7 +2,7 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 release:
-  version: "1.8.0"
+  version: "1.8.0-3"
 
 global:
   # Global variable registry to locate the images, It is convenient for users to specify private dockerhub
@@ -17,11 +17,10 @@ ndm:
   componentName: ndm
   enabled: true
   image:
-
-    repository: openebs/node-disk-manager
+    repository: iomesh/node-disk-manager
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 1.8.0
+    tag: 1.8.0-2
   sparse:
     path: "/var/openebs/sparse"
     size: "10737418240"
@@ -69,7 +68,7 @@ ndmOperator:
     repository: openebs/node-disk-operator
     pullPolicy: IfNotPresent
     # Overrides the image tag whose default is the chart appVersion.
-    tag: 1.8.0
+    tag: 1.8.0-1
   podLabels:
     name: openebs-ndm-operator
   annotations: {}

diff --git a/src/stable/iomesh/crds/iomesh.com_iomeshclusters.yaml b/src/stable/iomesh/crds/iomesh.com_iomeshclusters.yaml
@@ -70,6 +70,9 @@ spec:
                     type: string
                   dataCIDR:
                     type: string
+                  defaultPrioSpaceRatio:
+                    format: int32
+                    type: integer
                   deviceMap:
                     additionalProperties:
                       description: DeviceMappingStrategy is a query over a set of device. If you want to exclude some device in select result, add the device name in to Exclude.
@@ -523,6 +526,12 @@ spec:
                           type: object
                         type: array
                     type: object
+                  prioritizedSpaceRatioMap:
+                    additionalProperties:
+                      format: int32
+                      type: integer
+                    description: 'PrioritizedSpaceRatioMap:   key: chunk data ip   value: prioritized space percentage'
+                    type: object
                   replicas:
                     format: int32
                     type: integer
@@ -1568,12 +1577,20 @@ spec:
                               properties:
                                 allocatedDataSpace:
                                   type: string
+                                allocatedPrioritizedSpace:
+                                  type: string
                                 dirtyCacheSpace:
                                   type: string
+                                downgradedPrioritizedSpace:
+                                  type: string
                                 failureCacheSpace:
                                   type: string
                                 failureDataSpace:
                                   type: string
+                                plannedPrioritizedSpace:
+                                  type: string
+                                prioritizedPercentage:
+                                  type: string
                                 provisionedDataSpace:
                                   type: string
                                 totalCacheCapacity:
@@ -1596,12 +1613,20 @@ spec:
                         properties:
                           allocatedDataSpace:
                             type: string
+                          allocatedPrioritizedSpace:
+                            type: string
                           dirtyCacheSpace:
                             type: string
+                          downgradedPrioritizedSpace:
+                            type: string
                           failureCacheSpace:
                             type: string
                           failureDataSpace:
                             type: string
+                          plannedPrioritizedSpace:
+                            type: string
+                          prioritizedPercentage:
+                            type: string
                           provisionedDataSpace:
                             type: string
                           totalCacheCapacity:

diff --git a/src/stable/iomesh/templates/iomeshcluster.yaml b/src/stable/iomesh/templates/iomeshcluster.yaml
@@ -76,6 +76,13 @@ spec:
     extraEnvs:
       {{- toYaml . | nindent 6 }}
     {{- end }}
+    {{- with .Values.iomesh.chunk.prioritizedSpaceRatioMap }}
+    prioritizedSpaceRatioMap:
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- if .Values.iomesh.chunk.defaultPrioSpaceRatio }}
+    defaultPrioSpaceRatio: {{ .Values.iomesh.chunk.defaultPrioSpaceRatio }}
+    {{- end }}
     {{- with .Values.iomesh.chunk.podPolicy }}
     podPolicy:
       {{- with .nodeSelector }}

diff --git a/src/stable/iomesh/templates/limitrange.yaml b/src/stable/iomesh/templates/limitrange.yaml
@@ -0,0 +1,16 @@
+{{ if .Values.operator.enableLimitRange | default true }}
+apiVersion: v1
+kind: LimitRange
+metadata:
+  name: {{ .Release.Name }}-limit-range
+  namespace: {{ .Release.Namespace }}
+spec:
+  limits:
+    - default:
+        cpu: "2"
+        memory: 4Gi
+      defaultRequest:
+        cpu: "0"
+        memory: "0"
+      type: Container
+{{- end }}
diff --git a/src/stable/iomesh/templates/post-delete-hook.yaml b/src/stable/iomesh/templates/post-delete-hook.yaml
@@ -86,7 +86,7 @@ spec:
   restartPolicy: Never
   containers:
   - name: post-delete
-    image: {{ .Values.global.registry }}iomesh/post-delete-hook:{{ .Values.operator.image.tag | default .Chart.Version }}
+    image: {{ .Values.global.registry }}{{ .Values.iomesh.postDeleteHook.image.repository | default "iomesh/post-delete-hook"}}:{{ .Values.iomesh.postDeleteHook.image.tag | default (.Values.operator.image.tag | default .Chart.Version) }}
     imagePullPolicy: IfNotPresent
     env:
     - name: RELEASE_NAME

diff --git a/src/stable/iomesh/templates/version-map.yaml b/src/stable/iomesh/templates/version-map.yaml
@@ -6,3 +6,4 @@ metadata:
   namespace: {{ .Release.Namespace }}
 data:
   v1.1.0: "v5.5.0-rc27"
+  v1.2.0: "v5.6.0-rc112"
diff --git a/src/stable/iomesh/templates/zookeeper.yaml b/src/stable/iomesh/templates/zookeeper.yaml
@@ -21,11 +21,11 @@ spec:
       runAsUser: 0
     resources:
       limits:
-        cpu: "400m"
-        memory: "2000Mi"
+        cpu: "1"
+        memory: "2Gi"
       requests:
-        cpu: "400m"
-        memory: "2000Mi"
+        cpu: "1"
+        memory: "2Gi"
   {{- with .Values.iomesh.zookeeper.podPolicy }}
     {{- with .nodeSelector }}
     nodeSelector: