Skip to content

Commit 3f0bda5

Browse files
authored
Merge pull request #501 from OWASP/release-1.8.4
Release 1.8.4
2 parents 7d14440 + ea736d2 commit 3f0bda5

File tree

4 files changed

+32
-7
lines changed

4 files changed

+32
-7
lines changed

.github/workflows/minikube-k8s-test.yml

+27-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ permissions:
1414
contents: read
1515
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1616
jobs:
17-
test-minikube:
18-
name: Test with minikube
17+
test-minikube-build:
18+
name: Test with minikube (build)
1919
runs-on: ubuntu-latest
2020
# Steps represent a sequence of tasks that will be executed as part of the job
2121
steps:
@@ -39,3 +39,28 @@ jobs:
3939
curl http://localhost:3000/balancer/
4040
echo "logs from pod to make sure:"
4141
cat pod.log
42+
test-minikube-containers:
43+
name: Test with minikube (containers)
44+
runs-on: ubuntu-latest
45+
# Steps represent a sequence of tasks that will be executed as part of the job
46+
steps:
47+
- uses: actions/checkout@v4
48+
- name: Start minikube
49+
uses: medyagh/setup-minikube@master
50+
with:
51+
minikube-version: 1.31.2
52+
driver: docker
53+
kubernetes-version: v1.28.1
54+
- name: test script
55+
run: |
56+
eval $(minikube docker-env)
57+
./build-and-deploy-container.sh
58+
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
59+
kubectl logs deployments/wrongsecrets-balancer -f >> pod.log &
60+
echo "port forwarding"
61+
kubectl port-forward service/wrongsecrets-balancer 3000:3000 &
62+
echo "Awaiting the first forward to be ready"
63+
sleep 10
64+
curl http://localhost:3000/balancer/
65+
echo "logs from pod to make sure:"
66+
cat pod.log

helm/wrongsecrets-ctf-party/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ type: application
2828

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

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

3737
dependencies:
3838
- name: kube-prometheus-stack

helm/wrongsecrets-ctf-party/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ To uninstall the chart:
4141
helm delete my-wrongsecrets-ctf-party
4242
# wrongsecrets-ctf-party
4343

44-
![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)
44+
![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)
4545

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

@@ -116,7 +116,7 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets
116116
| balancer.service.loadBalancerSourceRanges | string | `nil` | list of IP CIDRs allowed access to lb (if supported) |
117117
| balancer.service.type | string | `"ClusterIP"` | Kubernetes service type |
118118
| 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 |
119-
| balancer.tag | string | `"1.8.3cloud"` | |
119+
| balancer.tag | string | `"1.8.4cloud"` | |
120120
| balancer.tolerations | list | `[]` | Optional Configure kubernetes toleration for the created wrongsecrets instances (see: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |
121121
| 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 |
122122
| 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 |

helm/wrongsecrets-ctf-party/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ balancer:
4040
# -- 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.
4141
cookieParserSecret: null
4242
repository: jeroenwillemsen/wrongsecrets-balancer
43-
tag: 1.8.3cloud
43+
tag: 1.8.4cloud
4444
# -- Number of replicas of the wrongsecrets-balancer deployment. Changing this in a commit? PLEASE UPDATE THE GITHUB WORKLFOWS THEN!(NUMBER OF "TRUE")
4545
replicas: 2
4646
# -- Port to expose on the balancer pods which the container listens on

0 commit comments

Comments
 (0)