From 75d81cbff3c6fa60aa1f5b2085d5ff16d186e1e9 Mon Sep 17 00:00:00 2001 From: peng9808 Date: Mon, 11 Mar 2024 15:20:38 +0800 Subject: [PATCH 1/3] update hwameistor-operator v0.14.2 Signed-off-by: peng9808 --- charts/hwameistor-operator/config | 2 +- .../hwameistor-operator/.relok8s-images.yaml | 15 ++++++------ .../hwameistor-operator/Chart.yaml | 4 ++-- .../crds/hwameistor.io_clusters.yaml | 12 ++++++++++ .../templates/hwameistorcluster.yaml | 8 ++++--- .../hwameistor-operator/values.yaml | 23 +++++++++++++++++-- 6 files changed, 49 insertions(+), 15 deletions(-) diff --git a/charts/hwameistor-operator/config b/charts/hwameistor-operator/config index e85fdb0..9bff14e 100644 --- a/charts/hwameistor-operator/config +++ b/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.1 +export VERSION=v0.14.2 # push to daocloud repo export DAOCLOUD_REPO_PROJECT=addon diff --git a/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml b/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml index f93ee6a..f08bec0 100644 --- a/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml @@ -24,11 +24,12 @@ - "{{ .global.hwameistorImageRegistry }}/{{ .ui.imageRepository }}:{{ .ui.tag }}" - "{{ .global.hwameistorImageRegistry }}/{{ .operator.imageRepository }}:{{ .operator.tag }}" - "{{ .global.hwameistorImageRegistry }}/{{ .preHookJob.imageRepository }}:{{ .preHookJob.tag }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-shipper:{{ .ha.drbdVersion }}_v0.3.6" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-rhel7:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-rhel8:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-rhel9:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-kylin10:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-bionic:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-focal:{{ .ha.drbdVersion }}" +- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_{{.ha.shipperChar}}" +- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}/drbd9-bionic:{{ .ha.drbdVersion }}" +- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}/drbd9-rhel7:{{ .ha.drbdVersion }}" +- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}/drbd9-rhel8:{{ .ha.drbdVersion }}" +- "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}/drbd9-rhel9:{{ .ha.drbdVersion }}" +- "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}/drbd9-kylin10:{{ .ha.drbdVersion }}" +- "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}/drbd9-bionic:{{ .ha.drbdVersion }}" + # - "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-jammy:v9.1.11" diff --git a/charts/hwameistor-operator/hwameistor-operator/Chart.yaml b/charts/hwameistor-operator/hwameistor-operator/Chart.yaml index f0d46b0..fa7ea5a 100644 --- a/charts/hwameistor-operator/hwameistor-operator/Chart.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -appVersion: v0.14.1 +appVersion: v0.14.2 description: A Helm chart for Hwameistor Operator icon: https://hwameistor.io/img/logo.svg name: hwameistor-operator type: application -version: v0.14.1 +version: v0.14.2 keywords: - storage - local diff --git a/charts/hwameistor-operator/hwameistor-operator/crds/hwameistor.io_clusters.yaml b/charts/hwameistor-operator/hwameistor-operator/crds/hwameistor.io_clusters.yaml index 239d8cb..92ef056 100644 --- a/charts/hwameistor-operator/hwameistor-operator/crds/hwameistor.io_clusters.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/crds/hwameistor.io_clusters.yaml @@ -1946,6 +1946,18 @@ spec: type: array drbd: properties: + shipper: + properties: + image: + properties: + registry: + type: string + repository: + type: string + tag: + type: string + type: object + type: object chartVersion: type: string checkHostName: diff --git a/charts/hwameistor-operator/hwameistor-operator/templates/hwameistorcluster.yaml b/charts/hwameistor-operator/hwameistor-operator/templates/hwameistorcluster.yaml index c8372fb..3cfe190 100644 --- a/charts/hwameistor-operator/hwameistor-operator/templates/hwameistorcluster.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/templates/hwameistorcluster.yaml @@ -233,9 +233,11 @@ spec: disable: true {{- end }} deployOnMaster: {{ $.Values.ha.deployOnMaster | quote }} - imageRegistry: {{ $.Values.global.hwameistorImageRegistry }} - # imageRepoOwner: "hwameistor" - imageRepoOwner: {{ $.Values.ha.imageRepoOwner }} + shipper: + image: + registry: {{ $.Values.global.hwameistorImageRegistry }} + repository: {{.Values.ha.imageRepository}} + tag: {{$.Values.ha.shipperChar}} imagePullPolicy: "IfNotPresent" # drbdVersion: "v9.0.32-1" drbdVersion: {{ $.Values.ha.drbdVersion }} diff --git a/charts/hwameistor-operator/hwameistor-operator/values.yaml b/charts/hwameistor-operator/hwameistor-operator/values.yaml index 37496c1..baf477f 100644 --- a/charts/hwameistor-operator/hwameistor-operator/values.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/values.yaml @@ -10,7 +10,7 @@ global: operator: replicas: 1 imageRepository: hwameistor/operator - tag: v0.14.1 + tag: v0.14.2 localDiskManager: tolerationOnMaster: true @@ -299,8 +299,27 @@ ha: disable: false module: drbd deployOnMaster: "yes" - imageRepoOwner: hwameistor + imageRepository: hwameistor/drbd9-shipper drbdVersion: v9.0.32-1 + shipperChar: v0.4.0 + +drbdRhel7: + imageRepository: hwameistor/drbd9-rhel7 + +drbdRhel8: + imageRepository: hwameistor/drbd9-rhel8 + +drbdRhel9: + imageRepository: hwameistor/drbd9-rhel9 + +drbdKylin10: + imageRepository: hwameistor/drbd9-kylin10 + +drbdBionic: + imageRepository: hwameistor/drbd9-bionic + +drbdFocal: + imageRepository: hwameistor/drbd9-focal # diskReserve example # diskReserve: From 369e4113ead5951e2642b54111e83e785e39f68f Mon Sep 17 00:00:00 2001 From: peng9808 Date: Tue, 12 Mar 2024 15:04:51 +0800 Subject: [PATCH 2/3] update hwameisto-operator-v0.14.3 --- charts/hwameistor-operator/config | 2 +- .../hwameistor-operator/.relok8s-images.yaml | 2 +- charts/hwameistor-operator/hwameistor-operator/Chart.yaml | 4 ++-- charts/hwameistor-operator/hwameistor-operator/values.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/charts/hwameistor-operator/config b/charts/hwameistor-operator/config index 9bff14e..8438f9b 100644 --- a/charts/hwameistor-operator/config +++ b/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.2 +export VERSION=v0.14.3 # push to daocloud repo export DAOCLOUD_REPO_PROJECT=addon diff --git a/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml b/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml index f08bec0..6e43cf6 100644 --- a/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml @@ -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 }}_{{.ha.shipperChar}}" +- "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepository }}:{{ .ha.drbdVersion }}_v0.4.0" - "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel7.imageRepository }}/drbd9-bionic:{{ .ha.drbdVersion }}" - "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}/drbd9-rhel7:{{ .ha.drbdVersion }}" - "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}/drbd9-rhel8:{{ .ha.drbdVersion }}" diff --git a/charts/hwameistor-operator/hwameistor-operator/Chart.yaml b/charts/hwameistor-operator/hwameistor-operator/Chart.yaml index fa7ea5a..0fb1607 100644 --- a/charts/hwameistor-operator/hwameistor-operator/Chart.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -appVersion: v0.14.2 +appVersion: v0.14.3 description: A Helm chart for Hwameistor Operator icon: https://hwameistor.io/img/logo.svg name: hwameistor-operator type: application -version: v0.14.2 +version: v0.14.3 keywords: - storage - local diff --git a/charts/hwameistor-operator/hwameistor-operator/values.yaml b/charts/hwameistor-operator/hwameistor-operator/values.yaml index baf477f..6f75c0b 100644 --- a/charts/hwameistor-operator/hwameistor-operator/values.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/values.yaml @@ -10,7 +10,7 @@ global: operator: replicas: 1 imageRepository: hwameistor/operator - tag: v0.14.2 + tag: v0.14.3 localDiskManager: tolerationOnMaster: true From cc218955212fba346d487e2d24387c940828d25c Mon Sep 17 00:00:00 2001 From: peng9808 Date: Wed, 13 Mar 2024 09:24:59 +0800 Subject: [PATCH 3/3] update hwameistor-operator v0.14.4 --- charts/hwameistor-operator/config | 2 +- .../hwameistor-operator/.relok8s-images.yaml | 12 ++++++------ .../hwameistor-operator/Chart.yaml | 4 ++-- .../hwameistor-operator/values.yaml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/hwameistor-operator/config b/charts/hwameistor-operator/config index 8438f9b..460f6e0 100644 --- a/charts/hwameistor-operator/config +++ b/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.3 +export VERSION=v0.14.4 # push to daocloud repo export DAOCLOUD_REPO_PROJECT=addon diff --git a/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml b/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml index 6e43cf6..22f3a2b 100644 --- a/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/.relok8s-images.yaml @@ -25,11 +25,11 @@ - "{{ .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 }}/drbd9-bionic:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel8.imageRepository }}/drbd9-rhel7:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .drbdRhel9.imageRepository }}/drbd9-rhel8:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}/drbd9-rhel9:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}/drbd9-kylin10:{{ .ha.drbdVersion }}" -- "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}/drbd9-bionic:{{ .ha.drbdVersion }}" +- "{{ .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.imageRepoOwner }}/drbd9-jammy:v9.1.11" diff --git a/charts/hwameistor-operator/hwameistor-operator/Chart.yaml b/charts/hwameistor-operator/hwameistor-operator/Chart.yaml index 0fb1607..d5c375b 100644 --- a/charts/hwameistor-operator/hwameistor-operator/Chart.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/Chart.yaml @@ -1,10 +1,10 @@ apiVersion: v2 -appVersion: v0.14.3 +appVersion: v0.14.4 description: A Helm chart for Hwameistor Operator icon: https://hwameistor.io/img/logo.svg name: hwameistor-operator type: application -version: v0.14.3 +version: v0.14.4 keywords: - storage - local diff --git a/charts/hwameistor-operator/hwameistor-operator/values.yaml b/charts/hwameistor-operator/hwameistor-operator/values.yaml index 6f75c0b..c9adf80 100644 --- a/charts/hwameistor-operator/hwameistor-operator/values.yaml +++ b/charts/hwameistor-operator/hwameistor-operator/values.yaml @@ -10,7 +10,7 @@ global: operator: replicas: 1 imageRepository: hwameistor/operator - tag: v0.14.3 + tag: v0.14.4 localDiskManager: tolerationOnMaster: true