Skip to content

Commit 63c0f0e

Browse files
authored
ltsr migrate to aws (#234)
Signed-off-by: Allen Li <[email protected]>
1 parent be35cb8 commit 63c0f0e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

common/Makefile.common.mk

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,15 @@ CLUSTER ?= bedrock-prow
2424

2525
activate-serviceaccount:
2626
ifdef GOOGLE_APPLICATION_CREDENTIALS
27-
gcloud auth activate-service-account --key-file="$(GOOGLE_APPLICATION_CREDENTIALS)"
27+
gcloud auth activate-service-account --key-file="$(GOOGLE_APPLICATION_CREDENTIALS)" || true
2828
endif
2929

3030
get-cluster-credentials: activate-serviceaccount
31-
gcloud container clusters get-credentials "$(CLUSTER)" --project="$(PROJECT)" --zone="$(ZONE)"
31+
mkdir -p ~/.kube; cp -v /etc/kubeconfig/config ~/.kube; kubectl config use-context default; kubectl get nodes; echo going forward retiring google cloud
32+
33+
ifdef GOOGLE_APPLICATION_CREDENTIALS
34+
gcloud container clusters get-credentials "$(CLUSTER)" --project="$(PROJECT)" --zone="$(ZONE)" || true
35+
endif
3236

3337
config-docker: get-cluster-credentials
3438
@common/scripts/artifactory_config_docker.sh

0 commit comments

Comments
 (0)