Merge pull request #821 from mythi/PR-2021-078

bart0sh · web-flow · commit 71872ad40f50 · 2021-12-22T12:18:09.000+02:00
qat: add kustomize overlay for e2e tests
diff --git a/deployments/qat_plugin/overlays/apparmor_unconfined/add-apparmor-unconfined-intel-qat.yaml b/deployments/qat_plugin/overlays/apparmor_unconfined/add-apparmor-unconfined-intel-qat.yaml
diff --git a/deployments/qat_plugin/overlays/apparmor_unconfined/kustomization.yaml b/deployments/qat_plugin/overlays/apparmor_unconfined/kustomization.yaml
@@ -1,4 +1,4 @@
 bases:
   - ../../base
-patches:
-- add-apparmor-unconfined-intel-qat.yaml
+commonAnnotations:
+  container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined
diff --git a/deployments/qat_plugin/overlays/e2e/add-args.yaml b/deployments/qat_plugin/overlays/e2e/add-args.yaml
@@ -0,0 +1,11 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: intel-qat-plugin
+spec:
+  template:
+    spec:
+      containers:
+      - name: intel-qat-plugin
+        args:
+        - "-v=4"
diff --git a/deployments/qat_plugin/overlays/e2e/kustomization.yaml b/deployments/qat_plugin/overlays/e2e/kustomization.yaml
@@ -0,0 +1,9 @@
+nameSuffix: -e2e
+commonAnnotations:
+  container.apparmor.security.beta.kubernetes.io/intel-qat-plugin: unconfined
+
+resources:
+- ../sriov_numvfs
+
+patches:
+  - add-args.yaml
diff --git a/test/e2e/qat/qatplugin_dpdk.go b/test/e2e/qat/qatplugin_dpdk.go
@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	dpdkKustomizationYaml = "deployments/qat_plugin/overlays/sriov_numvfs/kustomization.yaml"
+	dpdkKustomizationYaml = "deployments/qat_plugin/overlays/e2e/kustomization.yaml"
 	compressTestYaml      = "deployments/qat_dpdk_app/test-compress1/kustomization.yaml"
 	cryptoTestYaml        = "deployments/qat_dpdk_app/test-crypto1/kustomization.yaml"
 )

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`const (`
`30`		`- dpdkKustomizationYaml = "deployments/qat_plugin/overlays/sriov_numvfs/kustomization.yaml"`
	`30`	`+ dpdkKustomizationYaml = "deployments/qat_plugin/overlays/e2e/kustomization.yaml"`
`31`	`31`	`compressTestYaml = "deployments/qat_dpdk_app/test-compress1/kustomization.yaml"`
`32`	`32`	`cryptoTestYaml = "deployments/qat_dpdk_app/test-crypto1/kustomization.yaml"`
`33`	`33`	`)`