update operator v0.14.7

Signed-off-by: peng9808 <[email protected]>

CHANGELOG.md

@@ -1,3 +1,10 @@
+v0.14.6 / 2024-6-25
+========================
+
+* Need to implement the installation of the two modules dataload-manager and dataset-manager #278 (@peng9808)
+* fix reinstalling RBAC bug #276 (@peng9808)
+* use hwameistor v0.14.5 #273 (@peng9808)
+
 v0.14.6 / 2024-4-30
 ========================
 

changelogs/released/v0.14.7/changelog

@@ -0,0 +1,6 @@
+v0.14.6 / 2024-6-25
+========================
+
+* Need to implement the installation of the two modules dataload-manager and dataset-manager #278 (@peng9808)
+* fix reinstalling RBAC bug #276 (@peng9808)
+* use hwameistor v0.14.5 #273 (@peng9808)

go.mod

@@ -3,7 +3,6 @@ module github.com/hwameistor/hwameistor-operator
 go 1.21.11
 
 require (
-	github.com/hwameistor/datastore v0.0.0-20240625063533-a8da393b4022
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/ginkgo/v2 v2.1.4
 	github.com/onsi/gomega v1.19.0

go.sum

@@ -317,8 +317,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/hwameistor/datastore v0.0.0-20240625063533-a8da393b4022 h1:ISKowQ2egPomev8juANJfLiBcFqA4csMs8106ViswXM=
-github.com/hwameistor/datastore v0.0.0-20240625063533-a8da393b4022/go.mod h1:KmL2ksVATXymfa4OnD8aUAL/39gRKj1SaTpDsP3SWEs=
+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.5 h1:5BP/U3xngzYD1YPX7wM6mq+HhoPNqBx/DtVkJVeXrcU=
 github.com/hwameistor/hwameistor v0.14.5/go.mod h1:/UJxAXQz3kBuBB5XPhBpEqgP95gpuRwHvYxtYUKSl+s=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

helm/operator/.relok8s-images.yaml

@@ -31,5 +31,7 @@
 - "{{ .global.hwameistorImageRegistry }}/{{ .drbdKylin10.imageRepository }}:{{ .ha.drbdVersion }}"
 - "{{ .global.hwameistorImageRegistry }}/{{ .drbdBionic.imageRepository }}:{{ .ha.drbdVersion }}"
 - "{{ .global.hwameistorImageRegistry }}/{{ .drbdFocal.imageRepository }}:{{ .ha.drbdVersion }}"
+- "{{ .global.hwameistorImageRegistry }}/{{ .dataLoadManager.imageRepository }}:{{ .dataLoadManager.tag }}"
+- "{{ .global.hwameistorImageRegistry }}/{{ .dataSetManager.imageRepository }}:{{ .dataSetManager.tag }}"
 
 # - "{{ .global.hwameistorImageRegistry }}/{{ .ha.imageRepoOwner }}/drbd9-jammy:v9.1.11"

helm/operator/Chart.yaml

@@ -16,11 +16,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: v0.14.6
+version: v0.14.7
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: v0.14.6
+appVersion: v0.14.7
 

helm/operator/values.yaml

@@ -10,7 +10,7 @@ global:
 operator:
   replicas: 1
   imageRepository: hwameistor/operator
-  tag: v0.14.6
+  tag: v0.14.7
 
 localDiskManager:
   tolerationOnMaster: true

pkg/install/dataloadmanager/dataloadmanager.go

@@ -20,7 +20,7 @@ var dlmDaemonSetLabelSelectorValue = "hwameistor-dataload-manager"
 var dlmContainerName = "dataload-manager"
 var defaultDLMDaemonsetImageRegistry = "ghcr.m.daocloud.io"
 var defaultDLMDaemonsetImageRepository = "hwameistor/dataload-manager"
-var defaultDLMDaemonsetImageTag = "v1.0.0"
+var defaultDLMDaemonsetImageTag = "v0.0.1"
 
 type DataLoadManagerMaintainer struct {
 	Client          client.Client

pkg/install/datasetmanager/datasetmanager.go

@@ -17,7 +17,7 @@ var dsmDeploymentLabelSelectorValue = "hwameistor-dataset-manager"
 var dsmContainerName = "dataset-manager"
 var defaultDSMDeploymentImageRegistry = "ghcr.m.daocloud.io"
 var defaultDSMDeploymentImageRepository = "hwameistor/dataset-manager"
-var defaultDSMDeploymentImageTag = "v1.0.0"
+var defaultDSMDeploymentImageTag = "v0.0.1"
 
 type DataSetManagerMaintainer struct {
 	Client          client.Client

test/e2e-test.sh

@@ -2,6 +2,7 @@
 
 set -x
 set -e
+source /etc/profile || true
 # git clone https://github.com/hwameistor/hwameistor.git test/hwameistor
 
 # common defines

test/pr-test.sh

@@ -5,6 +5,8 @@ export GOVC_RESOURCE_POOL="fupan-k8s"
 export hosts="fupan-k8s-master-1 fupan-k8s-work-1 fupan-k8s-work-2"
 export snapshot="e2etest"
 
+source /etc/profile || true
+
 for h in $hosts; do
   if [[ `govc vm.info $h | grep poweredOn | wc -l` -eq 1 ]]; then
     govc vm.power -off -force $h

vendor/modules.txt

@@ -97,7 +97,7 @@ github.com/google/gofuzz
 # github.com/google/uuid v1.5.0
 ## explicit
 github.com/google/uuid
-# github.com/hwameistor/datastore v0.0.0-20240625063533-a8da393b4022
+# github.com/hwameistor/datastore v0.0.1
 ## explicit; go 1.21.11
 github.com/hwameistor/datastore/deploy/crds
 # github.com/hwameistor/hwameistor v0.14.5