Merge pull request #340 from osamamagdy/feat--add-gcp-support

Feat  add gcp support

Author: commjoen

.github/dependabot.yml

@@ -38,3 +38,7 @@ updates:
     directory: "/azure"
     schedule:
       interval: "monthly"
+  - package-ecosystem: "terraform"
+    directory: "/gcp"
+    schedule:
+      interval: "monthly"

.gitignore

@@ -20,3 +20,4 @@ db.zip
 *.auto.tfvars
 node_modules
 .npm
+gcp/k8s/secret-volume.yml

azure/build-and-deploy-azure.sh

@@ -57,6 +57,8 @@ export AZ_VAULT_URI="$(terraform output -raw vault_uri)"
 export AZ_KEY_VAULT_TENANT_ID="$(terraform output -raw tenant_id)"
 export AZ_KEY_VAULT_NAME="$(terraform output -raw vault_name)"
 
+export AZ_STORAGE_ACCOUNT="$(terraform output -chdir=./shared-state -raw storage_account_name)"
+
 # Set the kubeconfig
 az aks get-credentials --resource-group $RESOURCE_GROUP --name $CLUSTER_NAME
 
@@ -150,6 +152,7 @@ echo "You can find the app password in password.txt"
 
 helm upgrade --install mj ../helm/wrongsecrets-ctf-party \
   --set="balancer.env.K8S_ENV=azure" \
+  --set="balancer.env.REACT_APP_AZ_BLOB_URL=https://${AZ_STORAGE_ACCOUNT}.blob.core.windows.net/tfstate" \
   --set="balancer.env.REACT_APP_ACCESS_PASSWORD=${APP_PASSWORD}" \
   --set="balancer.env.REACT_APP_CREATE_TEAM_HMAC_KEY=${CREATE_TEAM_HMAC}" \
   --set="balancer.env.AZ_KEY_VAULT_NAME=${AZ_KEY_VAULT_NAME}" \

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

@@ -22,11 +22,7 @@ echo "If you applied the ctfd ingress, you need to delete it manually"
 # Give some time for the controller to remove cleaned ingresses
 sleep 5
 
-echo "Cleanup helm chart"
-helm uninstall ingress-nginx \
-  -n ingress-nginx
-
-echo "Delete the namespace"
+echo "Delete the ingress-nginx namespace"
 
 kubectl delete namespace ingress-nginx
 

azure/shared-state/main.tf

@@ -3,9 +3,11 @@ terraform {
   required_providers {
     azurerm = {
       version = "~> 3.0"
+      source  = "hashicorp/azurerm"
     }
     random = {
       version = "~> 3.0"
+      source  = "hashicorp/random"
     }
   }
 }
@@ -16,7 +18,7 @@ provider "azurerm" {
 }
 
 # If you're using an existing resource group, modify this part. That'll definitely be the case if you're using shared state!
-# Note that you'll need to find/replace references to "arurerm_resource_group.default" to "data.azurerm_resource_group.default"
+# Note that you'll need to find/replace references to "azurerm_resource_group.default" to "data.azurerm_resource_group.default"
 #data "azurerm_resource_group" "default" {
 #  name = "owasp-wrongsecrets"
 #}