From 8643ea850d0f121bec035e38f6e35f9d3b6b8b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hlynur=20=C3=93skar=20Gu=C3=B0mundsson?= Date: Wed, 13 Mar 2024 15:15:44 +0100 Subject: [PATCH 1/5] Migrated from GCR to Artifact Registry --- dist/bin/kctf-challenge | 2 +- dist/bin/kctf-cluster | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/bin/kctf-challenge b/dist/bin/kctf-challenge index 15f32934..143b065c 100755 --- a/dist/bin/kctf-challenge +++ b/dist/bin/kctf-challenge @@ -166,7 +166,7 @@ function push_image { case "${CLUSTER_TYPE}" in gce) - IMAGE_URL="${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}-${IMAGE_NAME}:${IMAGE_ID}" + IMAGE_URL="${ZONE}-${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" docker tag "${IMAGE_ID}" "${IMAGE_URL}" || return docker push "${IMAGE_URL}" || return ;; diff --git a/dist/bin/kctf-cluster b/dist/bin/kctf-cluster index 823b57f0..f02b7792 100755 --- a/dist/bin/kctf-cluster +++ b/dist/bin/kctf-cluster @@ -143,9 +143,9 @@ function kctf_cluster_create_usage { function kctf_cluster_create { # Default Configuration CLUSTER_TYPE="gce" - REGISTRY="eu.gcr.io" + REGISTRY="docker.pkg.dev" PROJECT="" - ZONE="europe-west4-b" + ZONE="europe-west4" CLUSTER_NAME="kctf-cluster" DOMAIN_NAME="" EMAIL_ADDRESS="" From 4d626d89df7ca5cd14c3b884460e2997892fd2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hlynur=20=C3=93skar=20Gu=C3=B0mundsson?= Date: Wed, 20 Mar 2024 14:51:09 +0100 Subject: [PATCH 2/5] Fixed Artifact Registry zone naming issue --- dist/bin/kctf-challenge | 2 +- dist/bin/kctf-cluster | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dist/bin/kctf-challenge b/dist/bin/kctf-challenge index 143b065c..9fc58fbf 100755 --- a/dist/bin/kctf-challenge +++ b/dist/bin/kctf-challenge @@ -166,7 +166,7 @@ function push_image { case "${CLUSTER_TYPE}" in gce) - IMAGE_URL="${ZONE}-${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" + IMAGE_URL="${ARZONE}-${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" docker tag "${IMAGE_ID}" "${IMAGE_URL}" || return docker push "${IMAGE_URL}" || return ;; diff --git a/dist/bin/kctf-cluster b/dist/bin/kctf-cluster index f02b7792..526eebf1 100755 --- a/dist/bin/kctf-cluster +++ b/dist/bin/kctf-cluster @@ -145,7 +145,8 @@ function kctf_cluster_create { CLUSTER_TYPE="gce" REGISTRY="docker.pkg.dev" PROJECT="" - ZONE="europe-west4" + ZONE="europe-west4b" + ARZONE="europe-west4" CLUSTER_NAME="kctf-cluster" DOMAIN_NAME="" EMAIL_ADDRESS="" From 1c384c78ceba052eb7eef706903b1c04796976f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hlynur=20=C3=93skar=20Gu=C3=B0mundsson?= Date: Thu, 18 Apr 2024 13:23:21 +0200 Subject: [PATCH 3/5] leave ZONE as is --- dist/bin/kctf-cluster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/bin/kctf-cluster b/dist/bin/kctf-cluster index 526eebf1..9ea332ca 100755 --- a/dist/bin/kctf-cluster +++ b/dist/bin/kctf-cluster @@ -145,7 +145,7 @@ function kctf_cluster_create { CLUSTER_TYPE="gce" REGISTRY="docker.pkg.dev" PROJECT="" - ZONE="europe-west4b" + ZONE="europe-west4-b" ARZONE="europe-west4" CLUSTER_NAME="kctf-cluster" DOMAIN_NAME="" From 6b740ef3cd281518a51e556dc4d2630750a6be7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hlynur=20=C3=93skar=20Gu=C3=B0mundsson?= Date: Fri, 19 Apr 2024 11:18:16 +0200 Subject: [PATCH 4/5] Remove ARZONE and modify REGISTRY, updated help message --- dist/bin/kctf-challenge | 2 +- dist/bin/kctf-cluster | 6 ++---- dist/bin/kctf-completion | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dist/bin/kctf-challenge b/dist/bin/kctf-challenge index 9fc58fbf..00f94f4a 100755 --- a/dist/bin/kctf-challenge +++ b/dist/bin/kctf-challenge @@ -166,7 +166,7 @@ function push_image { case "${CLUSTER_TYPE}" in gce) - IMAGE_URL="${ARZONE}-${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" + IMAGE_URL="${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" docker tag "${IMAGE_ID}" "${IMAGE_URL}" || return docker push "${IMAGE_URL}" || return ;; diff --git a/dist/bin/kctf-cluster b/dist/bin/kctf-cluster index 9ea332ca..e1482954 100755 --- a/dist/bin/kctf-cluster +++ b/dist/bin/kctf-cluster @@ -123,8 +123,7 @@ function kctf_cluster_create_usage { echo " --zone GCP Zone (default: europe-west4-b)" >&2 echo " For a list of zones run:" >&2 echo " gcloud compute machine-types list --filter=\"name=( n2-standard-4 )\" --format 'value(zone)'" >&2 - echo " --registry Container Registry (default: eu.gcr.io)" >&2 - echo " Possible values are us.gcr.io, asia.gcr.io, and eu.gcr.io" >&2 + echo " --registry Container Registry (default: europe-west4-docker.pkg.dev)" >&2 echo " --cluster-name Name of the kubernetes cluster (default: kctf-cluster)" >&2 echo " --domain-name Required (gce): domain name to host challenges under" >&2 echo " Please make sure not to put anything secret in the challenge name." >&2 @@ -143,10 +142,9 @@ function kctf_cluster_create_usage { function kctf_cluster_create { # Default Configuration CLUSTER_TYPE="gce" - REGISTRY="docker.pkg.dev" + REGISTRY="europe-west4-docker.pkg.dev" PROJECT="" ZONE="europe-west4-b" - ARZONE="europe-west4" CLUSTER_NAME="kctf-cluster" DOMAIN_NAME="" EMAIL_ADDRESS="" diff --git a/dist/bin/kctf-completion b/dist/bin/kctf-completion index 7d3f7d44..aebc1dab 100644 --- a/dist/bin/kctf-completion +++ b/dist/bin/kctf-completion @@ -95,7 +95,7 @@ function _kctf_complete_chal() { # This will be out of date at some point, but still useful so worth it? # We can't fetch it easily with gcloud unfortunately since it requires a project GCP_REGIONS="us-east1-b us-east1-c us-east1-d us-east4-c us-east4-b us-east4-a us-central1-c us-central1-a us-central1-f us-central1-b us-west1-b us-west1-c us-west1-a europe-west4-a europe-west4-b europe-west4-c europe-west1-b europe-west1-d europe-west1-c europe-west3-c europe-west3-a europe-west3-b europe-west2-c europe-west2-b europe-west2-a asia-east1-b asia-east1-a asia-east1-c asia-southeast1-b asia-southeast1-a asia-southeast1-c asia-northeast1-b asia-northeast1-c asia-northeast1-a asia-south1-c asia-south1-b asia-south1-a australia-southeast1-b australia-southeast1-c australia-southeast1-a southamerica-east1-b southamerica-east1-c southamerica-east1-a asia-east2-a asia-east2-b asia-east2-c asia-northeast2-a asia-northeast2-b asia-northeast2-c asia-northeast3-a asia-northeast3-b asia-northeast3-c asia-southeast2-a asia-southeast2-b asia-southeast2-c europe-north1-a europe-north1-b europe-north1-c europe-west6-a europe-west6-b europe-west6-c northamerica-northeast1-a northamerica-northeast1-b northamerica-northeast1-c us-west2-a us-west2-b us-west2-c us-west3-a us-west3-b us-west3-c us-west4-a us-west4-b us-west4-c" -GCP_REGISTRIES="gcr.io asia.gcr.io eu.gcr.io us.gcr.io" +GCP_REGISTRIES="pkg.dev docker.pkg.dev" function _kctf_complete_cluster() { if [ "$COMP_CWORD" == "2" ]; then From 3976fdec31aeabc10d41dfeaa2337f0a789f6698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hlynur=20=C3=93skar=20Gu=C3=B0mundsson?= Date: Fri, 19 Apr 2024 11:20:58 +0200 Subject: [PATCH 5/5] Added CLUSTER_NAME to IMAGE url to avoid collisions --- dist/bin/kctf-challenge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/bin/kctf-challenge b/dist/bin/kctf-challenge index 00f94f4a..1e3a877a 100755 --- a/dist/bin/kctf-challenge +++ b/dist/bin/kctf-challenge @@ -166,7 +166,7 @@ function push_image { case "${CLUSTER_TYPE}" in gce) - IMAGE_URL="${REGISTRY}/${PROJECT}/${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" + IMAGE_URL="${REGISTRY}/${PROJECT}/${CLUSTER_NAME}-${CHALLENGE_NAME}/${IMAGE_NAME}:${IMAGE_ID}" docker tag "${IMAGE_ID}" "${IMAGE_URL}" || return docker push "${IMAGE_URL}" || return ;;