Updated google-cloud-sdk for Google Issue 383568269

Author: jmcombs

README.md

@@ -8,7 +8,7 @@
 
 The `google-cloud-sdk` feature installs the Google Cloud SDK and optional additional components.
 
-**NOTE:** Ubuntu 24.04 is currently **not** supported by this feature due to an issue with the `apt` package manager. The issue is being tracked [here]() and will be resolved once a fix is available.
+**NOTE:** If using Ubuntu 24.04 on `arm64` [Google Cloud SDK Issue 383568269](https://issuetracker.google.com/issues/383568269) is currently being worked on to resolve the issue. Until resolved, version 502.0.0-0 will be installed.
 
 ### ngrok
 

src/google-cloud-sdk/install.sh

@@ -1,21 +1,22 @@
 #!/bin/sh
 set -e
 
-# Check if the OS is Ubuntu 24.04 and exit with a message if true
-if [ -f /etc/os-release ]; then
-    . /etc/os-release
-    if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "24.04" ]; then
-        echo "This feature does not support Ubuntu 24.04 due to a Python version conflict."
-        exit 1
-    fi
-fi
-
 # Install dependencies
 apt-get update && apt-get install -y --no-install-recommends apt-transport-https ca-certificates gnupg curl
 
 # Add the Cloud SDK distribution URI as a package source
 curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg
 echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
 
+# Check if the OS is Ubuntu 24.04 and the architecture is arm64, and exit with a message if true
+if [ -f /etc/os-release ]; then
+    . /etc/os-release
+    if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "24.04" ] && [ "$(uname -m)" = "aarch64" ]; then
+        echo "Installing google-cloud-cli 502.0.0-0 on Ubuntu 24.04 on arm64 architecture due to https://issuetracker.google.com/issues/383568269."
+        apt-get update && apt-get install -y google-cloud-cli=502.0.0-0 ${GCLOUD_EXTRA_PACKAGES}
+        exit 0
+    fi
+fi
+
 # Update and install the Google Cloud SDK
 apt-get update && apt-get install -y google-cloud-cli ${GCLOUD_EXTRA_PACKAGES}