diff --git a/import-scripts/backup-eks-dbs.sh b/import-scripts/backup-eks-dbs.sh index cc3455851..456aa9621 100755 --- a/import-scripts/backup-eks-dbs.sh +++ b/import-scripts/backup-eks-dbs.sh @@ -21,7 +21,7 @@ for db in ${DBS[@]}; do $(set -o pipefail && mysqldump --login-path=mysql_localhost --quick $db | gzip > $SQLDUMP_FULLPATH) if [ $? -eq 0 ]; then echo "Successfully dumped: '${SQLDUMP_FILENAME}'" - . /data/portal-cron/git-repos/portal-configuration/eks-cluster/pipelines/authenticate_service_account.sh + . /data/portal-cron/git-repos/portal-configuration/eks-cluster/pipelines/authenticate_service_account.sh eks aws s3 cp ${SQLDUMP_FULLPATH} s3://cbioportal-backups/${SQLDUMP_FILENAME} --profile saml if [ $? -ne 0 ]; then echo "ERROR: failed to cp '${SQLDUMP_FILENAME}' to S3" diff --git a/import-scripts/clear_cbioportal_persistence_cache.sh b/import-scripts/clear_cbioportal_persistence_cache.sh index d10e394ac..ccaf8d8dd 100755 --- a/import-scripts/clear_cbioportal_persistence_cache.sh +++ b/import-scripts/clear_cbioportal_persistence_cache.sh @@ -77,9 +77,10 @@ fi unset KUBECONFIG_ARG if [ "$cluster_id" == "$CLUSTER_ID_DIGITS" ] ; then - /data/portal-cron/scripts/authenticate_service_account.sh + /data/portal-cron/scripts/authenticate_service_account.sh eks else if ! [ -z $PUBLIC_CLUSTER_KUBECONFIG ] ; then + /data/portal-cron/scripts/authenticate_service_account.sh public KUBECONFIG_ARG="--kubeconfig $PUBLIC_CLUSTER_KUBECONFIG" fi fi diff --git a/import-scripts/delete_slow_to_terminate_pods.sh b/import-scripts/delete_slow_to_terminate_pods.sh index 1c1eac70c..4d5534c64 100755 --- a/import-scripts/delete_slow_to_terminate_pods.sh +++ b/import-scripts/delete_slow_to_terminate_pods.sh @@ -183,7 +183,7 @@ MY_FLOCK_FILEPATH="/data/portal-cron/cron-lock/delete_slow_to_terminate_pods.loc mv $temp_file $POD_TERMINATING_TIMESTAMP_FILE } - /data/portal-cron/scripts/authenticate_service_account.sh + /data/portal-cron/scripts/authenticate_service_account.sh eks check_for_dependencies now=$(date +%s) make_work_dir_if_necessary diff --git a/import-scripts/precache-portals.py b/import-scripts/precache-portals.py index b924c8326..b55b5e0db 100755 --- a/import-scripts/precache-portals.py +++ b/import-scripts/precache-portals.py @@ -30,7 +30,7 @@ def authenticate_service_account(): try: - subprocess.check_output(["/data/portal-cron/scripts/authenticate_service_account.sh"]) + subprocess.check_output(["/data/portal-cron/scripts/authenticate_service_account.sh public"]) except: print "Attempt to authenticate to k8s cluster failed with non-zero exit status, exiting..." sys.exit(1)