Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions common/Makefile.common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ OLM_API_VERSION = 0.3.8

activate-serviceaccount:
ifdef GOOGLE_APPLICATION_CREDENTIALS
gcloud auth activate-service-account --key-file="$(GOOGLE_APPLICATION_CREDENTIALS)"
gcloud auth activate-service-account --key-file="$(GOOGLE_APPLICATION_CREDENTIALS)" || true
endif

get-cluster-credentials: activate-serviceaccount
gcloud container clusters get-credentials "$(CLUSTER)" --project="$(PROJECT)" --zone="$(ZONE)"
mkdir -p ~/.kube; cp -v /etc/kubeconfig/config ~/.kube; kubectl config use-context default; kubectl get nodes; echo going forward retiring google cloud

ifdef GOOGLE_APPLICATION_CREDENTIALS
gcloud container clusters get-credentials "$(CLUSTER)" --project="$(PROJECT)" --zone="$(ZONE)" || true
endif

config-docker: get-cluster-credentials
@common/scripts/artifactory_config_docker.sh
Expand Down