diff --git a/go.mod b/go.mod index edae90a8..ec8ac590 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ module github.com/hwameistor/hwameistor-operator -go 1.17 +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 @@ -12,8 +13,8 @@ require ( ) require ( - github.com/hwameistor/datastore v0.0.0-20240613033429-35e712326d4d - github.com/hwameistor/hwameistor v0.14.4 + github.com/hwameistor/datastore v0.0.1 + github.com/hwameistor/hwameistor v0.14.5 github.com/sirupsen/logrus v1.9.3 k8s.io/api v0.26.0 k8s.io/apiextensions-apiserver v0.23.0 diff --git a/go.sum b/go.sum index 6f06a2f1..7190ad04 100644 --- a/go.sum +++ b/go.sum @@ -317,10 +317,10 @@ 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-20240613033429-35e712326d4d h1:9sO715yVL5S6gAvaCZPQCEEF/oIRjrjAUjhPqNF9vZ4= -github.com/hwameistor/datastore v0.0.0-20240613033429-35e712326d4d/go.mod h1:7cc6H7Tvnp9afDstUBNVJtNEM+1LSfM+GN/utl4xf48= -github.com/hwameistor/hwameistor v0.14.4 h1:MKblPQraGLp0NUWuS7+jTv0yIGhR411sagYppbjeziY= -github.com/hwameistor/hwameistor v0.14.4/go.mod h1:d+J2bzNIU2UFIKaihRK3rh2gN45NJcOA6D4Qv2fiEi4= +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/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= 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= @@ -355,6 +355,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= @@ -461,6 +462,7 @@ github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6So github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -554,6 +556,7 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml index 6d62d781..b18e2fc6 100644 --- 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.3 + hwameistorVersion: v0.14.5 operator: replicas: 1 @@ -17,7 +17,7 @@ localDiskManager: kubeletRootDir: /var/lib/kubelet manager: imageRepository: hwameistor/local-disk-manager - tag: v0.14.3 + tag: v0.14.5 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.3 + tag: v0.14.5 hostPathSSHDir: /root/.ssh hostPathDRBDDir: /etc/drbd.d csi: @@ -78,13 +78,13 @@ scheduler: disable: false replicas: 1 imageRepository: hwameistor/scheduler - tag: v0.14.3 + tag: v0.14.5 admission: disable: false replicas: 1 imageRepository: hwameistor/admission - tag: v0.14.3 + tag: v0.14.5 # 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.3 + tag: v0.14.5 apiserver: disable: false replicas: 1 imageRepository: hwameistor/apiserver - tag: v0.14.3 + tag: v0.14.5 authentication: enable: false accessId: admin @@ -109,31 +109,31 @@ exporter: disable: false replicas: 1 imageRepository: hwameistor/exporter - tag: v0.14.3 + tag: v0.14.5 auditor: disable: false replicas: 1 imageRepository: hwameistor/auditor - tag: v0.14.3 + tag: v0.14.5 failoverAssistant: disable: false replicas: 1 imageRepository: hwameistor/failover-assistant - tag: v0.14.3 + tag: v0.14.5 pvcAutoResizer: disable: false replicas: 1 imageRepository: hwameistor/pvc-autoresizer - tag: v0.14.3 + tag: v0.14.5 localDiskActionController: disable: false replicas: 1 imageRepository: hwameistor/local-disk-action-controller - tag: v0.14.3 + tag: v0.14.5 ui: disable: false @@ -171,13 +171,13 @@ dataLoadManager: disable: true tolerationOnMaster: true imageRepository: hwameistor/dataload-manager - tag: v1.0.0 + tag: v0.0.1 dataSetManager: disable: true tolerationOnMaster: true imageRepository: hwameistor/dataset-manager - tag: v1.0.0 + tag: v0.0.1 #datasetDefaultPoolClass: NVMe > SSD > HDD diff --git a/pkg/install/constants.go b/pkg/install/constants.go index 9cf347d2..ab1a4315 100644 --- a/pkg/install/constants.go +++ b/pkg/install/constants.go @@ -1,3 +1,3 @@ package install -const DefaultHwameistorVersion = "v0.14.3" +const DefaultHwameistorVersion = "v0.14.5" diff --git a/tool.go b/tool.go index d248c03f..b131dfb6 100644 --- a/tool.go +++ b/tool.go @@ -1,4 +1,5 @@ package main //import _ "github.com/hwameistor/datastore/deploy/crds" + //import _ "github.com/hwameistor/hwameistor/deploy/crds" diff --git a/vendor/github.com/hwameistor/datastore/deploy/crds/datastore.io_datasets_crd.yaml b/vendor/github.com/hwameistor/datastore/deploy/crds/datastore.io_datasets_crd.yaml index f4911e31..a4e73fe2 100644 --- a/vendor/github.com/hwameistor/datastore/deploy/crds/datastore.io_datasets_crd.yaml +++ b/vendor/github.com/hwameistor/datastore/deploy/crds/datastore.io_datasets_crd.yaml @@ -57,6 +57,9 @@ spec: spec: description: DataSetSpec defines the desired state of DataSet properties: + capacityBytes: + format: int64 + type: integer ftp: properties: dir: diff --git a/vendor/github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localvolume_types.go b/vendor/github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localvolume_types.go index 84fbd8c7..7625d7aa 100644 --- a/vendor/github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localvolume_types.go +++ b/vendor/github.com/hwameistor/hwameistor/pkg/apis/hwameistor/v1alpha1/localvolume_types.go @@ -90,6 +90,15 @@ func (at *AccessibilityTopology) Equal(peer *AccessibilityTopology) bool { return true } +func (at *AccessibilityTopology) NodeExist(node string) bool { + for _, n := range at.Nodes { + if n == node { + return true + } + } + return false +} + func IsStringArraysEqual(arr1, arr2 []string) bool { if len(arr1) != len(arr2) { return false @@ -178,6 +187,15 @@ func (vc *VolumeConfig) DeepEqual(peer *VolumeConfig) bool { return true } +func (vc *VolumeConfig) ExistReplicaOnNode(nodeName string) bool { + for _, replica := range vc.Replicas { + if replica.Hostname == nodeName { + return true + } + } + return false +} + // VolumeReplica contains informations of replica peer type VolumeReplica struct { ID int `json:"id"` diff --git a/vendor/modules.txt b/vendor/modules.txt index 0c6a658c..776cf29b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -97,11 +97,11 @@ github.com/google/gofuzz # github.com/google/uuid v1.5.0 ## explicit github.com/google/uuid -# github.com/hwameistor/datastore v0.0.0-20240613033429-35e712326d4d -## explicit; go 1.20 +# github.com/hwameistor/datastore v0.0.0-20240625063533-a8da393b4022 +## explicit; go 1.21.11 github.com/hwameistor/datastore/deploy/crds -# github.com/hwameistor/hwameistor v0.14.4 -## explicit; go 1.18 +# github.com/hwameistor/hwameistor v0.14.5 +## explicit; go 1.20 github.com/hwameistor/hwameistor/deploy/crds github.com/hwameistor/hwameistor/pkg/apis/client/clientset/versioned github.com/hwameistor/hwameistor/pkg/apis/client/clientset/versioned/scheme