Skip to content

Commit 0927f7c

Browse files
authored
Merge pull request #1599 from mythi/PR-2023-054
QAT test updates
2 parents 89a0ad9 + 517e431 commit 0927f7c

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

demo/crypto-perf/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ WORKDIR $DIR
55

66
RUN echo "deb-src http://deb.debian.org/debian unstable main" >> \
77
/etc/apt/sources.list.d/deb-src.list
8-
RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip libssl-dev pkg-config dpkg-dev
8+
RUN apt-get update && apt-get install -y --no-install-recommends wget build-essential meson ninja-build python3-pyelftools libnuma-dev python3-pip pkg-config dpkg-dev libipsec-mb-dev
99

1010
# Download & unpack DPDK tarball
11-
ARG DPDK_TARBALL=dpdk-23.07-rc4.tar.xz
12-
ARG DPDK_TARBALL_SHA256="f16e25a8b1eeb7335fbd265a6d4f9cce512709436efc80f6422ee9cfdf2f32b9"
11+
ARG DPDK_TARBALL=dpdk-23.11-rc3.tar.xz
12+
ARG DPDK_TARBALL_SHA256="cacd8b6d796f9983479f8c5989830cb86705922f8d6a813d83ecb82034088993"
1313

14-
ARG SOVERSION=23
1514
RUN wget -q https://git.dpdk.org/dpdk/snapshot/$DPDK_TARBALL \
1615
&& echo "$DPDK_TARBALL_SHA256 $DPDK_TARBALL" | sha256sum -c - \
1716
&& tar -xf $DPDK_TARBALL && rm $DPDK_TARBALL
1817

18+
ARG SOVERSION=24
1919
RUN cd dpdk-* && meson setup \
2020
-Dplatform=generic \
2121
-Dcpu_instruction_set=westmere \
@@ -28,7 +28,7 @@ RUN cd dpdk-* && \
2828
install -D builddir/app/dpdk-test-crypto-perf /install_root/usr/bin/dpdk-test-crypto-perf && \
2929
install -D builddir/app/dpdk-test-compress-perf /install_root/usr/bin/dpdk-test-compress-perf && \
3030
install -d /install_root/usr/lib/x86_64-linux-gnu/ && \
31-
for r in bus_pci eal kvargs hash security telemetry pci mbuf mempool ring net rcu ipsec cryptodev compressdev common_qat; do \
31+
for r in log bus_pci eal kvargs hash security telemetry pci mbuf mempool ring net rcu ipsec cryptodev compressdev common_qat; do \
3232
install installdir/lib/x86_64-linux-gnu/librte_${r}.so.${SOVERSION} /install_root/usr/lib/x86_64-linux-gnu/; \
3333
done
3434

@@ -38,7 +38,7 @@ RUN mkdir -p /install_root/licenses/dpdk && \
3838
apt-get source --download-only -y libatomic1 libnuma1
3939

4040
FROM debian:sid-slim
41-
RUN apt-get update && apt-get install -y --no-install-recommends libssl3 libnuma1 libatomic1 && ldconfig -v
41+
RUN apt-get update && apt-get install -y --no-install-recommends libipsec-mb1 libnuma1 libatomic1 && ldconfig -v
4242
COPY --from=builder /install_root /
4343
COPY run-dpdk-test /usr/bin/
4444

demo/openssl-qat-engine/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM ubuntu:22.04 as builder
22

3-
ARG QATLIB_VERSION="23.08.0"
3+
ARG QATLIB_VERSION="23.11.0"
44
ARG QAT_ENGINE_VERSION="v1.4.0"
55
ARG ASYNC_NGINX_VERSION="v0.5.1"
6-
ARG IPSEC_MB_VERSION="v1.4"
7-
ARG IPP_CRYPTO_VERSION="ippcp_2021.8"
6+
ARG IPSEC_MB_VERSION="v1.5"
7+
ARG IPP_CRYPTO_VERSION="ippcp_2021.9.0"
88

99
RUN apt update && \
1010
env DEBIAN_FRONTEND=noninteractive apt install -y \
@@ -71,10 +71,10 @@ RUN cd /asynch_mode_nginx && \
7171
FROM ubuntu:22.04
7272

7373
COPY --from=builder /usr/bin/*_sample* /usr/bin/
74-
COPY --from=builder /usr/lib/libqat.so.4.0.0 /usr/lib/
74+
COPY --from=builder /usr/lib/libqat.so.4.1.0 /usr/lib/
7575
COPY --from=builder /usr/lib/libusdm.so.0.1.0 /usr/lib/
7676
COPY --from=builder /usr/lib64/libIPSec_MB.so.1 /usr/lib/x86_64-linux-gnu/
77-
COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.8 /usr/lib/x86_64-linux-gnu/
77+
COPY --from=builder /usr/local/lib/libcrypto_mb.so.11.9 /usr/lib/x86_64-linux-gnu/
7878
COPY --from=builder /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so /usr/lib/x86_64-linux-gnu/engines-3/qatengine.so
7979
COPY --from=builder /var/www/ /var/www/
8080
COPY --from=builder /usr/lib64/nginx/* /usr/lib64/nginx/

deployments/operator/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
spec:
1111
containers:
1212
- name: kube-rbac-proxy
13-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.1
13+
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.15.0
1414
args:
1515
- "--secure-listen-address=0.0.0.0:8443"
1616
- "--upstream=http://127.0.0.1:8080/"

0 commit comments

Comments
 (0)