initial gcp fixes

Author: commjoen

aws/build-and-deploy-aws.sh

@@ -154,7 +154,7 @@ export HELM_EXPERIMENTAL_OCI=1
 kubectl create namespace ctfd
 
 # Double base64 encoding to prevent weird character errors in ctfd
-helm upgrade --install ctfd -n ctfd oci://ghcr.io/bman46/ctfd/ctfd \
+helm upgrade --install ctfd -n ctfd oci://ghcr.io/bman46/ctfd/ctfd --version 0.6.3\
   --set="redis.auth.password=$(openssl rand -base64 24 | base64)" \
   --set="mariadb.auth.rootPassword=$(openssl rand -base64 24 | base64)" \
   --set="mariadb.auth.password=$(openssl rand -base64 24 | base64)" \

gcp/README.md

@@ -51,19 +51,7 @@ The bucket name should be in the output. Please use that to configure the Terraf
 7. Run `terraform apply`. Note: the apply will take 10 to 20 minutes depending on the speed of the GCP backplane.
 8. Run `export USE_GKE_GCLOUD_AUTH_PLUGIN=True`
 9. When creation is done, run `gcloud container clusters get-credentials wrongsecrets-exercise-cluster --region YOUR_REGION`. Note if it errors on a missing plugin to support `kubectl`, then run `gcloud components install gke-gcloud-auth-plugin` and `gcloud container clusters get-credentials wrongsecrets-exercise-cluster`.
-10. Go to the values of the helm chart and replace the wrongsecrets.config with this:
-
-    ```yaml
-    K8S_ENV: "gcp"
-    ```
-
-    and replace the value of wrongsecrets.env having the name 'K8S_ENV' with this:
-
-    ```yaml
-    value: "gcp"
-    ```
-
-11. Run `./build-and-deploy-gcp.sh`
+10. Run `./build-and-deploy-gcp.sh`
 
 Your GKE cluster should be visible in [EU-West4](https://console.cloud.google.com/kubernetes?referrer=search&project=wrongsecrets) by default. Want a different region? You can modify `terraform.tfvars` or input it directly using the `region` variable in plan/apply.
 

gcp/build-and-deploy-gcp.sh

@@ -104,13 +104,12 @@ echo "You can find the app password in password.txt"
 
 helm upgrade --install wrongsecrets ../helm/wrongsecrets-ctf-party \
   --set="balancer.env.K8S_ENV=gcp" \
+  --set="balancer.tag=1.9.0alpha5-cloud" \
   --set="balancer.env.REACT_APP_GCP_BUCKET_URL=https://console.cloud.google.com/storage/browser/${GCP_BUCKET_NAME}" \
   --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${APP_PASSWORD}" \
   --set="balancer.env.REACT_APP_CREATE_TEAM_HMAC_KEY=${CREATE_TEAM_HMAC}" \
   --set="balancer.cookie.cookieParserSecret=${COOKIE_PARSER_SECRET}" \
-  --set="balancer.env.GCP_PROJECT_ID=${GCP_PROJECT}" \
-  --set="balancer.repository=osamamagdy/wrongsecrets-balancer" \
-  --set="balancer.tag=v1.3.5"
+  --set="balancer.env.GCP_PROJECT_ID=${GCP_PROJECT}"
 
 kubectl annotate serviceaccount \
   --namespace default wrongsecrets-balancer \

gcp/secrets.tf

@@ -5,7 +5,7 @@
 resource "google_secret_manager_secret" "wrongsecret_1" {
   secret_id = "wrongsecret-1"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -36,7 +36,7 @@ resource "google_secret_manager_secret_version" "secret_version_basic" {
 resource "google_secret_manager_secret" "wrongsecret_2" {
   secret_id = "wrongsecret-2"
   replication {
-    automatic = true
+    auto {}
   }
 }
 
@@ -54,7 +54,7 @@ resource "google_secret_manager_secret_iam_member" "wrongsecret_2_member" {
 resource "google_secret_manager_secret" "wrongsecret_3" {
   secret_id = "wrongsecret-3"
   replication {
-    automatic = true
+    auto {}
   }
 }
 

wrongsecrets-balancer/ui/package-lock.json

@@ -4,7 +4,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@formatjs/intl-utils": "^3.8.4",
-    "axios": "^1.7.3",
+    "axios": "^1.7.5",
     "crypto-js": "^4.2.0",
     "promise-retry": "^2.0.1",
     "react": "^18.3.1",