From 44941a1631527986902e2ac920b869dd47685144 Mon Sep 17 00:00:00 2001 From: Yuki Iwai Date: Mon, 14 Apr 2025 16:21:08 +0900 Subject: [PATCH 1/2] Trust the Intel OneAPI PGP key until it satisfies new APT PGP requirments (#692) Signed-off-by: Yuki Iwai --- build/base/intel-builder.Dockerfile | 4 +++- build/base/intel.Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/base/intel-builder.Dockerfile b/build/base/intel-builder.Dockerfile index ce27b8e76..4e85cb5b6 100644 --- a/build/base/intel-builder.Dockerfile +++ b/build/base/intel-builder.Dockerfile @@ -11,7 +11,9 @@ 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 \ - && 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 \ + # 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 \ && apt update \ && apt install -y --no-install-recommends \ libstdc++-12-dev binutils procps clang \ diff --git a/build/base/intel.Dockerfile b/build/base/intel.Dockerfile index b84ed0033..03d3612c0 100644 --- a/build/base/intel.Dockerfile +++ b/build/base/intel.Dockerfile @@ -13,7 +13,9 @@ 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 \ - && 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 \ + # 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 \ && apt update \ && apt install -y --no-install-recommends \ dnsutils \ From 12a29a43378b7b9099b38c6fda27528ccfe24382 Mon Sep 17 00:00:00 2001 From: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com> Date: Mon, 14 Apr 2025 12:55:53 -0400 Subject: [PATCH 2/2] Remove alculquicondor from OWNERS (#693) * Remove alculquicondor from OWNERS Signed-off-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com> * Update OWNERS Signed-off-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com> --------- Signed-off-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com> --- OWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OWNERS b/OWNERS index 7eb757703..6765245b2 100644 --- a/OWNERS +++ b/OWNERS @@ -1,8 +1,9 @@ approvers: - - alculquicondor - rongou - terrytangyuan - tenzen-y +emeritus_approvers: + - alculquicondor reviewers: - carmark - gaocegege