From 26f7520387ea2781ddc8ddc0dd415d20a0a18777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 1 Jun 2023 11:34:44 +0200 Subject: [PATCH] kata-deploy: Change how we get the Ubuntu k8s key MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current method has been failing every now and then, and was reported on https://github.com/kubernetes/release/issues/2862. Ding poked me and suggested to do this change here, so here we go. :-) Fixes: #7006 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/Dockerfile b/tools/packaging/kata-deploy/Dockerfile index bb579631b9..f8b9edf4ca 100644 --- a/tools/packaging/kata-deploy/Dockerfile +++ b/tools/packaging/kata-deploy/Dockerfile @@ -16,9 +16,9 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] RUN \ apt-get update && \ -apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl xz-utils systemd && \ +apt-get install -y --no-install-recommends apt-transport-https ca-certificates curl gpg xz-utils systemd && \ mkdir -p /etc/apt/keyrings/ && \ -curl -fsSLo /etc/apt/keyrings/kubernetes-archive-keyring.gpg https://dl.k8s.io/apt/doc/apt-key.gpg && \ +curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg && \ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main" | tee /etc/apt/sources.list.d/kubernetes.list && \ apt-get update && \ apt-get install -y --no-install-recommends kubectl && \