Skip to content

Commit 2f07634

Browse files
author
peng9808
committed
updata hwameistor-operator v0.14.6
Signed-off-by: peng9808 <[email protected]>
1 parent 5865db2 commit 2f07634

File tree

6 files changed

+32
-124
lines changed

6 files changed

+32
-124
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.14.6
88

99
# push to daocloud repo
1010
export DAOCLOUD_REPO_PROJECT=addon

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
- "{{ .global.hwameistorImageRegistry }}/{{ .ui.imageRepository }}:{{ .ui.tag }}"
2525
- "{{ .global.hwameistorImageRegistry }}/{{ .operator.imageRepository }}:{{ .operator.tag }}"
2626
- "{{ .global.hwameistorImageRegistry }}/{{ .preHookJob.imageRepository }}:{{ .preHookJob.tag }}"
27-
- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.0"
27+
- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.1"
2828
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}:{{ .ha.drbdVersion }}"
2929
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}:{{ .ha.drbdVersion }}"
3030
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}:{{ .ha.drbdVersion }}"

‎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.14.6
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.14.6

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1948,15 +1948,12 @@ spec:
19481948
properties:
19491949
shipper:
19501950
properties:
1951-
image:
1952-
properties:
1953-
registry:
1954-
type: string
1955-
repository:
1956-
type: string
1957-
tag:
1958-
type: string
1959-
type: object
1951+
registry:
1952+
type: string
1953+
repository:
1954+
type: string
1955+
tag:
1956+
type: string
19601957
type: object
19611958
chartVersion:
19621959
type: string

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,9 @@ spec:
234234
{{- end }}
235235
deployOnMaster: {{ $.Values.ha.deployOnMaster | quote }}
236236
shipper:
237-
image:
238-
registry: {{ $.Values.global.hwameistorImageRegistry }}
239-
repository: {{.Values.ha.imageRepository}}
240-
tag: {{$.Values.ha.shipperChar}}
237+
registry: {{ $.Values.global.hwameistorImageRegistry }}
238+
repository: {{.Values.ha.imageRepository}}
239+
tag: {{$.Values.ha.shipperChar}}
241240
imagePullPolicy: "IfNotPresent"
242241
# drbdVersion: "v9.0.32-1"
243242
drbdVersion: {{ $.Values.ha.drbdVersion }}
@@ -252,7 +251,7 @@ spec:
252251
operator: DoesNotExist
253252
- key: node-role.kubernetes.io/control-plane
254253
operator: DoesNotExist
255-
chartVersion: "v0.4.0"
254+
chartVersion: "v0.4.1"
256255
storageClass:
257256
allowVolumeExpansion: true
258257
reclaimPolicy: "Delete"

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

Lines changed: 18 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,23 @@
11
global:
22
targetNamespace: hwameistor
33
notClaimDisk: false
4-
hwameistorImageRegistry: ghcr.m.daocloud.io
4+
hwameistorImageRegistry: ghcr.io
55
#hwameistorImageRegistry: ghcr.m.daocloud.io
6-
k8sImageRegistry: m.daocloud.io/registry.k8s.io
6+
k8sImageRegistry: registry.k8s.io
77
# k8sImageRegistry: m.daocloud.io/registry.k8s.io
8-
hwameistorVersion: v0.14.1
8+
hwameistorVersion: v0.14.3
99

1010
operator:
1111
replicas: 1
1212
imageRepository: hwameistor/operator
13-
tag: v0.14.4
14-
13+
tag: v0.14.6
14+
1515
localDiskManager:
1616
tolerationOnMaster: true
1717
kubeletRootDir: /var/lib/kubelet
1818
manager:
1919
imageRepository: hwameistor/local-disk-manager
20-
tag: v0.14.1
21-
resources:
22-
limits:
23-
cpu: 300m
24-
memory: 300Mi
25-
requests:
26-
cpu: 1m
27-
memory: 20Mi
20+
tag: v0.14.3
2821
csi:
2922
registrar:
3023
imageRepository: sig-storage/csi-node-driver-registrar
@@ -65,14 +58,7 @@ localStorage:
6558
kubeletRootDir: /var/lib/kubelet
6659
member:
6760
imageRepository: hwameistor/local-storage
68-
tag: v0.14.1
69-
resources:
70-
limits:
71-
cpu: 500m
72-
memory: 500Mi
73-
requests:
74-
cpu: 1m
75-
memory: 20Mi
61+
tag: v0.14.3
7662
hostPathSSHDir: /root/.ssh
7763
hostPathDRBDDir: /etc/drbd.d
7864
csi:
@@ -162,27 +148,13 @@ scheduler:
162148
disable: false
163149
replicas: 1
164150
imageRepository: hwameistor/scheduler
165-
tag: v0.14.1
166-
resources:
167-
limits:
168-
cpu: 300m
169-
memory: 300Mi
170-
requests:
171-
cpu: 1m
172-
memory: 20Mi
151+
tag: v0.14.3
173152

174153
admission:
175154
disable: false
176155
replicas: 1
177156
imageRepository: hwameistor/admission
178-
tag: v0.14.1
179-
resources:
180-
limits:
181-
cpu: 300m
182-
memory: 300Mi
183-
requests:
184-
cpu: 1m
185-
memory: 20Mi
157+
tag: v0.14.3
186158
# failurePolicy defines how unrecognized errors from the admission endpoint
187159
# are handled - allowed values are Ignore or Fail. Defaults to Fail.
188160
failurePolicy: "Ignore"
@@ -191,27 +163,13 @@ evictor:
191163
disable: true
192164
replicas: 0
193165
imageRepository: hwameistor/evictor
194-
tag: v0.14.1
195-
resources:
196-
limits:
197-
cpu: 300m
198-
memory: 300Mi
199-
requests:
200-
cpu: 1m
201-
memory: 20Mi
166+
tag: v0.14.3
202167

203168
apiserver:
204169
disable: false
205170
replicas: 1
206171
imageRepository: hwameistor/apiserver
207-
tag: v0.14.1
208-
resources:
209-
limits:
210-
cpu: 300m
211-
memory: 300Mi
212-
requests:
213-
cpu: 1m
214-
memory: 20Mi
172+
tag: v0.14.3
215173
authentication:
216174
enable: false
217175
accessId: admin
@@ -221,87 +179,45 @@ exporter:
221179
disable: false
222180
replicas: 1
223181
imageRepository: hwameistor/exporter
224-
tag: v0.14.1
225-
resources:
226-
limits:
227-
cpu: 300m
228-
memory: 300Mi
229-
requests:
230-
cpu: 1m
231-
memory: 20Mi
182+
tag: v0.14.3
232183

233184
auditor:
234185
disable: false
235186
replicas: 1
236187
imageRepository: hwameistor/auditor
237-
tag: v0.14.1
238-
resources:
239-
limits:
240-
cpu: 300m
241-
memory: 300Mi
242-
requests:
243-
cpu: 1m
244-
memory: 20Mi
188+
tag: v0.14.3
245189

246190
failoverAssistant:
247191
disable: false
248192
replicas: 1
249193
imageRepository: hwameistor/failover-assistant
250-
tag: v0.14.1
251-
resources:
252-
limits:
253-
cpu: 300m
254-
memory: 300Mi
255-
requests:
256-
cpu: 1m
257-
memory: 20Mi
194+
tag: v0.14.3
258195

259196
pvcAutoResizer:
260197
disable: false
261198
replicas: 1
262199
imageRepository: hwameistor/pvc-autoresizer
263-
tag: v0.14.1
264-
resources:
265-
limits:
266-
cpu: 300m
267-
memory: 300Mi
268-
requests:
269-
cpu: 1m
270-
memory: 20Mi
200+
tag: v0.14.3
271201

272202
localDiskActionController:
273203
disable: false
274204
replicas: 1
275205
imageRepository: hwameistor/local-disk-action-controller
276-
tag: v0.14.1
277-
resources:
278-
limits:
279-
cpu: 300m
280-
memory: 300Mi
281-
requests:
282-
cpu: 1m
283-
memory: 20Mi
206+
tag: v0.14.3
284207

285208
ui:
286209
disable: false
287210
replicas: 1
288211
imageRepository: hwameistor/hwameistor-ui
289-
tag: v0.15.1
290-
resources:
291-
limits:
292-
cpu: 300m
293-
memory: 300Mi
294-
requests:
295-
cpu: 1m
296-
memory: 20Mi
212+
tag: v0.16.0
297213

298214
ha:
299215
disable: false
300216
module: drbd
301217
deployOnMaster: "yes"
302218
imageRepository: hwameistor/drbd9-shipper
303219
drbdVersion: v9.0.32-1
304-
shipperChar: v0.4.0
220+
shipperChar: v0.4.1
305221

306222
drbdRhel7:
307223
imageRepository: hwameistor/drbd9-rhel7

0 commit comments

Comments
 (0)