Skip to content

Commit

Permalink
Merge pull request #32 from amitbhatt818/cherry-pick
Browse files Browse the repository at this point in the history
[Cherry pick into v1.0.x for GA]
  • Loading branch information
Karthik Satchitanand authored Jan 14, 2020
2 parents d67e067 + be3fa5e commit 6a9ba29
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
1 change: 1 addition & 0 deletions pkg/utils/experimentHelpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func (expDetails *ExperimentDetails) SetENV(engineDetails EngineDetails, clients
expDetails.Env["APP_LABEL"] = engineDetails.AppLabel
expDetails.Env["APP_NAMESPACE"] = engineDetails.AppNamespace
expDetails.Env["APP_KIND"] = engineDetails.AppKind
expDetails.Env["AUXILIARY_APPINFO"] = engineDetails.AuxiliaryAppInfo
}

//SetValueFromChaosEngine sets value in experimentDetails struct from chaosEngine
Expand Down
1 change: 1 addition & 0 deletions pkg/utils/getOSenv.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ func GetOsEnv(engineDetails *EngineDetails) {
engineDetails.SvcAccount = os.Getenv("CHAOS_SVC_ACC")
engineDetails.ClientUUID = os.Getenv("CLIENT_UUID")
engineDetails.Experiments = strings.Split(experimentList, ",")
engineDetails.AuxiliaryAppInfo = os.Getenv("AUXILIARY_APPINFO")
}
15 changes: 8 additions & 7 deletions pkg/utils/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ import (

// EngineDetails struct is for collecting all the engine-related details
type EngineDetails struct {
Name string
Experiments []string
AppLabel string
SvcAccount string
AppKind string
AppNamespace string
ClientUUID string
Name string
Experiments []string
AppLabel string
SvcAccount string
AppKind string
AppNamespace string
ClientUUID string
AuxiliaryAppInfo string
}

// ExperimentDetails is for collecting all the experiment-related details
Expand Down

0 comments on commit 6a9ba29

Please sign in to comment.