Merge pull request #316 from grafana/unify-disruptor-validations

Apply fault injection validations uniformly
grafana · Aug 25, 2023 · b50ce14 · b50ce14
2 parents c2244fc + da4c87c
commit b50ce14
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/pkg/disruptors/pod.go b/pkg/disruptors/pod.go
@@ -150,6 +150,10 @@ func (d *podDisruptor) InjectGrpcFaults(
 			return VisitCommands{}, fmt.Errorf("pod %q does not expose port %d", pod.Name, fault.Port)
 		}
 
+		if utils.HasHostNetwork(pod) {
+			return VisitCommands{}, fmt.Errorf("pod %q cannot be safely injected as it has hostNetwork set to true", pod.Name)
+		}
+
 		targetAddress, err := utils.PodIP(pod)
 		if err != nil {
 			return VisitCommands{}, err

diff --git a/pkg/disruptors/service.go b/pkg/disruptors/service.go
@@ -93,15 +93,14 @@ func (d *serviceDisruptor) InjectHTTPFaults(
 			return VisitCommands{}, fmt.Errorf("pod %q cannot be safely injected as it has hostNetwork set to true", pod.Name)
 		}
 
-		// copy fault to change target port for the pod
-		podFault := fault
-		podFault.Port = port
-
 		targetAddress, err := utils.PodIP(pod)
 		if err != nil {
 			return VisitCommands{}, err
 		}
 
+		// copy fault to change target port for the pod
+		podFault := fault
+		podFault.Port = port
 		visitCommands := VisitCommands{
 			Exec:    buildHTTPFaultCmd(targetAddress, podFault, duration, options),
 			Cleanup: buildCleanupCmd(),
@@ -125,14 +124,18 @@ func (d *serviceDisruptor) InjectGrpcFaults(
 			return VisitCommands{}, err
 		}
 
-		podFault := fault
-		podFault.Port = port
+		if utils.HasHostNetwork(pod) {
+			return VisitCommands{}, fmt.Errorf("pod %q cannot be safely injected as it has hostNetwork set to true", pod.Name)
+		}
 
 		targetAddress, err := utils.PodIP(pod)
 		if err != nil {
 			return VisitCommands{}, err
 		}
 
+		// copy fault to change target port for the pod
+		podFault := fault
+		podFault.Port = port
 		visitCommands := VisitCommands{
 			Exec:    buildGrpcFaultCmd(targetAddress, podFault, duration, options),
 			Cleanup: buildCleanupCmd(),