Skip to content

Commit

Permalink
(chore) Removal of exporter components from the operator (#190)
Browse files Browse the repository at this point in the history
* (chore) Removal of exporter components from the operator

Signed-off-by: Rahul M Chheda <[email protected]>
  • Loading branch information
rahulchheda authored Apr 11, 2020
1 parent 969ad1d commit be90f95
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 577 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Makefile for building Chaos Exporter
# Makefile for building Chaos Operator
# Reference Guide - https://www.gnu.org/software/make/manual/make.html

IS_DOCKER_INSTALLED = $(shell which docker >> /dev/null 2>&1; echo $$?)
Expand Down Expand Up @@ -29,7 +29,7 @@ deps: _build_check_docker godeps
.PHONY: godeps
godeps:
@echo ""
@echo "INFO:\tverifying dependencies for chaos exporter build ..."
@echo "INFO:\tverifying dependencies for chaos operator build ..."
@go get -u -v golang.org/x/lint/golint
@go get -u -v golang.org/x/tools/cmd/goimports

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ which provides bootstrap support for new operator projects, allowing teams to fo

The Litmus Chaos Operator helps reconcile the state of the ChaosEngine, a custom resource that holds the chaos intent
specified by a developer/devops engineer against a particular stateless/stateful Kubernetes deployment. The operator performs
specific actions upon CRUD of the ChaosEngine, its primary resource. The operator also defines secondary resources (the engine
runner pod and engine monitor service), which are created & managed by it in order to implement the reconcile functions.
specific actions upon CRUD of the ChaosEngine, its primary resource. The operator also defines a secondary resource (the engine
runner pod), which is created & managed by it in order to implement the reconcile functions.

## What is a chaos engine?

Expand Down Expand Up @@ -147,4 +147,4 @@ Head over to the [Contribution guide](CONTRIBUTING.md)
## License
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Flitmuschaos%2Fchaos-operator.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Flitmuschaos%2Fchaos-operator?ref=badge_large)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Flitmuschaos%2Fchaos-operator.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Flitmuschaos%2Fchaos-operator?ref=badge_large)
7 changes: 0 additions & 7 deletions deploy/01-chaos-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ spec:
env:
- name: CHAOS_RUNNER_IMAGE
value: "litmuschaos/chaos-runner:latest"
- name: CHAOS_MONITOR_IMAGE
value: "litmuschaos/chaos-exporter:latest"
- name: WATCH_NAMESPACE
value:
- name: POD_NAME
Expand Down Expand Up @@ -138,11 +136,6 @@ spec:
components:
type: object
properties:
monitor:
type: object
properties:
image:
type: string
runner:
type: object
properties:
Expand Down
5 changes: 0 additions & 5 deletions deploy/chaos_crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,6 @@ spec:
components:
type: object
properties:
monitor:
type: object
properties:
image:
type: string
runner:
type: object
properties:
Expand Down
5 changes: 0 additions & 5 deletions deploy/crds/chaosengine_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,6 @@ spec:
components:
type: object
properties:
monitor:
type: object
properties:
image:
type: string
runner:
type: object
properties:
Expand Down
2 changes: 0 additions & 2 deletions deploy/operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ spec:
env:
#- name: CHAOS_RUNNER_IMAGE
# value: "litmuschaos/chaos-runner:ci"
#- name: CHAOS_MONITOR_IMAGE
# value: "litmuschaos/chaos-exporter:ci"
- name: WATCH_NAMESPACE
value:
- name: POD_NAME
Expand Down
12 changes: 2 additions & 10 deletions pkg/apis/litmuschaos/v1alpha1/chaosengine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type ChaosEngineSpec struct {
AnnotationCheck string `json:"annotationCheck,omitempty"`
//ChaosServiceAccount is the SvcAcc specified for chaos runner pods
ChaosServiceAccount string `json:"chaosServiceAccount"`
//Components contains the image of runnner and monitor pod
//Components contains the image, imagePullPolicy, arguments, and commands of runner
Components ComponentParams `json:"components"`
//Consists of experiments executed by the engine
Experiments []ExperimentList `json:"experiments"`
Expand Down Expand Up @@ -112,20 +112,12 @@ type ApplicationParams struct {
AppKind string `json:"appkind"`
}

// ComponentParams defines information about the runner and monitor image
// ComponentParams defines information about the runner
type ComponentParams struct {
//Contains informations of the monitor pod
Monitor MonitorInfo `json:"monitor"`
//Contains informations of the the runner pod
Runner RunnerInfo `json:"runner"`
}

// MonitorInfo defines the information of the monitor pod
type MonitorInfo struct {
//Image of the monitor pod
Image string `json:"image"`
}

// RunnerInfo defines the information of the runnerinfo pod
type RunnerInfo struct {
//Image of the runner pod
Expand Down
17 changes: 0 additions & 17 deletions pkg/apis/litmuschaos/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 be90f95

Please sign in to comment.