Skip to content

Commit be0d52b

Browse files
committed
update GCP/GKE auth handling
1 parent 69ca4ec commit be0d52b

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

.github/workflows/gke-ap-workload-allowlist-check.yaml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ concurrency:
1313
# steps to create a GKE Autopilot cluster on the fly and discard it after the GH action run.
1414
group: gke-ap-workload-allowlist-check-concurrency-group
1515

16+
17+
# Note: We could potentially optimize this check by only running it when the Helm chart has changed.
1618
jobs:
1719
check_workload_allowlists:
1820
name: Check WorkloadAllowlists
@@ -22,25 +24,28 @@ jobs:
2224
steps:
2325
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
2426

25-
# set up the gcloud CLI
26-
- uses: google-github-actions/setup-gcloud@1bee7de035d65ec5da40a31f8589e240eba8fde5
27+
- id: 'auth'
28+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
2729
with:
28-
service_account_key: ${{ secrets.GKE_SA_KEY }}
29-
project_id: ${{ secrets.GKE_PROJECT }}
30+
credentials_json: '${{ secrets.GKE_SA_KEY }}'
3031

31-
# Configure Docker to use the gcloud command-line tool as a credential
32+
# set up the gcloud CLI
33+
#- name: set up Cloud SDK
34+
# uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
35+
# with:
36+
# project_id: ${{ secrets.GKE_PROJECT }}
37+
38+
# configure Docker to use the gcloud command-line tool as a credential
3239
# helper for authentication
33-
- run: |-
34-
gcloud --quiet auth configure-docker
40+
# - run: |-
41+
# gcloud --quiet auth configure-docker
3542

36-
# Get the GKE credentials so we can deploy to the cluster
37-
- uses: google-github-actions/get-gke-credentials@db150f2cc60d1716e61922b832eae71d2a45938f
43+
# get the GKE credentials so we can deploy to the cluster
44+
- uses: google-github-actions/get-gke-credentials@3da1e46a907576cefaa90c484278bb5b259dd395
3845
with:
46+
project_id: ${{ secrets.GKE_PROJECT }}
3947
cluster_name: ${{ env.GKE_CLUSTER }}
4048
location: ${{ env.GKE_ZONE }}
41-
credentials: ${{ secrets.GKE_SA_KEY }}
42-
43-
# Note: We could potentially optimize this check by only running it when the Helm chart has changed.
4449

4550
- name: run check
4651
run: |-

0 commit comments

Comments
 (0)