Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updata hwameistor-operator v0.14.6 #132

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/hwameistor-operator/config
Original file line number Diff line number Diff line change
Expand Up @@ -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.14.6

# push to daocloud repo
export DAOCLOUD_REPO_PROJECT=addon
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- "{{ .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 }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.1"
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}:{{ .ha.drbdVersion }}"
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}:{{ .ha.drbdVersion }}"
- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}:{{ .ha.drbdVersion }}"
Expand Down
8 changes: 2 additions & 6 deletions charts/hwameistor-operator/hwameistor-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
apiVersion: v2
appVersion: v0.14.4
appVersion: v0.14.6
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.14.6
Original file line number Diff line number Diff line change
Expand Up @@ -1948,15 +1948,12 @@ spec:
properties:
shipper:
properties:
image:
properties:
registry:
type: string
repository:
type: string
tag:
type: string
type: object
registry:
type: string
repository:
type: string
tag:
type: string
type: object
chartVersion:
type: string
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,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 }}
Expand All @@ -252,7 +251,7 @@ spec:
operator: DoesNotExist
- key: node-role.kubernetes.io/control-plane
operator: DoesNotExist
chartVersion: "v0.4.0"
chartVersion: "v0.4.1"
storageClass:
allowVolumeExpansion: true
reclaimPolicy: "Delete"
Expand Down
124 changes: 20 additions & 104 deletions charts/hwameistor-operator/hwameistor-operator/values.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
global:
targetNamespace: hwameistor
notClaimDisk: false
#hwameistorImageRegistry: ghcr.io
hwameistorImageRegistry: ghcr.m.daocloud.io
#hwameistorImageRegistry: ghcr.m.daocloud.io
k8sImageRegistry: m.daocloud.io/registry.k8s.io
# k8sImageRegistry: m.daocloud.io/registry.k8s.io
hwameistorVersion: v0.14.1
#k8sImageRegistry: registry.k8s.io
k8sImageRegistry: k8s.m.daocloud.io
hwameistorVersion: v0.14.3

operator:
replicas: 1
imageRepository: hwameistor/operator
tag: v0.14.4
tag: v0.14.6

localDiskManager:
tolerationOnMaster: true
kubeletRootDir: /var/lib/kubelet
manager:
imageRepository: hwameistor/local-disk-manager
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3
csi:
registrar:
imageRepository: sig-storage/csi-node-driver-registrar
Expand Down Expand Up @@ -65,14 +58,7 @@ localStorage:
kubeletRootDir: /var/lib/kubelet
member:
imageRepository: hwameistor/local-storage
tag: v0.14.1
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3
hostPathSSHDir: /root/.ssh
hostPathDRBDDir: /etc/drbd.d
csi:
Expand Down Expand Up @@ -162,27 +148,13 @@ scheduler:
disable: false
replicas: 1
imageRepository: hwameistor/scheduler
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

admission:
disable: false
replicas: 1
imageRepository: hwameistor/admission
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3
# failurePolicy defines how unrecognized errors from the admission endpoint
# are handled - allowed values are Ignore or Fail. Defaults to Fail.
failurePolicy: "Ignore"
Expand All @@ -191,27 +163,13 @@ evictor:
disable: true
replicas: 0
imageRepository: hwameistor/evictor
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

apiserver:
disable: false
replicas: 1
imageRepository: hwameistor/apiserver
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3
authentication:
enable: false
accessId: admin
Expand All @@ -221,87 +179,45 @@ exporter:
disable: false
replicas: 1
imageRepository: hwameistor/exporter
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

auditor:
disable: false
replicas: 1
imageRepository: hwameistor/auditor
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

failoverAssistant:
disable: false
replicas: 1
imageRepository: hwameistor/failover-assistant
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

pvcAutoResizer:
disable: false
replicas: 1
imageRepository: hwameistor/pvc-autoresizer
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

localDiskActionController:
disable: false
replicas: 1
imageRepository: hwameistor/local-disk-action-controller
tag: v0.14.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.14.3

ui:
disable: false
replicas: 1
imageRepository: hwameistor/hwameistor-ui
tag: v0.15.1
resources:
limits:
cpu: 300m
memory: 300Mi
requests:
cpu: 1m
memory: 20Mi
tag: v0.16.0

ha:
disable: false
module: drbd
deployOnMaster: "yes"
imageRepository: hwameistor/drbd9-shipper
drbdVersion: v9.0.32-1
shipperChar: v0.4.0
shipperChar: v0.4.1

drbdRhel7:
imageRepository: hwameistor/drbd9-rhel7
Expand Down Expand Up @@ -340,4 +256,4 @@ drbdFocal:

preHookJob:
imageRepository: dtzar/helm-kubectl
tag: 3.9
tag: 3.9
Loading