Skip to content

Commit 0ca7d79

Browse files
commjoencommjoen
authored
Merge pull request #370 from OWASP/release-prep
Prep release 1.7.0
2 parents fb60602 + 3f64d7a commit 0ca7d79

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎azure/k8s/secret-challenge-vault-deployment.yml.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
volumeAttributes:
4242
secretProviderClass: "azure-wrongsecrets-vault"
4343
containers:
44-
- image: jeroenwillemsen/wrongsecrets:1.6.10-k8s-vault
44+
- image: jeroenwillemsen/wrongsecrets:1.7.0-k8s-vault
4545
imagePullPolicy: IfNotPresent
4646
name: secret-challenge
4747
securityContext:

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ 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.6.10
31+
version: 1.7.0
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.6.10
35+
appVersion: 1.7.0
3636

3737
dependencies: []

‎helm/wrongsecrets-ctf-party/README.md

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

43-
![Version: 1.6.10](https://img.shields.io/badge/Version-1.6.10-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.6.10](https://img.shields.io/badge/AppVersion-1.6.10-informational?style=flat-square)
43+
![Version: 1.7.0](https://img.shields.io/badge/Version-1.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.7.0](https://img.shields.io/badge/AppVersion-1.7.0-informational?style=flat-square)
4444

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

@@ -114,7 +114,7 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets
114114
| balancer.service.loadBalancerSourceRanges | string | `nil` | list of IP CIDRs allowed access to lb (if supported) |
115115
| balancer.service.type | string | `"ClusterIP"` | Kubernetes service type |
116116
| 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 |
117-
| balancer.tag | string | `"1.6.10cloud"` | |
117+
| balancer.tag | string | `"1.7.0cloud"` | |
118118
| balancer.tolerations | list | `[]` | Optional Configure kubernetes toleration for the created wrongsecrets instances (see: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |
119119
| 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 |
120120
| 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 |
@@ -159,7 +159,7 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets
159159
| virtualdesktop.securityContext.readOnlyRootFilesystem | bool | `true` | |
160160
| virtualdesktop.securityContext.runAsNonRoot | bool | `true` | |
161161
| virtualdesktop.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | |
162-
| virtualdesktop.tag | string | `"1.6.10"` | |
162+
| virtualdesktop.tag | string | `"1.7.0C"` | |
163163
| virtualdesktop.tolerations | list | `[]` | |
164164
| wrongsecrets.affinity | object | `{}` | Optional Configure kubernetes scheduling affinity for the created Wrongsecrets instances (see: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) |
165165
| wrongsecrets.config | string | See values.yaml for full details | Specify a custom Wrongsecrets config.yaml. See the Wrongsecrets Docs for any needed ENVs: https://github.com/OWASP/wrongsecrets |
@@ -172,7 +172,7 @@ Run Multi User "Capture the Flags" or Security Trainings with OWASP Wrongsecrets
172172
| wrongsecrets.resources | object | `{"requests":{"cpu":"256Mi","memory":"300Mi"}}` | Optional resources definitions to set for each Wrongsecrets instance |
173173
| wrongsecrets.runtimeClassName | string | `nil` | Optional Can be used to configure the runtime class for the Wrongsecrets instances pods to add an additional layer of isolation to reduce the impact of potential container escapes. (see: https://kubernetes.io/docs/concepts/containers/runtime-class/) |
174174
| wrongsecrets.securityContext | object | `{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"seccompProfile":{"type":"RuntimeDefault"}}` | Optional securityContext definitions to set for each Wrongsecrets instance |
175-
| wrongsecrets.tag | string | `"1.6.10-no-vault"` | |
175+
| wrongsecrets.tag | string | `"1.7.0-no-vault"` | |
176176
| wrongsecrets.tolerations | list | `[]` | Optional Configure kubernetes toleration for the created Wrongsecrets instances (see: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |
177177
| wrongsecrets.volumes | list | `[]` | Optional Volumes to set for each Wrongsecrets instance (see: https://kubernetes.io/docs/concepts/storage/volumes/) |
178178
| wrongsecretsCleanup.affinity | object | `{}` | Optional Configure kubernetes scheduling affinity for the wrongsecretsCleanup Job(see: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) |

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

+3-3
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.6.10cloud
43+
tag: 1.7.0cloud
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
@@ -164,7 +164,7 @@ wrongsecrets:
164164
maxInstances: 500
165165
# -- Wrongsecrets Image to use
166166
image: jeroenwillemsen/wrongsecrets
167-
tag: 1.6.10-no-vault
167+
tag: 1.7.0-no-vault
168168
# -- Change the key when hosting a CTF event. This key gets used to generate the challenge flags. See: https://github.com/OWASP/wrongsecrets#ctf
169169
ctfKey: "[email protected]!9uR_K!NfkkTr"
170170
# -- Specify a custom Wrongsecrets config.yaml. See the Wrongsecrets Docs for any needed ENVs: https://github.com/OWASP/wrongsecrets
@@ -226,7 +226,7 @@ virtualdesktop:
226226
maxInstances: 500
227227
# -- Wrongsecrets Image to use
228228
image: jeroenwillemsen/wrongsecrets-desktop-k8s
229-
tag: 1.6.10
229+
tag: 1.7.0C
230230
repository: commjoenie/wrongSecrets
231231
resources:
232232
request:

‎wrongsecrets-balancer/config/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
},
4242
"virtualdesktop": {
4343
"image": "jeroenwillemsen/wrongsecrets-desktop-k8s",
44-
"tag": "1.5.9",
44+
"tag": "1.7.0C",
4545
"imagePullPolicy": "IfNotPresent",
4646
"nodeEnv": "wrongsecrets-ctf-party",
4747
"resources:": {

‎wrongsecrets-balancer/src/kubernetes.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ const createK8sDeploymentForTeam = async ({ team, passcodeHash }) => {
277277
path: '/actuator/health/readiness',
278278
port: 8080,
279279
},
280-
initialDelaySeconds: 90,
280+
initialDelaySeconds: 70,
281281
timeoutSeconds: 30,
282282
periodSeconds: 10,
283283
failureThreshold: 10,
@@ -287,7 +287,7 @@ const createK8sDeploymentForTeam = async ({ team, passcodeHash }) => {
287287
path: '/actuator/health/liveness',
288288
port: 8080,
289289
},
290-
initialDelaySeconds: 90,
290+
initialDelaySeconds: 50,
291291
timeoutSeconds: 30,
292292
periodSeconds: 30,
293293
},
@@ -558,7 +558,7 @@ const createAWSDeploymentForTeam = async ({ team, passcodeHash }) => {
558558
path: '/actuator/health/readiness',
559559
port: 8080,
560560
},
561-
initialDelaySeconds: 120,
561+
initialDelaySeconds: 90,
562562
timeoutSeconds: 30,
563563
periodSeconds: 10,
564564
failureThreshold: 10,
@@ -568,7 +568,7 @@ const createAWSDeploymentForTeam = async ({ team, passcodeHash }) => {
568568
path: '/actuator/health/liveness',
569569
port: 8080,
570570
},
571-
initialDelaySeconds: 90,
571+
initialDelaySeconds: 70,
572572
timeoutSeconds: 30,
573573
periodSeconds: 30,
574574
},
@@ -850,7 +850,7 @@ const createAzureDeploymentForTeam = async ({ team, passcodeHash }) => {
850850
path: '/actuator/health/readiness',
851851
port: 8080,
852852
},
853-
initialDelaySeconds: 120,
853+
initialDelaySeconds: 90,
854854
timeoutSeconds: 30,
855855
periodSeconds: 10,
856856
failureThreshold: 10,
@@ -860,7 +860,7 @@ const createAzureDeploymentForTeam = async ({ team, passcodeHash }) => {
860860
path: '/actuator/health/liveness',
861861
port: 8080,
862862
},
863-
initialDelaySeconds: 90,
863+
initialDelaySeconds: 70,
864864
timeoutSeconds: 30,
865865
periodSeconds: 30,
866866
},
@@ -1204,7 +1204,7 @@ const createGCPDeploymentForTeam = async ({ team, passcodeHash }) => {
12041204
path: '/actuator/health/readiness',
12051205
port: 8080,
12061206
},
1207-
initialDelaySeconds: 120,
1207+
initialDelaySeconds: 90,
12081208
timeoutSeconds: 30,
12091209
periodSeconds: 10,
12101210
failureThreshold: 10,
@@ -1214,7 +1214,7 @@ const createGCPDeploymentForTeam = async ({ team, passcodeHash }) => {
12141214
path: '/actuator/health/liveness',
12151215
port: 8080,
12161216
},
1217-
initialDelaySeconds: 90,
1217+
initialDelaySeconds: 70,
12181218
timeoutSeconds: 30,
12191219
periodSeconds: 30,
12201220
},

0 commit comments

Comments
 (0)