Merge branch 'master' into watch-scaler-crd

workingloong · Jan 17, 2023 · 22a3f16 · 22a3f16
2 parents 4297b76 + 3571ee3
commit 22a3f16
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 23,342 deletions.
diff --git a/dlrover/go/operator/README.md b/dlrover/go/operator/README.md
@@ -5,10 +5,10 @@ including the number of nodes, CPU and memory of each node.
 
 ## Description
 
-The operator contains 2 CRDs, `elasticjob` and `scaler`. Users don't need
+The operator contains 2 CRDs, `elasticjob` and `scaleplan`. Users don't need
 to set replica resource when they apply a `elasticjob` to train on a cluster.
 The `elasticjob` controller will create a EasyDL master Pod for each
-`elasticjob`. The master will generate a `scaler` with PS/worker resources
+`elasticjob`. The master will generate a `scaleplan` with PS/worker resources
 to notify the controller to launch Pods for the training.
 
 ## Getting Started

diff --git a/dlrover/go/operator/api/v1alpha1/elasticjob_types.go b/dlrover/go/operator/api/v1alpha1/elasticjob_types.go
@@ -84,8 +84,8 @@ type ElasticJobStatus struct {
 
  Phase commonv1.JobConditionType `json:"phase,omitempty"`
 
- // Scaler is a name of Scaler CRD to scale the job resource.
- Scaler string `json:"scaler,omitemtpy"`
+ // ScalePlan is a name of ScalePlan CRD to scale the job resource.
+ ScalePlan string `json:"scalePlan,omitempty"`
 }
 
 //+kubebuilder:object:root=true

diff --git a/dlrover/go/operator/api/v1alpha1/scaleplan_types.go b/dlrover/go/operator/api/v1alpha1/scaleplan_types.go
@@ -49,7 +49,7 @@ type ScaleSpec struct {
  // PsHosts are hosts of PS Pods
  PsHosts []string `json:"psHosts,omitempty"`
 
- // ManualScaling specifies the ScalerCRD created by users.
+ // ManualScaling specifies the ScalePlan created by users.
  ManualScaling bool `json:"manualScaling,omitempty"`
 
  // OwnerJob specifies a job to scale.

diff --git a/dlrover/go/operator/config/crd/bases/elastic.iml.github.io_elasticjobs.yaml b/dlrover/go/operator/config/crd/bases/elastic.iml.github.io_elasticjobs.yaml
@@ -7893,8 +7893,9 @@ spec:
  phase:
  description: JobConditionType defines all kinds of types of JobStatus.
  type: string
- scaler:
- description: Scaler is a name of Scaler CRD to scale the job resource.
+ scalePlan:
+ description: ScalePlan is a name of ScalePlan CRD to scale the job
+ resource.
  type: string
  status:
  description: JobStatus represents the current observed state of the
@@ -8036,8 +8037,6 @@ spec:
  - conditions
  - replicaStatuses
  type: object
- required:
- - scaler
  type: object
  type: object
  served: true

diff --git a/dlrover/go/operator/config/crd/bases/elastic.iml.github.io_scaleplans.yaml b/dlrover/go/operator/config/crd/bases/elastic.iml.github.io_scaleplans.yaml
@@ -75,7 +75,7 @@ spec:
  type: object
  type: array
  manualScaling:
- description: ManualScaling specifies the ScalerCRD created by users.
+ description: ManualScaling specifies the ScalePlan created by users.
  type: boolean
  migratePods:
  description: MigratePods are Pods to be migrated to other Pods with

diff --git a/dlrover/go/operator/config/crd/bases/elastic.iml.github.io_scalers.yaml b/dlrover/go/operator/config/crd/bases/elastic.iml.github.io_scalers.yaml