fixed based with kustomize edit fix

Signed-off-by: Vikas Saxena <[email protected]>

fixed overlays/kubeflow with kustomize edit fix

Signed-off-by: Vikas Saxena <[email protected]>

fixed overlays/standalone with kustomize edit fix

Signed-off-by: Vikas Saxena <[email protected]>

updated gpg signature for intel image

Signed-off-by: Vikas Saxena <[email protected]>

updating new intel oneAPI key

Signed-off-by: Vikas Saxena <[email protected]>

replacing curl by wget as the underling image doesnt have curl

Signed-off-by: Vikas Saxena <[email protected]>

Revert "replacing curl by wget as the underling image doesnt have curl"

This reverts commit bdc5798.

Signed-off-by: Vikas Saxena <[email protected]>

Revert "updating new intel oneAPI key"

This reverts commit 6cb0042.

Signed-off-by: Vikas Saxena <[email protected]>

updaung the key intel gpg key

Signed-off-by: Vikas Saxena <[email protected]>

adding fix for key

Signed-off-by: Vikas Saxena <[email protected]>

trying gog dearmour first

Signed-off-by: Vikas Saxena <[email protected]>

adding trusted-yes as found on stackoverflow.com

Signed-off-by: Vikas Saxena <[email protected]>

fixing curl releated issue in the docker fke

Signed-off-by: Vikas Saxena <[email protected]>

corrected typo

Signed-off-by: Vikas Saxena <[email protected]>

fixing self inflicted damages of updating wrong file

Signed-off-by: Vikas Saxena <[email protected]>

Author: vikas-saxena02

Diff for: build/base/intel-builder.Dockerfile

@@ -11,8 +11,6 @@ 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 \
     && apt update \
     && apt install -y --no-install-recommends \

Diff for: build/base/intel.Dockerfile

@@ -11,6 +11,7 @@ COPY --from=downloader key.PUB /tmp/key.PUB
 
 # Install Intel oneAPI keys.
 <<<<<<< HEAD
+<<<<<<< HEAD
 RUN apt update \
 <<<<<<< HEAD
     && apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \
@@ -26,10 +27,13 @@ RUN apt update \
 RUN gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg /tmp/key.PUB \
     && apt update \
 >>>>>>> 2376f4e (trying gog dearmour first)
+=======
+RUN apt update \
+>>>>>>> 242bbc7 (adding trusted-yes as found on stackoverflow.com)
     && 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 \
+    && 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 \
+    && 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 \

Diff for: examples/v2beta1/pi/intel.Dockerfile

@@ -2,15 +2,6 @@ ARG BASE_LABEL
 
 FROM mpioperator/intel-builder:${BASE_LABEL} as builder
 
-# Add Intel repository key and update apt sources
-RUN curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg \
-    && echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
-    > /etc/apt/sources.list.d/oneapi.list \
-    && apt update \
-    && apt install -y --no-install-recommends gnupg2 ca-certificates apt-transport-https \
-    && apt autoremove -y \
-    && rm -rf /var/lib/apt/lists/*
-
 COPY pi.cc /src/pi.cc
 RUN bash -c "source /opt/intel/oneapi/setvars.sh && mpicxx /src/pi.cc -o /pi"