Revert "Trust the Intel OneAPI PGP key until it satisfies new APT PGP requirm…" (#706)

This reverts commit 44941a1.

Signed-off-by: Yuki Iwai <[email protected]>

Author: tenzen-y

build/base/intel-builder.Dockerfile

@@ -11,9 +11,7 @@ RUN apt update \
     && apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \
     && gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \
     && rm /tmp/key.PUB \
-    # TODO (tenzen-y): Once Intel OneAPI supports new parsable PGP format for apt, we should remove `trusted=yes` option.
-    # REF: https://github.com/kubeflow/mpi-operator/issues/691
-    && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg trusted=yes] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
+    && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
     && apt update \
     && apt install -y --no-install-recommends \
         libstdc++-12-dev binutils procps clang \

build/base/intel.Dockerfile

@@ -13,9 +13,7 @@ RUN apt update \
     && apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \
     && gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \
     && rm /tmp/key.PUB \
-    # TODO (tenzen-y): Once Intel OneAPI supports new parsable PGP format for apt, we should remove `trusted=yes` option.
-    # REF: https://github.com/kubeflow/mpi-operator/issues/691
-    && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg trusted=yes] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
+    && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | tee /etc/apt/sources.list.d/oneAPI.list \
     && apt update \
     && apt install -y --no-install-recommends \
         dnsutils \