Remove gke-kubeconfig action

datawire · Apr 12, 2024 · f845d5a · f845d5a
1 parent 3188a3f
commit f845d5a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/.github/actions/gke-kubeconfig/action.yaml b/.github/actions/gke-kubeconfig/action.yaml
diff --git 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
@@ -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 }}