add k8 boilerplate for cnp

Author: QxBytes

test/integration/lrp/lrp_test.go

@@ -153,7 +153,7 @@ func setupLRP(t *testing.T, ctx context.Context) (*v1.Pod, func()) {
 	return &selectedClientPod, cleanupFn
 }
 
-func testLRPCase(t *testing.T, ctx context.Context, clientPod v1.Pod, clientCmd []string, expectResponse string, countShouldIncrease bool) {
+func testLRPCase(t *testing.T, ctx context.Context, clientPod v1.Pod, clientCmd []string, expectResponse, expectErrMsg string, countShouldIncrease bool) {
 	config := kubernetes.MustGetRestConfig()
 	cs := kubernetes.MustGetClientset()
 
@@ -171,10 +171,10 @@ func testLRPCase(t *testing.T, ctx context.Context, clientPod v1.Pod, clientCmd
 
 	t.Log("calling command from client")
 	// nslookup to 10.0.0.10 (coredns)
-	val, err := kubernetes.ExecCmdOnPod(ctx, cs, clientPod.Namespace, clientPod.Name, clientContainer, clientCmd, config)
-	require.NoError(t, err, string(val))
-	// can connect
+	val, errMsg, err := kubernetes.ExecCmdOnPodOnce(ctx, cs, clientPod.Namespace, clientPod.Name, clientContainer, clientCmd, config)
+
 	require.Contains(t, string(val), expectResponse)
+	require.Contains(t, string(errMsg), expectErrMsg)
 
 	// in case there is time to propagate
 	time.Sleep(500 * time.Millisecond)
@@ -205,7 +205,7 @@ func TestLRP(t *testing.T) {
 
 	testLRPCase(t, ctx, *selectedPod, []string{
 		"nslookup", "google.com", "10.0.0.10",
-	}, "Server:", true)
+	}, "Server:", "", true)
 }
 
 // TakeOne takes one item from the slice randomly; if empty, it returns the empty value for the type

test/internal/kubernetes/utils.go

@@ -258,6 +258,15 @@ func MustSetupLRP(ctx context.Context, clientset *cilium.Clientset, lrpPath stri
 	}
 }
 
+func MustSetupCNP(ctx context.Context, clientset *cilium.Clientset, cnpPath string) (ciliumv2.CiliumNetworkPolicy, func()) { // nolint
+	cnp := mustParseCNP(cnpPath)
+	cnps := clientset.CiliumV2().CiliumNetworkPolicies(cnp.Namespace)
+	mustCreateCiliumNetworkPolicy(ctx, cnps, cnp)
+	return cnp, func() {
+		MustDeleteCiliumNetworkPolicy(ctx, cnps, cnp)
+	}
+}
+
 func Int32ToPtr(i int32) *int32 { return &i }
 
 func WaitForPodsRunning(ctx context.Context, clientset *kubernetes.Clientset, namespace, labelselector string) error {
@@ -482,47 +491,56 @@ func writeToFile(dir, fileName, str string) error {
 func ExecCmdOnPod(ctx context.Context, clientset *kubernetes.Clientset, namespace, podName, containerName string, cmd []string, config *rest.Config) ([]byte, error) {
 	var result []byte
 	execCmdOnPod := func() error {
-		req := clientset.CoreV1().RESTClient().Post().
-			Resource("pods").
-			Name(podName).
-			Namespace(namespace).
-			SubResource("exec").
-			VersionedParams(&corev1.PodExecOptions{
-				Command:   cmd,
-				Container: containerName,
-				Stdin:     false,
-				Stdout:    true,
-				Stderr:    true,
-				TTY:       false,
-			}, scheme.ParameterCodec)
-
-		exec, err := remotecommand.NewSPDYExecutor(config, "POST", req.URL())
-		if err != nil {
-			return errors.Wrapf(err, "error in creating executor for req %s", req.URL())
-		}
-
-		var stdout, stderr bytes.Buffer
-		err = exec.StreamWithContext(ctx, remotecommand.StreamOptions{
-			Stdin:  nil,
-			Stdout: &stdout,
-			Stderr: &stderr,
-			Tty:    false,
-		})
-		if err != nil {
-			log.Printf("Error: %v had error %v from command - %v, will retry", podName, err, cmd)
-			return errors.Wrapf(err, "error in executing command %s", cmd)
-		}
-		if len(stdout.Bytes()) == 0 {
-			log.Printf("Warning: %v had 0 bytes returned from command - %v", podName, cmd)
-		}
-		result = stdout.Bytes()
-		return nil
+		output, _, err := ExecCmdOnPodOnce(ctx, clientset, namespace, podName, containerName, cmd, config)
+		result = output
+		return err
 	}
 	retrier := retry.Retrier{Attempts: ShortRetryAttempts, Delay: RetryDelay}
 	err := retrier.Do(ctx, execCmdOnPod)
 	return result, errors.Wrapf(err, "could not execute the cmd %s on %s", cmd, podName)
 }
 
+func ExecCmdOnPodOnce(ctx context.Context, clientset *kubernetes.Clientset, namespace, podName, containerName string, cmd []string, config *rest.Config) ([]byte, []byte, error) {
+	req := clientset.CoreV1().RESTClient().Post().
+		Resource("pods").
+		Name(podName).
+		Namespace(namespace).
+		SubResource("exec").
+		VersionedParams(&corev1.PodExecOptions{
+			Command:   cmd,
+			Container: containerName,
+			Stdin:     false,
+			Stdout:    true,
+			Stderr:    true,
+			TTY:       false,
+		}, scheme.ParameterCodec)
+
+	exec, err := remotecommand.NewSPDYExecutor(config, "POST", req.URL())
+	if err != nil {
+		return nil, nil, errors.Wrapf(err, "error in creating executor for req %s", req.URL())
+	}
+
+	var stdout, stderr bytes.Buffer
+	err = exec.StreamWithContext(ctx, remotecommand.StreamOptions{
+		Stdin:  nil,
+		Stdout: &stdout,
+		Stderr: &stderr,
+		Tty:    false,
+	})
+
+	result := stdout.Bytes()
+	errResult := stderr.Bytes()
+
+	if err != nil {
+		log.Printf("Error: %v had error %v from command - %v", podName, err, cmd)
+		return result, errResult, errors.Wrapf(err, "error in executing command %s", cmd)
+	}
+	if len(stdout.Bytes()) == 0 {
+		log.Printf("Warning: %v had 0 bytes returned from command - %v", podName, cmd)
+	}
+	return result, errResult, nil
+}
+
 func NamespaceExists(ctx context.Context, clientset *kubernetes.Clientset, namespace string) (bool, error) {
 	_, err := clientset.CoreV1().Namespaces().Get(ctx, namespace, metav1.GetOptions{})
 	if err != nil {

test/internal/kubernetes/utils_create.go

@@ -189,6 +189,18 @@ func mustCreateCiliumLocalRedirectPolicy(ctx context.Context, lrpClient typedcil
 	}
 }
 
+func mustCreateCiliumNetworkPolicy(ctx context.Context, cnpClient typedciliumv2.CiliumNetworkPolicyInterface, cnp ciliumv2.CiliumNetworkPolicy) {
+	if err := cnpClient.Delete(ctx, cnp.Name, metav1.DeleteOptions{}); err != nil {
+		if !apierrors.IsNotFound(err) {
+			log.Fatal(errors.Wrap(err, "failed to delete cilium network policy"))
+		}
+	}
+	log.Printf("Creating CiliumNetworkPolicy %v", cnp.Name)
+	if _, err := cnpClient.Create(ctx, &cnp, metav1.CreateOptions{}); err != nil {
+		log.Fatal(errors.Wrap(err, "failed to create cilium network policy"))
+	}
+}
+
 func MustScaleDeployment(ctx context.Context,
 	deploymentsClient typedappsv1.DeploymentInterface,
 	deployment appsv1.Deployment,

test/internal/kubernetes/utils_delete.go

@@ -81,3 +81,11 @@ func MustDeleteCiliumLocalRedirectPolicy(ctx context.Context, lrpClient typedcil
 		}
 	}
 }
+
+func MustDeleteCiliumNetworkPolicy(ctx context.Context, cnpClient typedciliumv2.CiliumNetworkPolicyInterface, cnp ciliumv2.CiliumNetworkPolicy) {
+	if err := cnpClient.Delete(ctx, cnp.Name, metav1.DeleteOptions{}); err != nil {
+		if !apierrors.IsNotFound(err) {
+			panic(errors.Wrap(err, "failed to delete cilium network policy"))
+		}
+	}
+}

test/internal/kubernetes/utils_parse.go

@@ -66,3 +66,9 @@ func mustParseLRP(path string) ciliumv2.CiliumLocalRedirectPolicy {
 	mustParseResource(path, &lrp)
 	return lrp
 }
+
+func mustParseCNP(path string) ciliumv2.CiliumNetworkPolicy {
+	var cnp ciliumv2.CiliumNetworkPolicy
+	mustParseResource(path, &cnp)
+	return cnp
+}