Skip to content

Commit 00151ad

Browse files
authored
Merge pull request #182 from OWASP/fix-k8s-test
Fix for minikube tests
2 parents 7588c2a + 8c71e1d commit 00151ad

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
- name: Start minikube
2424
uses: medyagh/setup-minikube@master
2525
with:
26-
minikube-version: 1.27.0
26+
minikube-version: 1.29.0
2727
driver: docker
2828
kubernetes-version: v1.23.12
2929
- name: test script
3030
run: |
3131
eval $(minikube docker-env)
3232
./build-an-deploy.sh
33-
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
33+
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
3434
kubectl logs deployments/wrongsecrets-balancer -f >> pod.log &
3535
echo "port forwarding"
3636
kubectl port-forward service/wrongsecrets-balancer 3000:3000 &

helm/wrongsecrets-ctf-party/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ balancer:
3535
cookieParserSecret: null
3636
repository: jeroenwillemsen/wrongsecrets-balancer
3737
tag: 1.7aws
38-
# -- Number of replicas of the wrongsecrets-balancer deployment
38+
# -- Number of replicas of the wrongsecrets-balancer deployment. Changing this in a commit? PLEASE UPDATE THE GITHUB WORKLFOWS THEN!(NUMBER OF "TRUE")
3939
replicas: 4
4040
service:
4141
# -- Kubernetes service type

readme.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ For minikube, run:
110110

111111
```shell
112112

113-
minikube start --cpus=6 --memory=10000MB --network-plugin=cni --cni=calico
113+
minikube start --cpus=6 --memory=10000MB --network-plugin=cni --cni=calico --driver=docker
114114
eval $(minikube docker-env)
115115
./build-an-deploy-container.sh
116116
kubectl port-forward service/wrongsecrets-balancer 3000:3000
@@ -129,7 +129,7 @@ kubectl top pods
129129

130130
```shell
131131

132-
minikube start --cpus=6 --memory=10000MB --network-plugin=cni --cni=calico
132+
minikube start --cpus=6 --memory=10000MB --network-plugin=cni --cni=calico --driver=docker
133133
eval $(minikube docker-env)
134134
./build-an-deploy.sh
135135
kubectl port-forward service/wrongsecrets-balancer 3000:3000

0 commit comments

Comments
 (0)