diff --git a/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml b/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml index 55b72894c..b4790bb14 100644 --- a/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml +++ b/deployments/qat_dpdk_app/base/crypto-perf-dpdk-pod-requesting-qat.yaml @@ -1,3 +1,8 @@ +configMapGenerator: +- files: + - file.txt + name: test-data + kind: Pod apiVersion: v1 metadata: @@ -7,8 +12,8 @@ spec: - name: crypto-perf image: intel/crypto-perf:devel imagePullPolicy: IfNotPresent - command: [ "/bin/bash", "-c", "--" ] - args: [ "while true; do sleep 300000; done;" ] + command: [ "/bin/bash", "-c", "/usr/bin/run-dpdk-test" ] + args: [ "--ptest throughput --devtype crypto_qat --optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64" ] volumeMounts: - mountPath: /dev/hugepages name: hugepage @@ -18,12 +23,41 @@ spec: requests: cpu: "3" memory: "128Mi" - qat.intel.com/generic: '4' + qat.intel.com/cy: '4' hugepages-2Mi: "128Mi" limits: cpu: "3" memory: "128Mi" - qat.intel.com/generic: '4' + qat.intel.com/cy: '4' + hugepages-2Mi: "128Mi" + securityContext: + readOnlyRootFilesystem: true + allowPrivilegeEscalation: false + capabilities: + add: + ["IPC_LOCK"] + - name: compress-perf + image: intel/crypto-perf:devel + imagePullPolicy: IfNotPresent + command: [ "/bin/bash", "-c", "/usr/bin/run-dpdk-test" ] + args: [ "--driver-name compress_qat --input-file /var/data/file.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed" ] + volumeMounts: + - mountPath: /dev/hugepages + name: hugepage + - mountPath: /var/run/dpdk + name: dpdk-runtime + - mountPath: /var/data/ + name: testfile + resources: + requests: + cpu: "3" + memory: "128Mi" + qat.intel.com/dc: '4' + hugepages-2Mi: "128Mi" + limits: + cpu: "3" + memory: "128Mi" + qat.intel.com/dc: '4' hugepages-2Mi: "128Mi" securityContext: readOnlyRootFilesystem: true @@ -39,3 +73,6 @@ spec: - name: hugepage emptyDir: medium: HugePages + - name: testfile + configMap: + name: test-data diff --git a/deployments/qat_dpdk_app/patches/compress-perf/file.txt b/deployments/qat_dpdk_app/base/file.txt similarity index 100% rename from deployments/qat_dpdk_app/patches/compress-perf/file.txt rename to deployments/qat_dpdk_app/base/file.txt diff --git a/deployments/qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml b/deployments/qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml deleted file mode 100644 index 1b537bde6..000000000 --- a/deployments/qat_dpdk_app/patches/compress-perf/env_replace_testcmd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: qat-dpdk -spec: - containers: - - name: crypto-perf - env: - - name: TESTCMD - value: "compress" diff --git a/deployments/qat_dpdk_app/patches/compress-perf/kustomization.yaml b/deployments/qat_dpdk_app/patches/compress-perf/kustomization.yaml deleted file mode 100644 index 65f3cbf01..000000000 --- a/deployments/qat_dpdk_app/patches/compress-perf/kustomization.yaml +++ /dev/null @@ -1,12 +0,0 @@ -nameSuffix: -compress-perf -resources: -- ../dpdk-test/ -configMapGenerator: -- files: - - file.txt - name: test-data -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: volume_add_configmap.yaml -- path: env_replace_testcmd.yaml diff --git a/deployments/qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml b/deployments/qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml deleted file mode 100644 index 66859f7f5..000000000 --- a/deployments/qat_dpdk_app/patches/compress-perf/volume_add_configmap.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: qat-dpdk -spec: - containers: - - name: crypto-perf - volumeMounts: - - name: testfile - mountPath: /var/data/ - volumes: - - name: testfile - configMap: - name: test-data diff --git a/deployments/qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml b/deployments/qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml deleted file mode 100644 index 9bf72b1ef..000000000 --- a/deployments/qat_dpdk_app/patches/crypto-perf/env_replace_testcmd.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: Pod -metadata: - name: qat-dpdk-test -spec: - containers: - - name: crypto-perf - env: - - name: TESTCMD - value: "crypto" diff --git a/deployments/qat_dpdk_app/patches/crypto-perf/kustomization.yaml b/deployments/qat_dpdk_app/patches/crypto-perf/kustomization.yaml deleted file mode 100644 index 9cea1553d..000000000 --- a/deployments/qat_dpdk_app/patches/crypto-perf/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -crypto-perf -resources: -- ../dpdk-test/ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: test.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/patches/crypto-perf/test.json b/deployments/qat_dpdk_app/patches/crypto-perf/test.json deleted file mode 100644 index 9655134c7..000000000 --- a/deployments/qat_dpdk_app/patches/crypto-perf/test.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - {"op": "replace", "path": "/spec/containers/0/env/0/value", "value": "crypto"} -] diff --git a/deployments/qat_dpdk_app/patches/dpdk-test/containers_patch_command_args.json b/deployments/qat_dpdk_app/patches/dpdk-test/containers_patch_command_args.json deleted file mode 100644 index 47daa87b5..000000000 --- a/deployments/qat_dpdk_app/patches/dpdk-test/containers_patch_command_args.json +++ /dev/null @@ -1,5 +0,0 @@ -[ - {"op": "remove", "path": "/spec/containers/0/args"}, - {"op": "replace", "path": "/spec/containers/0/command", "value": ["/usr/bin/run-dpdk-test"]}, - {"op": "add", "path": "/spec/containers/0/env", "value": [{"name": "TESTCMD", "value": "dummy"}, {"name": "PTEST", "value": "dummy"}]} -] diff --git a/deployments/qat_dpdk_app/patches/dpdk-test/kustomization.yaml b/deployments/qat_dpdk_app/patches/dpdk-test/kustomization.yaml deleted file mode 100644 index b868cdea3..000000000 --- a/deployments/qat_dpdk_app/patches/dpdk-test/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -test -resources: -- ../../base/ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: containers_patch_command_args.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/test-compress1/kustomization.yaml b/deployments/qat_dpdk_app/test-compress1/kustomization.yaml deleted file mode 100644 index 689c1fd82..000000000 --- a/deployments/qat_dpdk_app/test-compress1/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -tc1 -resources: -- ../patches/compress-perf -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: tc1.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/test-compress1/tc1.json b/deployments/qat_dpdk_app/test-compress1/tc1.json deleted file mode 100644 index 97c844b31..000000000 --- a/deployments/qat_dpdk_app/test-compress1/tc1.json +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/containers/0/env/1/value - value: "--driver-name compress_qat --input-file /var/data/file.txt --seg-sz 8192 --compress-level 1:1:9 --num-iter 10 --extended-input-sz 1048576 --max-num-sgl-segs 16 --huffman-enc fixed" diff --git a/deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml b/deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml deleted file mode 100644 index b39c90b19..000000000 --- a/deployments/qat_dpdk_app/test-crypto1-gen4/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -nameSuffix: -gen4 -resources: -- ../test-crypto1 -patches: -- target: - version: v1 - kind: Pod - name: qat-dpdk - path: tc1-gen4.yaml diff --git a/deployments/qat_dpdk_app/test-crypto1-gen4/tc1-gen4.yaml b/deployments/qat_dpdk_app/test-crypto1-gen4/tc1-gen4.yaml deleted file mode 100644 index 55f03f219..000000000 --- a/deployments/qat_dpdk_app/test-crypto1-gen4/tc1-gen4.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- op: replace - path: /spec/containers/0/resources - value: - requests: - cpu: "3" - memory: "128Mi" - qat.intel.com/cy: '4' - hugepages-2Mi: "128Mi" - limits: - cpu: "3" - memory: "128Mi" - qat.intel.com/cy: '4' - hugepages-2Mi: "128Mi" diff --git a/deployments/qat_dpdk_app/test-crypto1/kustomization.yaml b/deployments/qat_dpdk_app/test-crypto1/kustomization.yaml deleted file mode 100644 index 58546ab67..000000000 --- a/deployments/qat_dpdk_app/test-crypto1/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -nameSuffix: -tc1 -resources: -- ../patches/crypto-perf -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: tc1.json - target: - kind: Pod - name: qat-dpdk - version: v1 diff --git a/deployments/qat_dpdk_app/test-crypto1/tc1.json b/deployments/qat_dpdk_app/test-crypto1/tc1.json deleted file mode 100644 index 927003624..000000000 --- a/deployments/qat_dpdk_app/test-crypto1/tc1.json +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/containers/0/env/1/value - value: "--ptest throughput --devtype crypto_qat --optype cipher-only --cipher-algo aes-cbc --cipher-op encrypt --cipher-key-sz 16 --total-ops 10000000 --burst-sz 32 --buffer-sz 64"