Skip to content

Now gcloud is facultative with kctf-config-create and kctf-config-load #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 25, 2020
Merged

Now gcloud is facultative with kctf-config-create and kctf-config-load #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0921c8d
Now gcloud is facultative with kctf-config-create and kctf-config-load
aliciafmachado Jun 24, 2020
9ab6118
Adding comments
aliciafmachado Jun 24, 2020
20dc42e
Small fix
aliciafmachado Jun 24, 2020
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
7 changes: 6 additions & 1 deletion scripts/setup/config-create.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,12 @@ EOF

ln -fs "${CLUSTER_CONFIG}" "${CONFIG_FILE}"

create_gcloud_config
# checks if gcloud is installed, if not, it creates only locally
if command -v gcloud >/dev/null 2>&1; then
create_gcloud_config
else
echo "Configuration created only locally. Gcloud not installed." >&2
fi

# there might be an existing cluster
# if it already exists, we try to update it
Expand Down
7 changes: 6 additions & 1 deletion scripts/setup/config-load.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,12 @@ CONFIG_FILE_DIR="$(dirname ${CONFIG_FILE})"
CHAL_DIR=$(realpath "${CONFIG_FILE_DIR}/../..")
ln -nfs "${CHAL_DIR}" "${CONFIG_DIR}/challenges"

create_gcloud_config
# checks if gcloud is installed, if not, it loads only locally
if command -v gcloud >/dev/null 2>&1; then
create_gcloud_config
else
echo "Configuration loaded only locally. Gcloud not installed." >&2
fi

# there might be an existing cluster, try to get the creds
get_cluster_creds 2>/dev/null || true