Skip to content

Commit

Permalink
Merge pull request #501 from OWASP/release-1.8.4
Browse files Browse the repository at this point in the history
Release 1.8.4
  • Loading branch information
commjoen authored Mar 6, 2024
2 parents 7d14440 + ea736d2 commit 3f0bda5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 7 deletions.
29 changes: 27 additions & 2 deletions .github/workflows/minikube-k8s-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ permissions:
contents: read
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
test-minikube:
name: Test with minikube
test-minikube-build:
name: Test with minikube (build)
runs-on: ubuntu-latest
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand All @@ -39,3 +39,28 @@ jobs:
curl http://localhost:3000/balancer/
echo "logs from pod to make sure:"
cat pod.log
test-minikube-containers:
name: Test with minikube (containers)
runs-on: ubuntu-latest
# Steps represent a sequence of tasks that will be executed as part of the job
steps:
- uses: actions/checkout@v4
- name: Start minikube
uses: medyagh/setup-minikube@master
with:
minikube-version: 1.31.2
driver: docker
kubernetes-version: v1.28.1
- name: test script
run: |
eval $(minikube docker-env)
./build-and-deploy-container.sh
while [[ $(kubectl get pods -l app=wrongsecrets-balancer -o 'jsonpath={..status.conditions[?(@.type=="Ready")].status}') != *"True"* ]]; do echo "waiting for wrongsecrets-balancer" && sleep 2; done
kubectl logs deployments/wrongsecrets-balancer -f >> pod.log &
echo "port forwarding"
kubectl port-forward service/wrongsecrets-balancer 3000:3000 &
echo "Awaiting the first forward to be ready"
sleep 10
curl http://localhost:3000/balancer/
echo "logs from pod to make sure:"
cat pod.log
4 changes: 2 additions & 2 deletions helm/wrongsecrets-ctf-party/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 1.8.3
version: 1.8.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 1.8.3
appVersion: 1.8.4

dependencies:
- name: kube-prometheus-stack
Expand Down
4 changes: 2 additions & 2 deletions helm/wrongsecrets-ctf-party/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To uninstall the chart:
helm delete my-wrongsecrets-ctf-party
# wrongsecrets-ctf-party

![Version: 1.8.3](https://img.shields.io/badge/Version-1.8.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.8.3](https://img.shields.io/badge/AppVersion-1.8.3-informational?style=flat-square)
![Version: 1.8.4](https://img.shields.io/badge/Version-1.8.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.8.4](https://img.shields.io/badge/AppVersion-1.8.4-informational?style=flat-square)

Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets

Expand Down Expand Up @@ -116,7 +116,7 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets
| balancer.service.loadBalancerSourceRanges | string | `nil` | list of IP CIDRs allowed access to lb (if supported) |
| balancer.service.type | string | `"ClusterIP"` | Kubernetes service type |
| balancer.skipOwnerReference | bool | `false` | If set to true this skips setting ownerReferences on the teams wrongsecrets Deployment and Services. This lets MultiJuicer run in older kubernetes cluster which don't support the reference type or the app/v1 deployment type |
| balancer.tag | string | `"1.8.3cloud"` | |
| balancer.tag | string | `"1.8.4cloud"` | |
| balancer.tolerations | list | `[]` | Optional Configure kubernetes toleration for the created wrongsecrets instances (see: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |
| balancer.volumeMounts[0] | object | `{"mountPath":"/home/app/config/","name":"config-volume"}` | If true, creates a volumeMount for the created pods. This is required for the podSecurityPolicy to work |
| balancer.volumes[0] | object | `{"configMap":{"name":"wrongsecrets-balancer-config"},"name":"config-volume"}` | If true, creates a volume for the created pods. This is required for the podSecurityPolicy to work |
Expand Down
2 changes: 1 addition & 1 deletion helm/wrongsecrets-ctf-party/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ balancer:
# -- Set this to a fixed random alpa-numeric string (recommended length 24 chars). If not set this get randomly generated with every helm upgrade, each rotation invalidates all active cookies / sessions requirering users to login again.
cookieParserSecret: null
repository: jeroenwillemsen/wrongsecrets-balancer
tag: 1.8.3cloud
tag: 1.8.4cloud
# -- Number of replicas of the wrongsecrets-balancer deployment. Changing this in a commit? PLEASE UPDATE THE GITHUB WORKLFOWS THEN!(NUMBER OF "TRUE")
replicas: 2
# -- Port to expose on the balancer pods which the container listens on
Expand Down

0 comments on commit 3f0bda5

Please sign in to comment.