Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Easier twophase controller #1221

Merged
merged 13 commits into from
Dec 15, 2020
Merged

Easier twophase controller #1221

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e5779d0
easier twophase
YangKeao Dec 7, 2020
67a8214
none to noop
YangKeao Dec 9, 2020
6e9831c
remove redundant codse
YangKeao Dec 9, 2020
c5c3030
rename status to statuses
YangKeao Dec 9, 2020
017d62a
Merge branch 'master' into easier-twophase
ti-srebot Dec 10, 2020
fd7af42
move from pause
YangKeao Dec 10, 2020
3542444
add more tests for pause
YangKeao Dec 10, 2020
fc7f02d
Merge branch 'master' into easier-twophase
cwen0 Dec 10, 2020
6117cb9
Merge remote-tracking branch 'upstream/master' into easier-twophase
YangKeao Dec 14, 2020
4995a56
Merge remote-tracking branch 'origin/easier-twophase' into easier-two…
YangKeao Dec 14, 2020
a7a8fa0
fix pause to pause senerio
YangKeao Dec 14, 2020
8c5ff75
Merge remote-tracking branch 'upstream/master' into easier-twophase
YangKeao Dec 15, 2020
3487eee
Merge branch 'master' into easier-twophase
ti-srebot Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 7 additions & 9 deletions api/v1alpha1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down Expand Up @@ -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 {
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_dnschaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -217,7 +212,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_httpchaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -241,7 +236,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
type: object
version: v1alpha1
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_iochaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -314,7 +309,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
type: object
version: v1alpha1
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_jvmchaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -479,7 +474,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
type: object
version: v1alpha1
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_kernelchaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -268,7 +263,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_networkchaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -412,7 +407,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_podchaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -225,7 +220,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_podnetworkchaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -273,7 +268,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_stresschaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -260,7 +255,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
6 changes: 0 additions & 6 deletions config/crd/bases/chaos-mesh.org_timechaos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -220,7 +215,6 @@ spec:
type: object
required:
- experiment
- phase
type: object
required:
- spec
Expand Down
4 changes: 3 additions & 1 deletion controllers/common/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down