Skip to content

Commit 980d787

Browse files
author
peng9808
committed
update hwameistor v0.16.2
Signed-off-by: peng9808 <peng.lai@daocloud.io>
1 parent 8ce1968 commit 980d787

File tree

8 files changed

+1443
-228
lines changed

8 files changed

+1443
-228
lines changed

‎charts/hwameistor-operator/config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export USE_OPENSOURCE_CHART=true
44
export REPO_URL=http://hwameistor.io/hwameistor-operator
55
export REPO_NAME=hwameistor-operator
66
export CHART_NAME=hwameistor-operator
7-
export VERSION=v0.14.4
7+
export VERSION=v0.16.2
88

99
# push to daocloud repo
1010
export DAOCLOUD_REPO_PROJECT=addon

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
- "{{ .global.k8sImageRegistry }}/{{ .localDiskManager.csi.attacher.imageRepository }}:{{ .localDiskManager.csi.attacher.tag }}"
88
- "{{ .global.k8sImageRegistry }}/{{ .localStorage.csi.registrar.imageRepository }}:{{ .localStorage.csi.registrar.tag }}"
99
- "{{ .global.hwameistorImageRegistry }}/{{ .localStorage.member.imageRepository }}:{{ .localStorage.member.tag }}"
10-
- "{{ .localStorage.migrate.rclone.imageRepository }}:{{ .localStorage.migrate.rclone.tag }}"
1110
- "{{ .global.hwameistorImageRegistry }}/{{ .localStorage.migrate.juicesync.imageRepository }}:{{ .localStorage.migrate.juicesync.tag }}"
1211
- "{{ .global.k8sImageRegistry }}/{{ .localStorage.csi.provisioner.imageRepository }}:{{ .localStorage.csi.provisioner.tag }}"
1312
- "{{ .global.k8sImageRegistry }}/{{ .localStorage.csi.attacher.imageRepository }}:{{ .localStorage.csi.attacher.tag }}"
@@ -24,12 +23,14 @@
2423
- "{{ .global.hwameistorImageRegistry }}/{{ .ui.imageRepository }}:{{ .ui.tag }}"
2524
- "{{ .global.hwameistorImageRegistry }}/{{ .operator.imageRepository }}:{{ .operator.tag }}"
2625
- "{{ .global.hwameistorImageRegistry }}/{{ .preHookJob.imageRepository }}:{{ .preHookJob.tag }}"
27-
- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.0"
28-
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}:{{ .ha.drbdVersion }}"
29-
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}:{{ .ha.drbdVersion }}"
30-
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}:{{ .ha.drbdVersion }}"
31-
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}:{{ .ha.drbdVersion }}"
32-
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}:{{ .ha.drbdVersion }}"
33-
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}:{{ .ha.drbdVersion }}"
34-
26+
- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
27+
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
28+
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
29+
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
30+
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
31+
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
32+
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.3"
33+
- "{{ .global.hwameistorImageRegistry }}/{{ .dataLoadManager.imageRepository }}:{{ .dataLoadManager.tag }}"
34+
- "{{ .global.hwameistorImageRegistry }}/{{ .dataSetManager.imageRepository }}:{{ .dataSetManager.tag }}"
35+
- "{{ .global.hwameistorImageRegistry }}/{{ .dataLoadInit.imageRepository }}:{{ .dataLoadInit.tag }}"
3536
# - "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-jammy:v9.1.11"

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
apiVersion: v2
2-
appVersion: v0.14.4
2+
appVersion: v0.16.2
33
description: A Helm chart for Hwameistor Operator
44
icon: https://hwameistor.io/img/logo.svg
55
name: hwameistor-operator
66
type: application
7-
version: v0.14.4
8-
keywords:
9-
- storage
10-
- local
11-
- block
7+
version: v0.16.2

‎charts/hwameistor-operator/hwameistor-operator/crds/hwameistor.io_clusters.yaml‎

Lines changed: 1333 additions & 25 deletions
Large diffs are not rendered by default.

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,3 +125,13 @@ Create the name of the service account to use
125125
{{- define "hwameistor.uiImageTag" -}}
126126
{{- default .Values.global.hwameistorVersion .Values.ui.tag -}}
127127
{{- end -}}
128+
129+
{{/* Allow dataLoadManager image tag to be overridden. */}}
130+
{{- define "hwameistor.dataLoalManagerImageTag" -}}
131+
{{- default .Values.global.hwameistorVersion .Values.dataLoadManager.tag -}}
132+
{{- end -}}
133+
134+
{{/* Allow dataSetManager image tag to be overridden. */}}
135+
{{- define "hwameistor.dataSetManagerImageTag" -}}
136+
{{- default .Values.global.hwameistorVersion .Values.dataSetManager.tag -}}
137+
{{- end -}}

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ spec:
1111
- {{ . }}
1212
{{- end }}
1313
{{- end }}
14+
datasetDefaultPoolClass: {{ $.Values.datasetDefaultPoolClass }}
1415
notClaimDisk: {{ $.Values.global.notClaimDisk }}
1516
targetNamespace: {{ $.Values.global.targetNamespace }}
1617
rbac:
@@ -111,9 +112,6 @@ spec:
111112
tag: {{ template "hwameistor.localStorageImageTag" . }}
112113
resources:
113114
{{- toYaml .Values.localStorage.member.resources | nindent 8 }}
114-
rcloneImage:
115-
repository: {{ $.Values.localStorage.migrate.rclone.imageRepository }}
116-
tag: {{ $.Values.localStorage.migrate.rclone.tag }}
117115
juicesyncImage:
118116
registry: {{ $.Values.global.hwameistorImageRegistry }}
119117
repository: {{ $.Values.localStorage.migrate.juicesync.imageRepository }}
@@ -234,10 +232,9 @@ spec:
234232
{{- end }}
235233
deployOnMaster: {{ $.Values.ha.deployOnMaster | quote }}
236234
shipper:
237-
image:
238-
registry: {{ $.Values.global.hwameistorImageRegistry }}
239-
repository: {{.Values.ha.imageRepository}}
240-
tag: {{$.Values.ha.shipperChar}}
235+
registry: {{ $.Values.global.hwameistorImageRegistry }}
236+
repository: {{.Values.ha.imageRepository}}
237+
tag: {{$.Values.ha.shipperChar}}
241238
imagePullPolicy: "IfNotPresent"
242239
# drbdVersion: "v9.0.32-1"
243240
drbdVersion: {{ $.Values.ha.drbdVersion }}
@@ -252,8 +249,24 @@ spec:
252249
operator: DoesNotExist
253250
- key: node-role.kubernetes.io/control-plane
254251
operator: DoesNotExist
255-
chartVersion: "v0.4.0"
252+
chartVersion: "v0.4.3"
256253
storageClass:
257-
allowVolumeExpansion: true
258-
reclaimPolicy: "Delete"
259-
fsType: "xfs"
254+
allowVolumeExpansion: {{ $.Values.storageClass.allowVolumeExpansion }}
255+
reclaimPolicy: {{ $.Values.storageClass.reclaimPolicy }}
256+
fsType: "xfs"
257+
258+
dataLoadManager:
259+
disable: {{ $.Values.dataLoadManager.disable }}
260+
dataLoadManagerContainer:
261+
image:
262+
registry: {{ $.Values.global.hwameistorImageRegistry }}
263+
repository: {{ $.Values.dataLoadManager.imageRepository }}
264+
tag: {{ template "hwameistor.dataLoalManagerImageTag" . }}
265+
266+
dataSetManager:
267+
disable: {{ $.Values.dataSetManager.disable }}
268+
dataSetManagerContainer:
269+
image:
270+
registry: {{ $.Values.global.hwameistorImageRegistry }}
271+
repository: {{ $.Values.dataSetManager.imageRepository }}
272+
tag: {{ template "hwameistor.dataSetManagerImageTag" . }}

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,25 @@ pvcAutoResizer:
186186
memory: 20Mi
187187

188188
localDiskActionController:
189+
resources:
190+
limits:
191+
cpu: 300m
192+
memory: 300Mi
193+
requests:
194+
cpu: 1m
195+
memory: 20Mi
196+
197+
198+
dataLoadManager:
199+
resources:
200+
limits:
201+
cpu: 300m
202+
memory: 300Mi
203+
requests:
204+
cpu: 1m
205+
memory: 20Mi
206+
207+
dataSetManager:
189208
resources:
190209
limits:
191210
cpu: 300m

0 commit comments

Comments
 (0)