From 166a2716cc6ae8e6b95525bcd60738f1d89a6c00 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman+06301990@puppet.com>
Date: Mon, 27 Jun 2022 17:02:07 -0400
Subject: [PATCH] Install gcloud cli via apt repo instead

---
 ansible/carbonbean.yaml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/ansible/carbonbean.yaml b/ansible/carbonbean.yaml
index c53ca98..6e4f168 100644
--- a/ansible/carbonbean.yaml
+++ b/ansible/carbonbean.yaml
@@ -6,7 +6,7 @@
   tasks:
 
     - name: Add 1Password apt signing key
-      include_role:
+      ansible.builtin.include_role:
         name: jack1142.apt_signing_key
       vars:
         url: https://downloads.1password.com/linux/keys/1password.asc
@@ -21,8 +21,23 @@
         filename: 1password
         update_cache: false
 
+    - name: Add Google Cloud apt key
+      become: true
+      ansible.builtin.apt_key:
+        url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+        keyring: /usr/share/keyrings/cloud.google.gpg
+        state: present
+
+    - name: Add Google apt repo
+      become: true
+      ansible.builtin.apt_repository:
+        repo: deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main
+        state: present
+        filename: google-cloud-sdk
+        update_cache: false
+
     - name: Add Okta ASA client apt signing key
-      include_role:
+      ansible.builtin.include_role:
         name: jack1142.apt_signing_key
       vars:
         url: https://dist.scaleft.com/pki/scaleft_deb_key.asc
@@ -52,7 +67,7 @@
         update_cache: false
 
     - name: Add Tailscale apt signing key
-      include_role:
+      ansible.builtin.include_role:
         name: jack1142.apt_signing_key
       vars:
         url: https://pkgs.tailscale.com/stable/ubuntu/jammy.noarmor.gpg
@@ -112,6 +127,8 @@
           - git
           - git-lfs
           - gnupg
+          - google-cloud-cli
+          - google-cloud-cli-gke-gcloud-auth-plugin
           - htop
           - httpie
           - hub
@@ -217,7 +234,6 @@
         classic: true
         name:
           - gitkraken # official version
-          - google-cloud-cli # official version
 
     - name: Cider from Snapcraft
       become: true