Skip to content

Commit 0596de8

Browse files
commjoencommjoen
committed
Merge branch 'main' into feat-update-proxy
2 parents 7b44ed9 + 66c4d45 commit 0596de8

16 files changed

+208
-148
lines changed

‎aws/.terraform.lock.hcl

+42-42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aws/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,19 @@ The documentation below is auto-generated to give insight on what's created via
135135

136136
| Name | Version |
137137
|------|---------|
138-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.61.0 |
139-
| <a name="provider_http"></a> [http](#provider\_http) | 3.2.1 |
140-
| <a name="provider_random"></a> [random](#provider\_random) | 3.4.3 |
138+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 4.65.0 |
139+
| <a name="provider_http"></a> [http](#provider\_http) | 3.3.0 |
140+
| <a name="provider_random"></a> [random](#provider\_random) | 3.5.1 |
141141

142142
## Modules
143143

144144
| Name | Source | Version |
145145
|------|--------|---------|
146146
| <a name="module_cluster_autoscaler_irsa_role"></a> [cluster\_autoscaler\_irsa\_role](#module\_cluster\_autoscaler\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.16.0 |
147147
| <a name="module_ebs_csi_irsa_role"></a> [ebs\_csi\_irsa\_role](#module\_ebs\_csi\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.16.0 |
148-
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.12.0 |
148+
| <a name="module_eks"></a> [eks](#module\_eks) | terraform-aws-modules/eks/aws | 19.13.1 |
149149
| <a name="module_load_balancer_controller_irsa_role"></a> [load\_balancer\_controller\_irsa\_role](#module\_load\_balancer\_controller\_irsa\_role) | terraform-aws-modules/iam/aws//modules/iam-role-for-service-accounts-eks | ~> 5.16.0 |
150-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 3.19.0 |
150+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | ~> 4.0.1 |
151151

152152
## Resources
153153

‎aws/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ data "aws_availability_zones" "available" {}
3737

3838
module "vpc" {
3939
source = "terraform-aws-modules/vpc/aws"
40-
version = "~> 3.19.0"
40+
version = "~> 4.0.1"
4141

4242
name = "${var.cluster_name}-vpc"
4343
cidr = local.vpc_cidr
@@ -62,7 +62,7 @@ module "vpc" {
6262

6363
module "eks" {
6464
source = "terraform-aws-modules/eks/aws"
65-
version = "19.12.0"
65+
version = "19.13.1"
6666

6767
cluster_name = var.cluster_name
6868
cluster_version = var.cluster_version

‎build-an-deploy.sh

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ source ./scripts/check-available-commands.sh
1010
checkCommandsAvailable helm docker kubectl yq
1111

1212
version="$(uuidgen)"
13+
eval $(minikube docker-env)
1314
docker login
1415
WRONGSECRETS_IMAGE=$(cat helm/wrongsecrets-ctf-party/values.yaml| yq '.wrongsecrets.image')
1516
WRONGSECRETS_TAG=$(cat helm/wrongsecrets-ctf-party/values.yaml| yq '.wrongsecrets.tag')

‎build-and-deploy-container-minikube.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
source ./scripts/check-available-commands.sh
4+
checkCommandsAvailable helm docker kubectl yq minikube
5+
6+
minikube delete
7+
minikube start --cpus=6 --memory=8000MB --network-plugin=cni --cni=calico --driver=docker --kubernetes-version=1.25.6
8+
eval $(minikube docker-env)
9+
./build-an-deploy-container.sh
10+
11+
sleep 5
12+
13+
echo "let's go!"
14+
15+
kubectl port-forward service/wrongsecrets-balancer 3000:3000

‎build-and-deploy-minikube.sh

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#!/usr/bin/env bash
2+
3+
source ./scripts/check-available-commands.sh
4+
checkCommandsAvailable helm docker kubectl yq minikube
5+
6+
minikube delete
7+
minikube start --cpus=6 --memory=8000MB --network-plugin=cni --cni=calico --driver=docker --kubernetes-version=1.25.6
8+
eval $(minikube docker-env)
9+
./build-an-deploy.sh
10+
11+
sleep 15
12+
13+
echo "let's go!"
14+
15+
kubectl port-forward service/wrongsecrets-balancer 3000:3000

‎cleaner/package-lock.json

+33-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cleaner/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"winston": "^3.8.2"
1717
},
1818
"devDependencies": {
19-
"eslint": "^8.37.0",
19+
"eslint": "^8.39.0",
2020
"eslint-plugin-prettier": "^4.2.1",
2121
"jest": "^29.5.0",
22-
"prettier": "^2.8.7"
22+
"prettier": "^2.8.8"
2323
},
2424
"overrides": {
2525
"@kubernetes/client-node": {

‎helm/wrongsecrets-ctf-party/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ wrongsecrets:
108108
maxInstances: 500
109109
# -- Wrongsecrets Image to use
110110
image: jeroenwillemsen/wrongsecrets
111-
tag: 1.6.0-no-vault
111+
tag: 1.6.3-no-vault
112112
# -- Change the key when hosting a CTF event. This key gets used to generate the challenge flags. See: https://github.com/OWASP/wrongsecrets#ctf
113113
ctfKey: "[email protected]!9uR_K!NfkkTr"
114114
# -- Specify a custom Juice Shop config.yaml. See the JuiceShop Config Docs for more detail: https://pwning.owasp-juice.shop/part1/customization.html#yaml-configuration-file

0 commit comments

Comments
 (0)