Easier twophase controller (#1221)

chaos-mesh · Dec 15, 2020 · b0e257c · b0e257c
1 parent 79d05c6
commit b0e257c
Show file tree

Hide file tree

Showing 19 changed files with 707 additions and 336 deletions.
diff --git a/api/v1alpha1/common_types.go b/api/v1alpha1/common_types.go
@@ -111,10 +111,7 @@ const (
 )
 
 type ChaosStatus struct {
-	// Phase is the chaos status.
-	Phase         ChaosPhase `json:"phase"`
-	Reason        string     `json:"reason,omitempty"`
-	FailedMessage string     `json:"failedMessage,omitempty"`
+	FailedMessage string `json:"failedMessage,omitempty"`
 
 	Scheduler ScheduleStatus `json:"scheduler,omitempty"`
 
@@ -175,11 +172,12 @@ type ScheduleStatus struct {
 type ExperimentPhase string
 
 const (
-	ExperimentPhaseRunning  ExperimentPhase = "Running"
-	ExperimentPhaseWaiting  ExperimentPhase = "Waiting"
-	ExperimentPhasePaused   ExperimentPhase = "Paused"
-	ExperimentPhaseFailed   ExperimentPhase = "Failed"
-	ExperimentPhaseFinished ExperimentPhase = "Finished"
+	ExperimentPhaseUninitialized ExperimentPhase = ""
+	ExperimentPhaseRunning       ExperimentPhase = "Running"
+	ExperimentPhaseWaiting       ExperimentPhase = "Waiting"
+	ExperimentPhasePaused        ExperimentPhase = "Paused"
+	ExperimentPhaseFailed        ExperimentPhase = "Failed"
+	ExperimentPhaseFinished      ExperimentPhase = "Finished"
 )
 
 type ExperimentStatus struct {

diff --git a/config/crd/bases/chaos-mesh.org_dnschaos.yaml b/config/crd/bases/chaos-mesh.org_dnschaos.yaml
@@ -198,11 +198,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -217,7 +212,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/config/crd/bases/chaos-mesh.org_httpchaos.yaml b/config/crd/bases/chaos-mesh.org_httpchaos.yaml
@@ -222,11 +222,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -241,7 +236,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       type: object
   version: v1alpha1

diff --git a/config/crd/bases/chaos-mesh.org_iochaos.yaml b/config/crd/bases/chaos-mesh.org_iochaos.yaml
@@ -295,11 +295,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -314,7 +309,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       type: object
   version: v1alpha1

diff --git a/config/crd/bases/chaos-mesh.org_jvmchaos.yaml b/config/crd/bases/chaos-mesh.org_jvmchaos.yaml
@@ -460,11 +460,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -479,7 +474,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       type: object
   version: v1alpha1

diff --git a/config/crd/bases/chaos-mesh.org_kernelchaos.yaml b/config/crd/bases/chaos-mesh.org_kernelchaos.yaml
@@ -249,11 +249,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -268,7 +263,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/config/crd/bases/chaos-mesh.org_networkchaos.yaml b/config/crd/bases/chaos-mesh.org_networkchaos.yaml
@@ -393,11 +393,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -412,7 +407,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/config/crd/bases/chaos-mesh.org_podchaos.yaml b/config/crd/bases/chaos-mesh.org_podchaos.yaml
@@ -206,11 +206,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -225,7 +220,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/config/crd/bases/chaos-mesh.org_podnetworkchaos.yaml b/config/crd/bases/chaos-mesh.org_podnetworkchaos.yaml
@@ -254,11 +254,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -273,7 +268,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/config/crd/bases/chaos-mesh.org_stresschaos.yaml b/config/crd/bases/chaos-mesh.org_stresschaos.yaml
@@ -241,11 +241,6 @@ spec:
                 type: object
               description: Instances always specifies stressing instances
               type: object
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -260,7 +255,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/config/crd/bases/chaos-mesh.org_timechaos.yaml b/config/crd/bases/chaos-mesh.org_timechaos.yaml
@@ -201,11 +201,6 @@ spec:
               type: object
             failedMessage:
               type: string
-            phase:
-              description: Phase is the chaos status.
-              type: string
-            reason:
-              type: string
             scheduler:
               description: ScheduleStatus is the current status of chaos scheduler.
               properties:
@@ -220,7 +215,6 @@ spec:
               type: object
           required:
           - experiment
-          - phase
           type: object
       required:
       - spec

diff --git a/controllers/common/types.go b/controllers/common/types.go
@@ -45,7 +45,9 @@ type Reconciler struct {
 }
 
 // NewReconciler would create Reconciler for common chaos
-func NewReconciler(e endpoint.Endpoint, ctx ctx.Context) *Reconciler {
+func NewReconciler(req ctrl.Request, e endpoint.Endpoint, ctx ctx.Context) *Reconciler {
+	ctx.Log = ctx.Log.WithName(req.NamespacedName.String())
+
 	return &Reconciler{
 		Endpoint: e,
 		Context:  ctx,