Merge pull request #300 from peng9808/main

use hwameistor v0.14.7

go.mod

@@ -13,7 +13,7 @@ require (
 
 require (
 	github.com/hwameistor/datastore v0.0.1
-	github.com/hwameistor/hwameistor v0.14.6
+	github.com/hwameistor/hwameistor v0.14.7
 	github.com/sirupsen/logrus v1.9.3
 	k8s.io/api v0.26.0
 	k8s.io/apiextensions-apiserver v0.23.0

go.sum

@@ -319,8 +319,8 @@ github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/J
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/hwameistor/datastore v0.0.1 h1:X8l4QxwRXNv2SBz5g4YrM8XJauLjpk6F9xtO/3rMy0c=
 github.com/hwameistor/datastore v0.0.1/go.mod h1:KmL2ksVATXymfa4OnD8aUAL/39gRKj1SaTpDsP3SWEs=
-github.com/hwameistor/hwameistor v0.14.6 h1:qaMe5E/nz1hH3cUkTzmFlRe4EkSh1XUmfxia2n2Sp3I=
-github.com/hwameistor/hwameistor v0.14.6/go.mod h1:/UJxAXQz3kBuBB5XPhBpEqgP95gpuRwHvYxtYUKSl+s=
+github.com/hwameistor/hwameistor v0.14.7 h1:LBvN5N2K9tJJFeb2dKLeMnv8fWKImLodu43xmEkeJsw=
+github.com/hwameistor/hwameistor v0.14.7/go.mod h1:/UJxAXQz3kBuBB5XPhBpEqgP95gpuRwHvYxtYUKSl+s=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=

helm/operator/.relok8s-images.yaml

@@ -24,13 +24,13 @@
 - "{{ .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.1"
-- "{{ .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 }}"

helm/operator/templates/hwameistorcluster.yaml

@@ -252,7 +252,7 @@ spec:
             operator: DoesNotExist
           - key: node-role.kubernetes.io/control-plane
             operator: DoesNotExist
-    chartVersion: "v0.4.1"
+    chartVersion: "v0.4.2"
   storageClass:
     allowVolumeExpansion: {{ $.Values.storageClass.allowVolumeExpansion }}
     reclaimPolicy: {{ $.Values.storageClass.reclaimPolicy }}

helm/operator/values.yaml

@@ -5,7 +5,7 @@ global:
   #hwameistorImageRegistry: ghcr.m.daocloud.io
   k8sImageRegistry: registry.k8s.io
   # k8sImageRegistry: k8s.m.daocloud.io
-  hwameistorVersion: v0.14.6
+  hwameistorVersion: v0.14.7
 
 operator:
   replicas: 1
@@ -17,7 +17,7 @@ localDiskManager:
   kubeletRootDir: /var/lib/kubelet
   manager:
     imageRepository: hwameistor/local-disk-manager
-    tag: v0.14.6
+    tag: v0.14.7
   csi:
     registrar:
       imageRepository: sig-storage/csi-node-driver-registrar
@@ -37,7 +37,7 @@ localStorage:
   kubeletRootDir: /var/lib/kubelet
   member:
     imageRepository: hwameistor/local-storage
-    tag: v0.14.6
+    tag: v0.14.7
     hostPathSSHDir: /root/.ssh
     hostPathDRBDDir: /etc/drbd.d
   csi:
@@ -78,13 +78,13 @@ scheduler:
   disable: false
   replicas: 1
   imageRepository: hwameistor/scheduler
-  tag: v0.14.6
+  tag: v0.14.7
 
 admission:
   disable: false
   replicas: 1
   imageRepository: hwameistor/admission
-  tag: v0.14.6
+  tag: v0.14.7
   # failurePolicy defines how unrecognized errors from the admission endpoint
   # are handled - allowed values are Ignore or Fail. Defaults to Fail.
   failurePolicy: "Ignore"
@@ -93,13 +93,13 @@ evictor:
   disable: true
   replicas: 0
   imageRepository: hwameistor/evictor
-  tag: v0.14.6
+  tag: v0.14.7
 
 apiserver:
   disable: false
   replicas: 1
   imageRepository: hwameistor/apiserver
-  tag: v0.14.6
+  tag: v0.14.7
   authentication:
     enable: false
     accessId: admin
@@ -109,45 +109,45 @@ exporter:
   disable: false
   replicas: 1
   imageRepository: hwameistor/exporter
-  tag: v0.14.6
+  tag: v0.14.7
 
 auditor:
   disable: false
   replicas: 1
   imageRepository: hwameistor/auditor
-  tag: v0.14.6
+  tag: v0.14.7
 
 failoverAssistant:
   disable: false
   replicas: 1
   imageRepository: hwameistor/failover-assistant
-  tag: v0.14.6
+  tag: v0.14.7
 
 pvcAutoResizer:
   disable: false
   replicas: 1
   imageRepository: hwameistor/pvc-autoresizer
-  tag: v0.14.6
+  tag: v0.14.7
 
 localDiskActionController:
   disable: false
   replicas: 1
   imageRepository: hwameistor/local-disk-action-controller
-  tag: v0.14.6
+  tag: v0.14.7
 
 ui:
   disable: false
   replicas: 1
   imageRepository: hwameistor/hwameistor-ui
-  tag: v0.16.0
+  tag: v0.16.1
 
 ha:
   disable: false
   module: drbd
   deployOnMaster: "yes"
   imageRepository: hwameistor/drbd9-shipper
   drbdVersion: v9.0.32-1
-  shipperChar: v0.4.1
+  shipperChar: v0.4.2
 
 drbdRhel7:
   imageRepository: hwameistor/drbd9-rhel7

pkg/install/drbd/drbd_adapter.go

@@ -22,7 +22,7 @@ var defaultImageRegistry = "ghcr.io"
 var defaultShipperRepository = "hwameistor/drbd9-shipper"
 var defaultImagePullPolicy = "IfNotPresent"
 var defaultDRBDVersion = "v9.0.32-1"
-var defaultShipperChar = "v0.4.1"
+var defaultShipperChar = "v0.4.2"
 var defaultDRBDUpgrade = "no"
 var defaultCheckHostName = "no"
 var defaultUseAffinity = "no"
@@ -40,7 +40,7 @@ var defaultNodeSelectTerms = []corev1.NodeSelectorTerm{
 		},
 	},
 }
-var defaultChartVersion = "v0.4.1"
+var defaultChartVersion = "v0.4.2"
 
 var distroRegexMap = map[string]string{
 	"(red hat enterprise|centos|almalinux|rocky linux) .*7": "rhel7",
@@ -166,7 +166,7 @@ func CreateDRBDForNode(cli client.Client, node *corev1.Node, ownerReference []v1
 						},
 						{
 							Name:            distro,
-							Image:           shapperImageRegistry + "/" + distroImageRepository + ":" + tag,
+							Image:           shapperImageRegistry + "/" + distroImageRepository + ":" + tag + "_" + shipperChar,
 							ImagePullPolicy: corev1.PullPolicy(imagePullPolicy),
 							Command: []string{
 								"/pkgs/entrypoint.adapter.sh",

vendor/modules.txt

@@ -100,7 +100,7 @@ github.com/google/uuid
 # github.com/hwameistor/datastore v0.0.1
 ## explicit; go 1.21.11
 github.com/hwameistor/datastore/deploy/crds
-# github.com/hwameistor/hwameistor v0.14.6
+# github.com/hwameistor/hwameistor v0.14.7
 ## explicit; go 1.20
 github.com/hwameistor/hwameistor/deploy/crds
 github.com/hwameistor/hwameistor/pkg/apis/client/clientset/versioned