From a278d424991fb16153489237ec006c348a2ca281 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com>
Date: Mon, 26 Aug 2024 19:13:04 -0400
Subject: [PATCH] Install gcloud cli

---
 files/gcloud/etc/yum.repos.d/google-cloud-sdk.repo |  7 +++++++
 files/kubectl/etc/yum.repos.d/kubectl.repo         |  6 ++++++
 recipes/common/dev-packages.yml                    | 10 +++++++---
 recipes/common/gaming.yml                          |  5 -----
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 files/gcloud/etc/yum.repos.d/google-cloud-sdk.repo
 create mode 100644 files/kubectl/etc/yum.repos.d/kubectl.repo

diff --git a/files/gcloud/etc/yum.repos.d/google-cloud-sdk.repo b/files/gcloud/etc/yum.repos.d/google-cloud-sdk.repo
new file mode 100644
index 0000000..e0bc693
--- /dev/null
+++ b/files/gcloud/etc/yum.repos.d/google-cloud-sdk.repo
@@ -0,0 +1,7 @@
+[google-cloud-cli]
+name=Google Cloud CLI
+baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el9-x86_64
+enabled=1
+gpgcheck=1
+repo_gpgcheck=0
+gpgkey=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
diff --git a/files/kubectl/etc/yum.repos.d/kubectl.repo b/files/kubectl/etc/yum.repos.d/kubectl.repo
new file mode 100644
index 0000000..fb52c55
--- /dev/null
+++ b/files/kubectl/etc/yum.repos.d/kubectl.repo
@@ -0,0 +1,6 @@
+[kubernetes]
+name=Kubernetes
+baseurl=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/
+enabled=1
+gpgcheck=1
+gpgkey=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/repodata/repomd.xml.key
diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml
index 5f3315f..d725a7e 100644
--- a/recipes/common/dev-packages.yml
+++ b/recipes/common/dev-packages.yml
@@ -1,8 +1,11 @@
 modules:
   - from-file: common/docker-engine.yml
-  - type: script
-    scripts:
-      - setup-kubectl.sh
+  - type: files
+    files:
+      - source: gcloud
+        destination: /
+      - source: kubectl
+        destination: /
   - type: rpm-ostree
     repos:
       - https://pkg.earthly.dev/earthly.repo
@@ -25,6 +28,7 @@ modules:
       - gh
       - go
       - git-lfs
+      - google-cloud-cli
   - type: script
     scripts:
       - install-mkcert.sh
diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml
index 69bb387..4623714 100644
--- a/recipes/common/gaming.yml
+++ b/recipes/common/gaming.yml
@@ -6,8 +6,3 @@ modules:
   - type: rpm-ostree
     install:
       - https://github.com/ebkr/r2modmanPlus/releases/download/v3.1.49/r2modman-3.1.49.x86_64.rpm
-  # - type: r2modman
-  #   version: 3.1.49
-  # - type: script
-  #   scripts:
-  #     - install-gamescope-plus.sh