Merge branch 'master' into add-openssh-clients

ispeakc0de · web-flow · commit 3bef3ad67eb5 · 2025-01-15T10:57:02.000+05:30
diff --git a/chaoslib/litmus/network-chaos/helper/netem.go b/chaoslib/litmus/network-chaos/helper/netem.go
@@ -130,7 +130,7 @@ func preparePodNetworkChaos(experimentsDetails *experimentTypes.ExperimentDetail
 		}
 		log.Infof("successfully injected chaos on target: {name: %s, namespace: %v, container: %v}", t.Name, t.Namespace, t.TargetContainer)
 		if err = result.AnnotateChaosResult(resultDetails.Name, chaosDetails.ChaosNamespace, "injected", "pod", t.Name); err != nil {
-			if _, revertErr := killnetem(t, experimentsDetails.NetworkInterface); err != nil {
+			if _, revertErr := killnetem(t, experimentsDetails.NetworkInterface); revertErr != nil {
 				return cerrors.PreserveError{ErrString: fmt.Sprintf("[%s,%s]", stacktrace.RootCause(err).Error(), stacktrace.RootCause(revertErr).Error())}
 			}
 			return stacktrace.Propagate(err, "could not annotate chaosresult")

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func preparePodNetworkChaos(experimentsDetails *experimentTypes.ExperimentDetail`
`130`	`130`	`}`
`131`	`131`	`log.Infof("successfully injected chaos on target: {name: %s, namespace: %v, container: %v}", t.Name, t.Namespace, t.TargetContainer)`
`132`	`132`	`if err = result.AnnotateChaosResult(resultDetails.Name, chaosDetails.ChaosNamespace, "injected", "pod", t.Name); err != nil {`
`133`		`- if _, revertErr := killnetem(t, experimentsDetails.NetworkInterface); err != nil {`
	`133`	`+ if _, revertErr := killnetem(t, experimentsDetails.NetworkInterface); revertErr != nil {`
`134`	`134`	`return cerrors.PreserveError{ErrString: fmt.Sprintf("[%s,%s]", stacktrace.RootCause(err).Error(), stacktrace.RootCause(revertErr).Error())}`
`135`	`135`	`}`
`136`	`136`	`return stacktrace.Propagate(err, "could not annotate chaosresult")`