use hwameistor v0.14.2, ha v0.4.1, ui v0.16.0

Signed-off-by: peng9808 <[email protected]>
hwameistor · Apr 7, 2024 · 53af4c4 · 53af4c4
1 parent 9d5c1c1
commit 53af4c4
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 37 deletions.
diff --git a/config/crd/bases/hwameistor.io_clusters.yaml b/config/crd/bases/hwameistor.io_clusters.yaml
@@ -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

diff --git a/go.mod b/go.mod
@@ -50,7 +50,7 @@ require (
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
 	github.com/google/uuid v1.1.2 // indirect
-	github.com/hwameistor/hwameistor v0.14.1
+	github.com/hwameistor/hwameistor v0.14.2
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect

diff --git a/go.sum b/go.sum
@@ -284,6 +284,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/hwameistor v0.14.1 h1:IChDIYnjx6y8RgUvjgIoY6ki+yX4Lwn5Ryjjd2x0tDM=
 github.com/hwameistor/hwameistor v0.14.1/go.mod h1:uuYPiN78aba8NgqQ2Wv35phP33VKIJ1YCOS8K5koJ/k=
+github.com/hwameistor/hwameistor v0.14.2 h1:8PYNeAgNJZBL4VImpTAZ0ankgAdAYp+uDjI8uLGeChs=
+github.com/hwameistor/hwameistor v0.14.2/go.mod h1:uuYPiN78aba8NgqQ2Wv35phP33VKIJ1YCOS8K5koJ/k=
 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=

diff --git a/helm/operator/.relok8s-images.yaml b/helm/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 }}_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 }}"

diff --git a/helm/operator/templates/hwameistorcluster.yaml b/helm/operator/templates/hwameistorcluster.yaml
@@ -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 }}
@@ -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"

diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml
@@ -5,7 +5,7 @@ global:
   #hwameistorImageRegistry: ghcr.m.daocloud.io
   k8sImageRegistry: registry.k8s.io
   # k8sImageRegistry: m.daocloud.io/registry.k8s.io
-  hwameistorVersion: v0.14.1
+  hwameistorVersion: v0.14.2
 
 operator:
   replicas: 1
@@ -17,7 +17,7 @@ localDiskManager:
   kubeletRootDir: /var/lib/kubelet
   manager:
     imageRepository: hwameistor/local-disk-manager
-    tag: v0.14.1
+    tag: v0.14.2
   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.1
+    tag: v0.14.2
     hostPathSSHDir: /root/.ssh
     hostPathDRBDDir: /etc/drbd.d
   csi:
@@ -78,13 +78,13 @@ scheduler:
   disable: false
   replicas: 1
   imageRepository: hwameistor/scheduler
-  tag: v0.14.1
+  tag: v0.14.2
 
 admission:
   disable: false
   replicas: 1
   imageRepository: hwameistor/admission
-  tag: v0.14.1
+  tag: v0.14.2
   # 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.1
+  tag: v0.14.2
 
 apiserver:
   disable: false
   replicas: 1
   imageRepository: hwameistor/apiserver
-  tag: v0.14.1
+  tag: v0.14.2
   authentication:
     enable: false
     accessId: admin
@@ -109,45 +109,45 @@ exporter:
   disable: false
   replicas: 1
   imageRepository: hwameistor/exporter
-  tag: v0.14.1
+  tag: v0.14.2
 
 auditor:
   disable: false
   replicas: 1
   imageRepository: hwameistor/auditor
-  tag: v0.14.1
+  tag: v0.14.2
 
 failoverAssistant:
   disable: false
   replicas: 1
   imageRepository: hwameistor/failover-assistant
-  tag: v0.14.1
+  tag: v0.14.2
 
 pvcAutoResizer:
   disable: false
   replicas: 1
   imageRepository: hwameistor/pvc-autoresizer
-  tag: v0.14.1
+  tag: v0.14.2
 
 localDiskActionController:
   disable: false
   replicas: 1
   imageRepository: hwameistor/local-disk-action-controller
-  tag: v0.14.1
+  tag: v0.14.2
 
 ui:
   disable: false
   replicas: 1
   imageRepository: hwameistor/hwameistor-ui
-  tag: v0.15.1
+  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

diff --git a/pkg/install/constants.go b/pkg/install/constants.go
@@ -1,3 +1,3 @@
 package install
 
-const DefaultHwameistorVersion = "v0.14.1"
+const DefaultHwameistorVersion = "v0.14.2"
diff --git a/pkg/install/drbd/drbd_adapter.go b/pkg/install/drbd/drbd_adapter.go
@@ -20,7 +20,7 @@ var defaultImageRegistry = "ghcr.io"
 var defaultShipperRepository = "hwameistor/drbd9-shipper"
 var defaultImagePullPolicy = "IfNotPresent"
 var defaultDRBDVersion = "v9.0.32-1"
-var defaultShipperChar = "v0.4.0"
+var defaultShipperChar = "v0.4.1"
 var defaultDRBDUpgrade = "no"
 var defaultCheckHostName = "no"
 var defaultUseAffinity = "no"
@@ -38,7 +38,7 @@ var defaultNodeSelectTerms = []corev1.NodeSelectorTerm{
 		},
 	},
 }
-var defaultChartVersion = "v0.4.0"
+var defaultChartVersion = "v0.4.1"
 
 var distroRegexMap = map[string]string{
 	"(red hat enterprise|centos|almalinux|rocky linux) .*7": "rhel7",

diff --git a/vendor/github.com/hwameistor/hwameistor/deploy/crds/hwameistor.io_localstoragenodes_crd.yaml b/vendor/github.com/hwameistor/hwameistor/deploy/crds/hwameistor.io_localstoragenodes_crd.yaml
diff --git a/...r/github.com/hwameistor/hwameistor/deploy/crds/hwameistor.io_localvolumemigrates_crd.yaml b/...r/github.com/hwameistor/hwameistor/deploy/crds/hwameistor.io_localvolumemigrates_crd.yaml
diff --git a/...r/github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localstoragenode_types.go b/...r/github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localstoragenode_types.go
diff --git a/...github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localvolumemigrate_types.go b/...github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localvolumemigrate_types.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -97,7 +97,7 @@ github.com/google/gofuzz
 # github.com/google/uuid v1.1.2
 ## explicit
 github.com/google/uuid
-# github.com/hwameistor/hwameistor v0.14.1
+# github.com/hwameistor/hwameistor v0.14.2
 ## explicit; go 1.18
 github.com/hwameistor/hwameistor/deploy/crds
 github.com/hwameistor/hwameistor/pkg/apis/client/clientset/versioned