cherry-pick for 1.8.1 (#134)

* chore(socketPath): correcting socketPath env name (#124) Signed-off-by: shubhamchaudhary <[email protected]> * chore(network-chaos): Adding ability to inject network chaos w/ pause container (#126) Signed-off-by: shubhamchaudhary <[email protected]> * fix(permission-issue): fixing the username permission issue for sockfile (#129) Signed-off-by: shubhamchaudhary <[email protected]> * chore(k8sprobe): Adding label-selector field in k8sprobe (#127) Signed-off-by: shubhamchaudhary <[email protected]> * Chore/ Splitting different files for network chaos experiment (#128) * Chore/ Splitting different variables for network chaos experiment Signed-off-by: Udit Gaurav <[email protected]> * fix(userid): revert the userid from dockerfile (#131) Signed-off-by: shubhamchaudhary <[email protected]> * fix(duplicate): fixing network duplicate exp (#132) Signed-off-by: shubhamchaudhary <[email protected]> * chore(network-chaos): splitting network chaos for containerd (#133) Signed-off-by: shubhamchaudhary <[email protected]> Co-authored-by: Shubham Chaudhary <[email protected]>
litmuschaos · Sep 18, 2020 · bfdb421 · bfdb421
1 parent 4c62402
commit bfdb421
Show file tree

Hide file tree

Showing 30 changed files with 449 additions and 142 deletions.
diff --git a/build/litmus-go/Dockerfile b/build/litmus-go/Dockerfile
@@ -19,9 +19,6 @@ FROM ubuntu:bionic
 
 LABEL maintainer="LitmusChaos"
 
-ENV USER_UID=1001 \
-    USER_NAME=litmus-go
-
 #Installing necessary ubuntu packages
 RUN apt-get update && apt-get install -y curl bash systemd iproute2
 
@@ -43,7 +40,4 @@ COPY --from=builder /code/stress-ng/stress-ng /
 #Copying Necessary Files
 COPY ./build/_output ./litmus/experiments
 
-RUN useradd -ms /bin/bash ${USER_NAME} 
 WORKDIR /litmus
-RUN chown -R ${USER_NAME}:root /litmus
-USER ${USER_NAME}
diff --git a/chaoslib/litmus/container-kill/lib/container-kill.go b/chaoslib/litmus/container-kill/lib/container-kill.go
@@ -154,7 +154,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					Name: "cri-socket",
 					VolumeSource: apiv1.VolumeSource{
 						HostPath: &apiv1.HostPathVolumeSource{
-							Path: experimentsDetails.ContainerPath,
+							Path: experimentsDetails.SocketPath,
 						},
 					},
 				},
@@ -183,7 +183,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					VolumeMounts: []apiv1.VolumeMount{
 						{
 							Name:      "cri-socket",
-							MountPath: experimentsDetails.ContainerPath,
+							MountPath: experimentsDetails.SocketPath,
 						},
 						{
 							Name:      "cri-config",

diff --git a/chaoslib/litmus/network-chaos/lib/corruption/corruption.go b/chaoslib/litmus/network-chaos/lib/corruption/corruption.go
@@ -0,0 +1,24 @@
+package corruption
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/litmus/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkCorruptionChaos contains the steps to prepare and inject chaos
+func PodNetworkCorruptionChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := "corrupt " + strconv.Itoa(experimentsDetails.NetworkPacketCorruptionPercentage)
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/chaoslib/litmus/network-chaos/lib/duplication/duplication.go b/chaoslib/litmus/network-chaos/lib/duplication/duplication.go
@@ -0,0 +1,24 @@
+package duplication
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/litmus/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkDuplicationChaos contains the steps to prepare and inject chaos
+func PodNetworkDuplicationChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := "duplicate " + strconv.Itoa(experimentsDetails.NetworkPacketDuplicationPercentage)
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/chaoslib/litmus/network-chaos/lib/latency/latency.go b/chaoslib/litmus/network-chaos/lib/latency/latency.go
@@ -0,0 +1,24 @@
+package latency
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/litmus/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkLatencyChaos contains the steps to prepare and inject chaos
+func PodNetworkLatencyChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := "delay " + strconv.Itoa(experimentsDetails.NetworkLatency) + "ms"
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/chaoslib/litmus/network-chaos/lib/loss/loss.go b/chaoslib/litmus/network-chaos/lib/loss/loss.go
@@ -0,0 +1,24 @@
+package loss
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/litmus/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkLossChaos contains the steps to prepare and inject chaos
+func PodNetworkLossChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := "loss " + strconv.Itoa(experimentsDetails.NetworkPacketLossPercentage)
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/chaoslib/litmus/network-chaos/lib/network-chaos.go b/chaoslib/litmus/network-chaos/lib/network-chaos.go
@@ -16,8 +16,8 @@ import (
 
 var err error
 
-//PreparePodNetworkChaos contains the prepration steps before chaos injection
-func PreparePodNetworkChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+//PrepareAndInjectChaos contains the prepration & injection steps
+func PrepareAndInjectChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails, args string) error {
 
 	// Get the target pod details for the chaos execution
 	// if the target pod is not defined it will derive the random target pod list using pod affected percentage
@@ -57,7 +57,7 @@ func PreparePodNetworkChaos(experimentsDetails *experimentTypes.ExperimentDetail
 	// creating the helper pod to perform network chaos
 	for _, pod := range targetPodList.Items {
 		runID := common.GetRunID()
-		err = CreateHelperPod(experimentsDetails, clients, pod.Name, pod.Spec.NodeName, runID)
+		err = CreateHelperPod(experimentsDetails, clients, pod.Name, pod.Spec.NodeName, runID, args)
 		if err != nil {
 			return errors.Errorf("Unable to create the helper pod, err: %v", err)
 		}
@@ -110,7 +110,7 @@ func GetTargetContainer(experimentsDetails *experimentTypes.ExperimentDetails, a
 }
 
 // CreateHelperPod derive the attributes for helper pod and create the helper pod
-func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, podName, nodeName, runID string) error {
+func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, podName, nodeName, runID string, args string) error {
 
 	privilegedEnable := false
 	if experimentsDetails.ContainerRuntime == "crio" {
@@ -138,7 +138,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					Name: "cri-socket",
 					VolumeSource: apiv1.VolumeSource{
 						HostPath: &apiv1.HostPathVolumeSource{
-							Path: experimentsDetails.ContainerPath,
+							Path: experimentsDetails.SocketPath,
 						},
 					},
 				},
@@ -158,17 +158,17 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					Image:           experimentsDetails.LIBImage,
 					ImagePullPolicy: apiv1.PullAlways,
 					Command: []string{
-						"bin/bash",
+						"/bin/bash",
 					},
 					Args: []string{
 						"-c",
 						"./experiments/network-chaos",
 					},
-					Env: GetPodEnv(experimentsDetails, podName),
+					Env: GetPodEnv(experimentsDetails, podName, args),
 					VolumeMounts: []apiv1.VolumeMount{
 						{
 							Name:      "cri-socket",
-							MountPath: experimentsDetails.ContainerPath,
+							MountPath: experimentsDetails.SocketPath,
 						},
 						{
 							Name:      "cri-config",
@@ -195,7 +195,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 }
 
 // GetPodEnv derive all the env required for the helper pod
-func GetPodEnv(experimentsDetails *experimentTypes.ExperimentDetails, podName string) []apiv1.EnvVar {
+func GetPodEnv(experimentsDetails *experimentTypes.ExperimentDetails, podName, args string) []apiv1.EnvVar {
 
 	var envVar []apiv1.EnvVar
 	ENVList := map[string]string{
@@ -207,7 +207,7 @@ func GetPodEnv(experimentsDetails *experimentTypes.ExperimentDetails, podName st
 		"CHAOS_ENGINE":         experimentsDetails.EngineName,
 		"CHAOS_UID":            string(experimentsDetails.ChaosUID),
 		"CONTAINER_RUNTIME":    experimentsDetails.ContainerRuntime,
-		"NETEM_COMMAND":        GetNetemCommand(experimentsDetails),
+		"NETEM_COMMAND":        args,
 		"NETWORK_INTERFACE":    experimentsDetails.NetworkInterface,
 		"EXPERIMENT_NAME":      experimentsDetails.ExperimentName,
 	}
@@ -237,18 +237,3 @@ func GetValueFromDownwardAPI(apiVersion string, fieldPath string) apiv1.EnvVarSo
 	}
 	return downwardENV
 }
-
-// GetNetemCommand generate the netem command based on the experiment name
-func GetNetemCommand(experimentDetails *experimentTypes.ExperimentDetails) string {
-	var cmd string
-	if experimentDetails.ExperimentName == "pod-network-loss" {
-		cmd = "loss " + strconv.Itoa(experimentDetails.NetworkPacketLossPercentage)
-	} else if experimentDetails.ExperimentName == "pod-network-latency" {
-		cmd = "delay " + strconv.Itoa(experimentDetails.NetworkLatency) + "ms"
-	} else if experimentDetails.ExperimentName == "pod-network-corruption" {
-		cmd = "corrupt " + strconv.Itoa(experimentDetails.NetworkPacketCorruptionPercentage)
-	} else {
-		cmd = "duplicate " + strconv.Itoa(experimentDetails.NetworkPacketDuplicationPercentage)
-	}
-	return cmd
-}
diff --git a/chaoslib/pumba/network-chaos/lib/corruption/corruption.go b/chaoslib/pumba/network-chaos/lib/corruption/corruption.go
@@ -0,0 +1,44 @@
+package corruption
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/pumba/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkCorruptionChaos contains the steps to prepare and inject chaos
+func PodNetworkCorruptionChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := GetContainerArguments(experimentsDetails)
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetContainerArguments derives the args for the pumba pod
+func GetContainerArguments(experimentsDetails *experimentTypes.ExperimentDetails) []string {
+	baseArgs := []string{
+		"netem",
+		"--tc-image",
+		experimentsDetails.TCImage,
+		"--interface",
+		experimentsDetails.NetworkInterface,
+		"--duration",
+		strconv.Itoa(experimentsDetails.ChaosDuration) + "s",
+	}
+
+	args := baseArgs
+	args = network_chaos.AddTargetIpsArgs(experimentsDetails.TargetIPs, args)
+	args = network_chaos.AddTargetIpsArgs(network_chaos.GetIpsForTargetHosts(experimentsDetails.TargetHosts), args)
+	args = append(args, "corrupt", "--percent", strconv.Itoa(experimentsDetails.NetworkPacketCorruptionPercentage))
+
+	return args
+}
diff --git a/chaoslib/pumba/network-chaos/lib/duplication/duplication.go b/chaoslib/pumba/network-chaos/lib/duplication/duplication.go
@@ -0,0 +1,44 @@
+package duplication
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/pumba/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkDuplicationChaos contains the steps to prepare and inject chaos
+func PodNetworkDuplicationChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := GetContainerArguments(experimentsDetails)
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetContainerArguments derives the args for the pumba pod
+func GetContainerArguments(experimentsDetails *experimentTypes.ExperimentDetails) []string {
+	baseArgs := []string{
+		"netem",
+		"--tc-image",
+		experimentsDetails.TCImage,
+		"--interface",
+		experimentsDetails.NetworkInterface,
+		"--duration",
+		strconv.Itoa(experimentsDetails.ChaosDuration) + "s",
+	}
+
+	args := baseArgs
+	args = network_chaos.AddTargetIpsArgs(experimentsDetails.TargetIPs, args)
+	args = network_chaos.AddTargetIpsArgs(network_chaos.GetIpsForTargetHosts(experimentsDetails.TargetHosts), args)
+	args = append(args, "duplicate", "--percent", strconv.Itoa(experimentsDetails.NetworkPacketDuplicationPercentage))
+
+	return args
+}
diff --git a/chaoslib/pumba/network-chaos/lib/latency/latency.go b/chaoslib/pumba/network-chaos/lib/latency/latency.go
@@ -0,0 +1,44 @@
+package latency
+
+import (
+	"strconv"
+
+	network_chaos "github.com/litmuschaos/litmus-go/chaoslib/pumba/network-chaos/lib"
+	clients "github.com/litmuschaos/litmus-go/pkg/clients"
+	experimentTypes "github.com/litmuschaos/litmus-go/pkg/generic/network-chaos/types"
+	"github.com/litmuschaos/litmus-go/pkg/types"
+)
+
+var err error
+
+//PodNetworkLatencyChaos contains the steps to prepare and inject chaos
+func PodNetworkLatencyChaos(experimentsDetails *experimentTypes.ExperimentDetails, clients clients.ClientSets, resultDetails *types.ResultDetails, eventsDetails *types.EventDetails, chaosDetails *types.ChaosDetails) error {
+
+	args := GetContainerArguments(experimentsDetails)
+	err = network_chaos.PrepareAndInjectChaos(experimentsDetails, clients, resultDetails, eventsDetails, chaosDetails, args)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// GetContainerArguments derives the args for the pumba pod
+func GetContainerArguments(experimentsDetails *experimentTypes.ExperimentDetails) []string {
+	baseArgs := []string{
+		"netem",
+		"--tc-image",
+		experimentsDetails.TCImage,
+		"--interface",
+		experimentsDetails.NetworkInterface,
+		"--duration",
+		strconv.Itoa(experimentsDetails.ChaosDuration) + "s",
+	}
+
+	args := baseArgs
+	args = network_chaos.AddTargetIpsArgs(experimentsDetails.TargetIPs, args)
+	args = network_chaos.AddTargetIpsArgs(network_chaos.GetIpsForTargetHosts(experimentsDetails.TargetHosts), args)
+	args = append(args, "delay", "--time", strconv.Itoa(experimentsDetails.NetworkLatency))
+
+	return args
+}