chore(pumba): Adding dynamic socketPath pumba helper (#238)

Signed-off-by: shubhamchaudhary <[email protected]>
litmuschaos · Dec 14, 2020 · 59cefce · 59cefce
1 parent c812f06
commit 59cefce
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/chaoslib/pumba/container-kill/lib/container-kill.go b/chaoslib/pumba/container-kill/lib/container-kill.go
@@ -290,7 +290,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					Name: "dockersocket",
 					VolumeSource: apiv1.VolumeSource{
 						HostPath: &apiv1.HostPathVolumeSource{
-							Path: "/var/run/docker.sock",
+							Path: experimentsDetails.SocketPath,
 						},
 					},
 				},
@@ -316,7 +316,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					VolumeMounts: []apiv1.VolumeMount{
 						{
 							Name:      "dockersocket",
-							MountPath: "/var/run/docker.sock",
+							MountPath: experimentsDetails.SocketPath,
 						},
 					},
 				},

diff --git a/chaoslib/pumba/network-chaos/lib/network-chaos.go b/chaoslib/pumba/network-chaos/lib/network-chaos.go
@@ -210,7 +210,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					Name: "dockersocket",
 					VolumeSource: apiv1.VolumeSource{
 						HostPath: &apiv1.HostPathVolumeSource{
-							Path: "/var/run/docker.sock",
+							Path: experimentsDetails.SocketPath,
 						},
 					},
 				},
@@ -228,7 +228,7 @@ func CreateHelperPod(experimentsDetails *experimentTypes.ExperimentDetails, clie
 					VolumeMounts: []apiv1.VolumeMount{
 						{
 							Name:      "dockersocket",
-							MountPath: "/var/run/docker.sock",
+							MountPath: experimentsDetails.SocketPath,
 						},
 					},
 				},

diff --git a/pkg/generic/container-kill/environment/environment.go b/pkg/generic/container-kill/environment/environment.go
@@ -29,7 +29,7 @@ func GetENV(experimentDetails *experimentTypes.ExperimentDetails) {
 	experimentDetails.LIBImage = Getenv("LIB_IMAGE", "litmuschaos/go-runner:latest")
 	experimentDetails.LIBImagePullPolicy = Getenv("LIB_IMAGE_PULL_POLICY", "Always")
 	experimentDetails.TargetContainer = Getenv("TARGET_CONTAINER", "")
-	experimentDetails.SocketPath = Getenv("SOCKET_PATH", "/run/containerd/containerd.sock")
+	experimentDetails.SocketPath = Getenv("SOCKET_PATH", "/var/run/docker.sock")
 	experimentDetails.Delay, _ = strconv.Atoi(Getenv("STATUS_CHECK_DELAY", "2"))
 	experimentDetails.Timeout, _ = strconv.Atoi(Getenv("STATUS_CHECK_TIMEOUT", "180"))
 	experimentDetails.TargetPods = Getenv("TARGET_PODS", "")

diff --git a/pkg/generic/network-chaos/environment/environment.go b/pkg/generic/network-chaos/environment/environment.go
@@ -40,7 +40,7 @@ func GetENV(experimentDetails *experimentTypes.ExperimentDetails) {
 	experimentDetails.DestinationHosts = Getenv("DESTINATION_HOSTS", "")
 	experimentDetails.ContainerRuntime = Getenv("CONTAINER_RUNTIME", "docker")
 	experimentDetails.ChaosServiceAccount = Getenv("CHAOS_SERVICE_ACCOUNT", "")
-	experimentDetails.SocketPath = Getenv("SOCKET_PATH", "/run/containerd/containerd.sock")
+	experimentDetails.SocketPath = Getenv("SOCKET_PATH", "/var/run/docker.sock")
 	experimentDetails.Sequence = Getenv("SEQUENCE", "parallel")
 
 }