From f845d5ada14f579831c5d186976e7cf0f2fd0830 Mon Sep 17 00:00:00 2001
From: Rick Lane <rlane@datawire.io>
Date: Fri, 12 Apr 2024 10:44:50 -0400
Subject: [PATCH] Remove gke-kubeconfig action

---
 .github/actions/gke-kubeconfig/action.yaml    | 18 ------------------
 .github/actions/provision-cluster/action.yaml |  4 ++++
 provision-cluster/action.yaml                 | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 100644 .github/actions/gke-kubeconfig/action.yaml

diff --git a/.github/actions/gke-kubeconfig/action.yaml b/.github/actions/gke-kubeconfig/action.yaml
deleted file mode 100644
index 96383140..00000000
--- a/.github/actions/gke-kubeconfig/action.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: "GKE Kubeconfig"
-description: "Generate different Kubeconfig formats compatible with GKE."
-inputs:
-  gkeCredentials:
-    description: "GKE credentials used to create GKE clusters. Optional if GKE clusters are not required"
-    required: false
-runs:
-  using: "composite"
-  steps:
-    - name: Authenticate to Google Cloud
-      uses: google-github-actions/auth@v2
-      with:
-        credentials_json: ${{ inputs.gkeCredentials }}
-        create_credentials_file: true
-    - name: Install gke-gcloud-auth-plugin
-      uses: google-github-actions/setup-gcloud@v2
-      with:
-        install_components: gke-gcloud-auth-plugin
diff --git a/.github/actions/provision-cluster/action.yaml b/.github/actions/provision-cluster/action.yaml
index 162509e2..78e87079 100644
--- a/.github/actions/provision-cluster/action.yaml
+++ b/.github/actions/provision-cluster/action.yaml
@@ -38,6 +38,10 @@ inputs:
     description: "The profile to use for kubeception clusters."
     required: false
     default: "default"
+  useAuthProvider:
+    description: "For GKE clusters, if true, use an authentication provider."
+    required: false
+    default: "true"
 outputs:
   clusterName:
     description: "Name of the cluster."
diff --git a/provision-cluster/action.yaml b/provision-cluster/action.yaml
index bceb3cfe..2190d409 100644
--- a/provision-cluster/action.yaml
+++ b/provision-cluster/action.yaml
@@ -64,6 +64,17 @@ runs:
         repository: ${{ env.REPO }}
         ref: ${{ env.REF }}
         path: infra-actions
+    - name: Authenticate to Google Cloud
+      uses: google-github-actions/auth@v2
+      if: ${{ inputs.distribution == 'GKE' && inputs.action != 'expire' }}
+      with:
+        credentials_json: ${{ inputs.gkeCredentials }}
+        create_credentials_file: true
+    - name: Install gke-gcloud-auth-plugin
+      uses: google-github-actions/setup-gcloud@v2
+      if: ${{ inputs.distribution == 'GKE' && inputs.action != 'expire' }}
+      with:
+        install_components: gke-gcloud-auth-plugin
     - id: provision-cluster
       uses: ./infra-actions/.github/actions/provision-cluster
       with:
@@ -80,8 +91,3 @@ runs:
         gkeConfig: ${{ inputs.gkeConfig }}
         kubeceptionProfile: ${{ inputs.kubeceptionProfile }}
         useAuthProvider: ${{ inputs.useAuthProvider }}
-    - name: "Get GKE kubeconfig"
-      uses: ./infra-actions/.github/actions/gke-kubeconfig
-      if: ${{ inputs.distribution == 'GKE' && inputs.action != 'expire' }}
-      with:
-        gkeCredentials: ${{ inputs.gkeCredentials }}