From 91e6e72e60e5be51587f3593779bb1c586d29f46 Mon Sep 17 00:00:00 2001
From: Ilya Buziuk <ibuziuk@redhat.com>
Date: Thu, 16 Apr 2026 12:21:39 +0200
Subject: [PATCH 1/2] feat: adding gcloud CLI to ubi9 and ubi10

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
---
 universal/ubi10/Dockerfile | 38 ++++++++++++++++++++++++++++++++++++++
 universal/ubi9/Dockerfile  | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)

diff --git a/universal/ubi10/Dockerfile b/universal/ubi10/Dockerfile
index c7a59ed7..1b09e0c4 100644
--- a/universal/ubi10/Dockerfile
+++ b/universal/ubi10/Dockerfile
@@ -472,6 +472,41 @@ fi
 RUN curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-${TARGETARCH} && \
     install skaffold /usr/local/bin/
 
+## Google Cloud CLI
+RUN <<EOF
+set -euf -o pipefail
+TEMP_DIR="$(mktemp -d)"
+cd "${TEMP_DIR}"
+
+GCLOUD_VERSION="512.0.0"
+
+case "$TARGETARCH" in
+    amd64)
+        GCLOUD_ARCH="x86_64"
+        ;;
+    arm64)
+        GCLOUD_ARCH="arm"
+        ;;
+    *)
+        echo "Skipping gcloud installation for unsupported architecture: $TARGETARCH"
+        exit 0
+        ;;
+esac
+
+GCLOUD_TGZ="google-cloud-cli-${GCLOUD_VERSION}-linux-${GCLOUD_ARCH}.tar.gz"
+GCLOUD_TGZ_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${GCLOUD_TGZ}"
+
+curl -sSLO "${GCLOUD_TGZ_URL}"
+tar -xzf "${GCLOUD_TGZ}"
+./google-cloud-sdk/install.sh --usage-reporting=false --path-update=false --quiet
+mv google-cloud-sdk /usr/local/
+
+cd -
+rm -rf "${TEMP_DIR}"
+EOF
+
+ENV PATH="/usr/local/google-cloud-sdk/bin:${PATH}"
+
 # e2fsprogs setup
 # Since e2fsprogs-static package has removed RHEL 8 distribution, it is not possible to install from the repository
 # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#removed-packages_changes-to-packages
@@ -520,6 +555,9 @@ oc completion bash > /usr/share/bash-completion/completions/oc
 tkn completion bash > /usr/share/bash-completion/completions/tkn
 kubectl completion bash > /usr/share/bash-completion/completions/kubectl
 cat ${NVM_DIR}/bash_completion > /usr/share/bash-completion/completions/nvm
+if [ -f /usr/local/google-cloud-sdk/completion.bash.inc ]; then
+    cat /usr/local/google-cloud-sdk/completion.bash.inc > /usr/share/bash-completion/completions/gcloud
+fi
 EOF
 
 ## Add sdkman's init script launcher to the end of ${PROFILE_EXT} since we are not adding it on sdkman install
diff --git a/universal/ubi9/Dockerfile b/universal/ubi9/Dockerfile
index f8461b5e..c45d25e0 100644
--- a/universal/ubi9/Dockerfile
+++ b/universal/ubi9/Dockerfile
@@ -440,6 +440,41 @@ fi
 RUN curl -Lo skaffold https://storage.googleapis.com/skaffold/releases/latest/skaffold-linux-${TARGETARCH} && \
     install skaffold /usr/local/bin/
 
+## Google Cloud CLI
+RUN <<EOF
+set -euf -o pipefail
+TEMP_DIR="$(mktemp -d)"
+cd "${TEMP_DIR}"
+
+GCLOUD_VERSION="512.0.0"
+
+case "$TARGETARCH" in
+    amd64)
+        GCLOUD_ARCH="x86_64"
+        ;;
+    arm64)
+        GCLOUD_ARCH="arm"
+        ;;
+    *)
+        echo "Skipping gcloud installation for unsupported architecture: $TARGETARCH"
+        exit 0
+        ;;
+esac
+
+GCLOUD_TGZ="google-cloud-cli-${GCLOUD_VERSION}-linux-${GCLOUD_ARCH}.tar.gz"
+GCLOUD_TGZ_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${GCLOUD_TGZ}"
+
+curl -sSLO "${GCLOUD_TGZ_URL}"
+tar -xzf "${GCLOUD_TGZ}"
+./google-cloud-sdk/install.sh --usage-reporting=false --path-update=false --quiet
+mv google-cloud-sdk /usr/local/
+
+cd -
+rm -rf "${TEMP_DIR}"
+EOF
+
+ENV PATH="/usr/local/google-cloud-sdk/bin:${PATH}"
+
 # e2fsprogs setup
 # Since e2fsprogs-static package has removed RHEL 8 distribution, it is not possible to install from the repository
 # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html-single/considerations_in_adopting_rhel_8/index#removed-packages_changes-to-packages
@@ -488,6 +523,9 @@ oc completion bash > /usr/share/bash-completion/completions/oc
 tkn completion bash > /usr/share/bash-completion/completions/tkn
 kubectl completion bash > /usr/share/bash-completion/completions/kubectl
 cat ${NVM_DIR}/bash_completion > /usr/share/bash-completion/completions/nvm
+if [ -f /usr/local/google-cloud-sdk/completion.bash.inc ]; then
+    cat /usr/local/google-cloud-sdk/completion.bash.inc > /usr/share/bash-completion/completions/gcloud
+fi
 EOF
 
 ## Add sdkman's init script launcher to the end of ${PROFILE_EXT} since we are not adding it on sdkman install

From 5639f7e2364fdc32ba760714e7743d96b312bb5d Mon Sep 17 00:00:00 2001
From: Ilya Buziuk <ibuziuk@redhat.com>
Date: Thu, 16 Apr 2026 12:45:48 +0200
Subject: [PATCH 2/2] chore: udpate gcloud CLI to the latest '565' version

Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
---
 universal/ubi10/Dockerfile | 2 +-
 universal/ubi9/Dockerfile  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/universal/ubi10/Dockerfile b/universal/ubi10/Dockerfile
index 1b09e0c4..be0d2ac7 100644
--- a/universal/ubi10/Dockerfile
+++ b/universal/ubi10/Dockerfile
@@ -478,7 +478,7 @@ set -euf -o pipefail
 TEMP_DIR="$(mktemp -d)"
 cd "${TEMP_DIR}"
 
-GCLOUD_VERSION="512.0.0"
+GCLOUD_VERSION="565.0.0"
 
 case "$TARGETARCH" in
     amd64)
diff --git a/universal/ubi9/Dockerfile b/universal/ubi9/Dockerfile
index c45d25e0..0e71a6ec 100644
--- a/universal/ubi9/Dockerfile
+++ b/universal/ubi9/Dockerfile
@@ -446,7 +446,7 @@ set -euf -o pipefail
 TEMP_DIR="$(mktemp -d)"
 cd "${TEMP_DIR}"
 
-GCLOUD_VERSION="512.0.0"
+GCLOUD_VERSION="565.0.0"
 
 case "$TARGETARCH" in
     amd64)