update hwameistor-operator v0.15.0

charts/hwameistor-operator/config

@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=true
 export REPO_URL=http://hwameistor.io/hwameistor-operator
 export REPO_NAME=hwameistor-operator
 export CHART_NAME=hwameistor-operator
-export VERSION=v0.14.4
+export VERSION=v0.15.0
 
 # push to daocloud repo
 export DAOCLOUD_REPO_PROJECT=addon

charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml

@@ -24,12 +24,14 @@
 - "{{ .global.hwameistorImageRegistry }}/{{ .ui.imageRepository }}:{{ .ui.tag }}"
 - "{{ .global.hwameistorImageRegistry }}/{{ .operator.imageRepository }}:{{ .operator.tag }}"
 - "{{ .global.hwameistorImageRegistry }}/{{ .preHookJob.imageRepository }}:{{ .preHookJob.tag }}"
-- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.0"
-- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}:{{ .ha.drbdVersion }}"
-- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}:{{ .ha.drbdVersion }}"
-- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}:{{ .ha.drbdVersion }}"
-- "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}:{{ .ha.drbdVersion }}"
-- "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}:{{ .ha.drbdVersion }}"
-- "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}:{{ .ha.drbdVersion }}"
-
+- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.2"
+- "{{ .global.hwameistorImageRegistry }}/{{ .dataLoadManager.imageRepository }}:{{ .dataLoadManager.tag }}"
+- "{{ .global.hwameistorImageRegistry }}/{{ .dataSetManager.imageRepository }}:{{ .dataSetManager.tag }}"
+- "{{ .global.hwameistorImageRegistry }}/{{ .dataLoadInit.imageRepository }}:{{ .dataLoadInit.tag }}"
 # - "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-jammy:v9.1.11"

charts/hwameistor-operator/hwameistor-operator/Chart.yaml

@@ -1,11 +1,7 @@
 apiVersion: v2
-appVersion: v0.14.4
+appVersion: v0.15.0
 description: A Helm chart for Hwameistor Operator
 icon: https://hwameistor.io/img/logo.svg
 name: hwameistor-operator
 type: application
-version: v0.14.4
-keywords:
-  - storage
-  - local
-  - block
+version: v0.15.0

charts/hwameistor-operator/hwameistor-operator/templates/_helpers.tpl

@@ -125,3 +125,13 @@ Create the name of the service account to use
 {{- define "hwameistor.uiImageTag" -}}
   {{- default .Values.global.hwameistorVersion .Values.ui.tag -}}
 {{- end -}}
+
+{{/* Allow dataLoadManager image tag to be overridden. */}}
+{{- define "hwameistor.dataLoalManagerImageTag" -}}
+  {{- default .Values.global.hwameistorVersion .Values.dataLoadManager.tag -}}
+{{- end -}}
+
+{{/* Allow dataSetManager image tag to be overridden. */}}
+{{- define "hwameistor.dataSetManagerImageTag" -}}
+  {{- default .Values.global.hwameistorVersion .Values.dataSetManager.tag -}}
+{{- end -}}

charts/hwameistor-operator/hwameistor-operator/templates/hwameistorcluster.yaml

@@ -11,6 +11,7 @@ spec:
     - {{ . }}
     {{- end }}
   {{- end }}
+  datasetDefaultPoolClass: {{ $.Values.datasetDefaultPoolClass }}
   notClaimDisk: {{ $.Values.global.notClaimDisk }}
   targetNamespace: {{ $.Values.global.targetNamespace }}
   rbac:
@@ -234,10 +235,9 @@ spec:
     {{- end }}
     deployOnMaster: {{ $.Values.ha.deployOnMaster | quote }}
     shipper:
-      image:
-        registry: {{ $.Values.global.hwameistorImageRegistry }}
-        repository: {{.Values.ha.imageRepository}}
-        tag: {{$.Values.ha.shipperChar}}
+      registry: {{ $.Values.global.hwameistorImageRegistry }}
+      repository: {{.Values.ha.imageRepository}}
+      tag: {{$.Values.ha.shipperChar}}
     imagePullPolicy: "IfNotPresent"
     # drbdVersion: "v9.0.32-1"
     drbdVersion: {{ $.Values.ha.drbdVersion }}
@@ -252,8 +252,24 @@ spec:
             operator: DoesNotExist
           - key: node-role.kubernetes.io/control-plane
             operator: DoesNotExist
-    chartVersion: "v0.4.0"
+    chartVersion: "v0.4.2"
   storageClass:
-    allowVolumeExpansion: true
-    reclaimPolicy: "Delete"
-    fsType: "xfs"
+    allowVolumeExpansion: {{ $.Values.storageClass.allowVolumeExpansion }}
+    reclaimPolicy: {{ $.Values.storageClass.reclaimPolicy }}
+    fsType: "xfs"
+
+  dataLoadManager:
+    disable: {{ $.Values.dataLoadManager.disable }}
+    dataLoadManagerContainer:
+      image:
+        registry: {{ $.Values.global.hwameistorImageRegistry }}
+        repository: {{ $.Values.dataLoadManager.imageRepository }}
+        tag: {{ template "hwameistor.dataLoalManagerImageTag" . }}
+
+  dataSetManager:
+    disable: {{ $.Values.dataSetManager.disable }}
+    dataSetManagerContainer:
+      image:
+        registry: {{ $.Values.global.hwameistorImageRegistry }}
+        repository: {{ $.Values.dataSetManager.imageRepository }}
+        tag: {{ template "hwameistor.dataSetManagerImageTag" . }}

charts/hwameistor-operator/hwameistor-operator/values.extra.prod.yaml

@@ -186,6 +186,25 @@ pvcAutoResizer:
       memory: 20Mi
 
 localDiskActionController:
+  resources:
+    limits:
+      cpu: 300m
+      memory: 300Mi
+    requests:
+      cpu: 1m
+      memory: 20Mi
+
+
+dataLoadManager:
+  resources:
+    limits:
+      cpu: 300m
+      memory: 300Mi
+    requests:
+      cpu: 1m
+      memory: 20Mi
+
+dataSetManager:
   resources:
     limits:
       cpu: 300m