Skip to content

Commit

Permalink
Added dataset-manager installation module
Browse files Browse the repository at this point in the history
Signed-off-by: peng9808 <[email protected]>
  • Loading branch information
peng9808 committed Jun 25, 2024
1 parent f1c4ec7 commit 3ec16cc
Show file tree
Hide file tree
Showing 423 changed files with 26,198 additions and 7,882 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@


#_build
_build/

# Binaries for programs and plugins
*.exe
Expand Down Expand Up @@ -28,3 +29,7 @@ testbin/*

# Dependency directories (remove the comment below to include it)
# vendor/

# macOS system files
.DS_Store
helm/.DS_Store
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM centos:7
RUN yum upgrade nss -y

COPY ./vendor/github.com/hwameistor/hwameistor/deploy/crds /hwameistorcrds
COPY ./vendor/github.com/hwameistor/datastore/deploy/crds /hwameistorcrds
COPY ./scheduler-config.yaml /scheduler-config.yaml

COPY ./_build/operator /operator
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ e2e-test:
pr-test:
bash test/pr-test.sh





.PHONY: apis
apis:
make generate
make manifests
29 changes: 29 additions & 0 deletions api/v1alpha1/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ type ClusterSpec struct {
RBAC *RBACSpec `json:"rbac,omitempty"`

StorageClass *StorageClassSpec `json:"storageClass,omitempty"`

DataLoadManager *DataLoadManagerSpec `json:"dataLoadManager,omitempty"`

DataSetManager *DataSetManagerSpec `json:"dataSetManager,omitempty"`
}

type DiskReserveConfiguration struct {
Expand Down Expand Up @@ -245,6 +249,18 @@ type StorageClassSpec struct {
FSType string `json:"fsType,omitempty"`
}

type DataLoadManagerSpec struct {
Disable bool `json:"disable,omitempty"`
Common *PodCommonSpec `json:"common,omitempty"`
DataLoadManagerContainer *ContainerCommonSpec `json:"dataLoadManagerContainer,omitempty"`
}

type DataSetManagerSpec struct {
Disable bool `json:"disable,omitempty"`
Common *PodCommonSpec `json:"common,omitempty"`
DataSetManagerContainer *ContainerCommonSpec `json:"dataSetManagerContainer,omitempty"`
}

// ClusterStatus defines the observed state of Cluster
type ClusterStatus struct {
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
Expand All @@ -254,6 +270,7 @@ type ClusterStatus struct {
DRBDAdapterCreated bool `json:"drbdAdapterCreated"`
DRBDAdapterCreatedJobNum int `json:"drbdAdapterCreatedJobNum"`
DiskReserveState string `json:"diskReserveState,omitempty"`
DatasetDefaultPoolClass string `json:"datasetDefaultPoolClass,omitempty"`
Phase string `json:"phase,omitempty"`
ComponentStatus ComponentStatus `json:"componentStatus"`
}
Expand All @@ -270,6 +287,8 @@ type ComponentStatus struct {
PVCAutoResizer *PVCAutoResizerStatus `json:"pvcAutoResizer,omitempty"`
LocalDiskActionController *LocalDiskActionControllerStatus `json:"localDiskActionController,omitempty"`
Exporter *ExporterStatus `json:"exporter,omitempty"`
DataLoadManager *DataLoadManagerStatus `json:"dataLoadManager,omitempty"`
DataSetManager *DataSetManagerStatus `json:"dataSetManager,omitempty"`
}

type DeployStatus struct {
Expand Down Expand Up @@ -343,6 +362,16 @@ type ExporterStatus struct {
Health string `json:"health,omitempty"`
}

type DataLoadManagerStatus struct {
Instances *DeployStatus `json:"instances,omitempty"`
Health string `json:"health,omitempty"`
}

type DataSetManagerStatus struct {
Instances *DeployStatus `json:"instances,omitempty"`
Health string `json:"health,omitempty"`
}

//+kubebuilder:object:root=true
//+kubebuilder:subresource:status

Expand Down
115 changes: 115 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3ec16cc

Please sign in to comment.