From 8b4d799f257647237afcb09c1e79dfb33865b73b Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Mon, 6 Jun 2022 16:06:55 +0200
Subject: [PATCH] [Ubuntu] Remove apt-key from GCP installer (#5687)

---
 images/linux/scripts/installers/google-cloud-sdk.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/images/linux/scripts/installers/google-cloud-sdk.sh b/images/linux/scripts/installers/google-cloud-sdk.sh
index bb11df28d..867bc9cc3 100644
--- a/images/linux/scripts/installers/google-cloud-sdk.sh
+++ b/images/linux/scripts/installers/google-cloud-sdk.sh
@@ -7,15 +7,15 @@
 REPO_URL="https://packages.cloud.google.com/apt"
 
 # Install the Google Cloud SDK
-echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
-sudo apt-get update -y
+echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] $REPO_URL cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list
+wget -q https://packages.cloud.google.com/apt/doc/apt-key.gpg -O /usr/share/keyrings/cloud.google.gpg
+apt-get update -y
 # temporary downgrade google-cloud-sdk as python component has linking bugs
-sudo apt-get install -y google-cloud-sdk=369.0.0-0
+apt-get install -y google-cloud-sdk=369.0.0-0
 
 # remove apt
 rm /etc/apt/sources.list.d/google-cloud-sdk.list
-rm /usr/share/keyrings/cloud.google.gpg /usr/share/keyrings/cloud.google.gpg~
+rm /usr/share/keyrings/cloud.google.gpg
 
 # add repo to the apt-sources.txt
 echo "google-cloud-sdk $REPO_URL" >> $HELPER_SCRIPTS/apt-sources.txt