Skip to content

Commit 0920972

Browse files
authored
Chore(healthCheck): Update default healthCheck tunable in engine (#183)
Signed-off-by: uditgaurav <udit@chaosnative.com>
1 parent 360649a commit 0920972

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.17
44

55
require (
66
github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef
7-
github.com/litmuschaos/chaos-operator v0.0.0-20220929101337-868b2827f820
7+
github.com/litmuschaos/chaos-operator v0.0.0-20221006080214-d78985569b82
88
github.com/litmuschaos/elves v0.0.0-20210325101625-5620f93aed51
99
github.com/litmuschaos/litmus-go v0.0.0-20220927112726-25d81a302a70
1010
github.com/onsi/ginkgo v1.16.5

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,8 +738,8 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
738738
github.com/lightstep/lightstep-tracer-go v0.18.0/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
739739
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
740740
github.com/litmuschaos/chaos-operator v0.0.0-20220927085333-f70f80b9e75f/go.mod h1:CJGiHqC06PQkIBySk/JroB7B2zFebDbkhQ1A6ZbYmHA=
741-
github.com/litmuschaos/chaos-operator v0.0.0-20220929101337-868b2827f820 h1:xMlb6eMbWzdR/2IB6F095p0NDadccZIkiovJBE9fg9I=
742-
github.com/litmuschaos/chaos-operator v0.0.0-20220929101337-868b2827f820/go.mod h1:CJGiHqC06PQkIBySk/JroB7B2zFebDbkhQ1A6ZbYmHA=
741+
github.com/litmuschaos/chaos-operator v0.0.0-20221006080214-d78985569b82 h1:FB9P0pfG1bwdb63I9xfZByr3szjfndE8UDOcm4H08xQ=
742+
github.com/litmuschaos/chaos-operator v0.0.0-20221006080214-d78985569b82/go.mod h1:CJGiHqC06PQkIBySk/JroB7B2zFebDbkhQ1A6ZbYmHA=
743743
github.com/litmuschaos/elves v0.0.0-20201107015738-552d74669e3c/go.mod h1:DsbHGNUq/78NZozWVVI9Q6eBei4I+JjlkkD5aibJ3MQ=
744744
github.com/litmuschaos/elves v0.0.0-20210325101625-5620f93aed51 h1:6CpcGjZsVHMRSB/Z8z9+ectmb1KuQUiy+244jISNhBA=
745745
github.com/litmuschaos/elves v0.0.0-20210325101625-5620f93aed51/go.mod h1:DsbHGNUq/78NZozWVVI9Q6eBei4I+JjlkkD5aibJ3MQ=

pkg/utils/engineHelper.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func (expDetails *ExperimentDetails) SetInstanceAttributeValuesFromChaosEngine(e
2626
SetTolerationsFromEngine(chaosEngine).
2727
SetExpImageFromEngine(chaosEngine).
2828
SetTerminationGracePeriodSecondsFromEngine(chaosEngine).
29-
SetDefaultAppHealthCheck(chaosEngine)
29+
SetDefaultHealthCheck(chaosEngine)
3030

3131
return nil
3232
}
@@ -108,9 +108,9 @@ func (expDetails *ExperimentDetails) SetTolerationsFromEngine(engine *litmuschao
108108
return expDetails
109109
}
110110

111-
// SetDefaultAppHealthCheck sets th default health checks provided inside the chaosEngine
112-
func (expDetails *ExperimentDetails) SetDefaultAppHealthCheck(engine *litmuschaosv1alpha1.ChaosEngine) *ExperimentDetails {
113-
expDetails.DefaultAppHealthCheck = engine.Spec.DefaultAppHealthCheck
111+
// SetDefaultHealthCheck sets th default health checks provided inside the chaosEngine
112+
func (expDetails *ExperimentDetails) SetDefaultHealthCheck(engine *litmuschaosv1alpha1.ChaosEngine) *ExperimentDetails {
113+
expDetails.DefaultHealthCheck = engine.Spec.DefaultHealthCheck
114114
return expDetails
115115
}
116116

pkg/utils/environment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func (expDetails *ExperimentDetails) SetENV(engineDetails EngineDetails, clients
5151
setEnv("ANNOTATION_CHECK", engineDetails.AnnotationCheck).
5252
setEnv("LIB_IMAGE_PULL_POLICY", string(expDetails.ExpImagePullPolicy)).
5353
setEnv("TERMINATION_GRACE_PERIOD_SECONDS", strconv.Itoa(int(expDetails.TerminationGracePeriodSeconds))).
54-
setEnv("DEFAULT_APP_HEALTH_CHECK", expDetails.DefaultAppHealthCheck).
54+
setEnv("DEFAULT_HEALTH_CHECK", expDetails.DefaultHealthCheck).
5555
setEnv("CHAOS_SERVICE_ACCOUNT", expDetails.SvcAccount)
5656

5757
// Get the Default ENV's from ChaosExperiment

pkg/utils/event_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ package utils
22

33
import (
44
"context"
5-
"github.com/stretchr/testify/require"
65
"strings"
76
"testing"
87
"time"
98

9+
"github.com/stretchr/testify/require"
10+
1011
v1 "k8s.io/api/core/v1"
1112
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1213
clientTypes "k8s.io/apimachinery/pkg/types"

pkg/utils/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ type ExperimentDetails struct {
5959
ImagePullSecrets []v1.LocalObjectReference
6060
StatusCheckTimeout int
6161
TerminationGracePeriodSeconds int64
62-
DefaultAppHealthCheck string
62+
DefaultHealthCheck string
6363
}
6464

6565
//VolumeOpts is a strcuture for all volume related operations

0 commit comments

Comments
 (0)