requested changes

Signed-off-by: osamamagdy <[email protected]>

Author: osamamagdy

.github/dependabot.yml

@@ -34,3 +34,11 @@ updates:
     directory: "/aws"
     schedule:
       interval: "monthly"
+  - package-ecosystem: "terraform"
+    directory: "/azure"
+    schedule:
+      interval: "monthly"
+  - package-ecosystem: "terraform"
+    directory: "/gcp"
+    schedule:
+      interval: "monthly"

gcp/README.md

@@ -54,13 +54,13 @@ The bucket name should be in the output. Please use that to configure the Terraf
 10. Go to the values of the helm chart and replace the wrongsecrets.config with this:
 
     ```yaml
-    K8S_ENV: "azure"
+    K8S_ENV: "gcp"
     ```
 
     and replace the value of wrongsecrets.env having the name 'K8S_ENV' with this:
 
     ```yaml
-    value: "azure"
+    value: "gcp"
     ```
 
 11. Run `./build-and-deploy-gcp.sh`
@@ -135,7 +135,7 @@ We added additional scripts for adding a Load Balancer and ingress so that you c
 Do the following:
 
 1. Follow the installation section first.
-2. Run `./k8s-nginx-lb-script.sh` and the script will return the url at which you can reach the application. (Be aware this opens the url's to the internet in general, if you'd like to limit the access please do this using the security groups in Azure)
+2. Run `./k8s-nginx-lb-script.sh` and the script will return the url at which you can reach the application. (Be aware this opens the url's to the internet in general, if you'd like to limit the access please do this using the security groups in gcp)
 3. When you are done, before you do cleanup, first run `./k8s-nginx-lb-script-cleanup.sh`.
 
 Note that you might have to do some manual cleanups after that.

gcp/build-and-deploy-gcp.sh

@@ -68,8 +68,6 @@ echo "Apply secretsmanager storage volume"
 kubectl apply -f./k8s/secret-volume.yml
 
 
-envsubst <./k8s/secret-challenge-vault-deployment.yml.tpl >./k8s/secret-challenge-vault-deployment.yml
-
 echo "Installing metrics api-server"
 kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
 

gcp/k8s-nginx-lb-script-cleanup.sh

@@ -29,4 +29,4 @@ kubectl delete namespace ingress-nginx
 echo "Fecthing network endpoint groups. If this yields results, clean them up:"
 gcloud compute network-endpoint-groups list
 
-echo "After tha, you can delete using terraform destroy"
+echo "Finished Cleaning ingress, you can now delete everything else using terraform destroy"

gcp/k8s/ctfd_resources/index_fragment.html

@@ -2,7 +2,7 @@
     <div class="col-md-6 offset-md-3">
         <img class="w-100 mx-auto d-block" style="max-width: 500px;padding: 50px;padding-top: 14vh;" src="https://owasp.org/www-project-wrongsecrets/assets/images/icon.png" />
         <h3 class="text-center">
-            <p>Welcome to the OWASP Benelux day 2022 CTF!</p>
+            <p>Welcome to the Wrongsecrets CTF Party!</p>
             <p>Star us on GitHub:</p>
             <a href="https://github.com/OWASP/wrongsecrets"><i class="fab fa-github fa-2x" aria-hidden="true"></i></a>
         </h3>

gcp/k8s/secret-challenge-vault-deployment.yml

@@ -82,7 +82,7 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets
 | balancer.env.GCP_SECRETS_MANAGER_SECRET_ID_1 | string | `"wrongsecret"` |  |
 | balancer.env.GCP_SECRETS_MANAGER_SECRET_ID_2 | string | `"wrongsecret-2"` |  |
 | balancer.env.IRSA_ROLE | string | `"arn:aws:iam::233483431651:role/wrongsecrets-secret-manager"` |  |
-| balancer.env.K8S_ENV | string | `"gcp"` |  |
+| balancer.env.K8S_ENV | string | `"k8s"` |  |
 | balancer.env.REACT_APP_ACCESS_PASSWORD | string | `""` |  |
 | balancer.env.REACT_APP_CREATE_TEAM_HMAC_KEY | string | `"hardcodedkey"` |  |
 | balancer.env.REACT_APP_CTFD_URL | string | `"https://ctfd.io"` |  |

gcp/k8s/secret-challenge-vault-deployment.yml.tpl

@@ -92,7 +92,7 @@ balancer:
     REACT_APP_HEROKU_WRONGSECRETS_URL: "https://wrongsecrets-ctf.herokuapp.com" #required for 3 domain setup
     REACT_APP_CTFD_URL: "https://ctfd.io" #requierd for 2 and 3 domain setup
     REACT_APP_S3_BUCKET_URL: "s3://funstuff" #the s3 bucket you use for teh aws challenges, don't forget to make it accessible!
-    K8S_ENV: "gcp" #or 'aws', 'azure', or 'gcp'
+    K8S_ENV: "k8s" #or 'aws', 'azure', or 'gcp'
     REACT_APP_ACCESS_PASSWORD: "" #DEFAULT NO PASSWORD, PLAYING THIS IN PUBLIC? PUT A FANCY STRING HERE, BUT BE GENTLE: USERS NEED TO BE ABLE TO COPY THAT STUFF...
     REACT_APP_CREATE_TEAM_HMAC_KEY: "hardcodedkey"
     IRSA_ROLE: arn:aws:iam::233483431651:role/wrongsecrets-secret-manager #change this in your own AWS role!