Skip to content

Commit

Permalink
Switch all references from master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
J12934 committed May 20, 2022
1 parent 97a424c commit fb84088
Show file tree
Hide file tree
Showing 11 changed files with 89 additions and 90 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/release-notes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ on:
push:
# branches to consider in the event; optional, defaults to all
branches:
- master
- main

jobs:
update_draft_release:
name: "Update Draft Release"
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: toolmantim/release-drafter@v5.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6 changes: 3 additions & 3 deletions guides/aws/aws.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ kubectl get secrets juice-balancer-secret -o=jsonpath='{.data.adminPassword}' |
Create a loadbalancer which is exposed is achieved by running the following command:

```sh
kubectl create -f https://raw.githubusercontent.com/iteratec/multi-juicer/master/guides/aws/loadbalancer.yaml
kubectl create -f https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/aws/loadbalancer.yaml
```

You can get the LoadBalancer's DNS record either from the AWS console, or by running:
Expand Down Expand Up @@ -113,8 +113,8 @@ kubectl get pods -n kube-system
helm delete multi-juicer

# Delete the loadbalancer setup
kubectl delete -f kubectl create -f https://raw.githubusercontent.com/iteratec/multi-juicer/master/guides/aws/loadbalancer.yaml
kubectl delete -f kubectl create -f https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/aws/loadbalancer.yaml

# Delete the kubernetes cluster
eksctl delete cluster multi-juicer
```
```
2 changes: 1 addition & 1 deletion guides/digital-ocean/digital-ocean.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ doctl compute certificate list

# We got a example loadbalancer yaml for this example in the repository
# Edit the cert id in do-lb.yaml to the cert id of your domain
wget https://raw.githubusercontent.com/iteratec/multi-juicer/master/guides/digital-ocean/do-lb.yaml
wget https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/digital-ocean/do-lb.yaml
vim do-lb.yaml

# Create the loadbalancer
Expand Down
4 changes: 2 additions & 2 deletions guides/k8s/k8s.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This example expects you to have the following cli tools setup.

```bash
# First we'll need to confirm things are running
# This should be instant, and return something along the lines of "Kubernetes master is running at https://localhost:6443"
# This should be instant, and return something along the lines of "Kubernetes control-plane is running at https://localhost:6443"
kubectl cluster-info
```

Expand Down Expand Up @@ -63,7 +63,7 @@ kubectl get secrets juice-balancer-secret -o=jsonpath='{.data.adminPassword}' |
kubectl get pods

# We got a example loadbalancer yaml for this example in the repository
wget https://raw.githubusercontent.com/iteratec/multi-juicer/master/guides/k8s/k8s-juice-service.yaml
wget https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/k8s/k8s-juice-service.yaml

# Create the loadbalancer
# This might take a couple of minutes
Expand Down
2 changes: 1 addition & 1 deletion guides/monitoring-setup/monitoring.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ helm repo add prometheus-community https://prometheus-community.github.io/helm-c
kubectl create namespace monitoring

echo "Installing prometheus-operator"
wget https://raw.githubusercontent.com/iteratec/multi-juicer/master/guides/monitoring-setup/prometheus-operator-config.yaml
wget https://raw.githubusercontent.com/iteratec/multi-juicer/main/guides/monitoring-setup/prometheus-operator-config.yaml

echo "Installing Prometheus Operator & Grafana"
helm --namespace monitoring upgrade --install monitoring prometheus-community/kube-prometheus-stack --version 13.3.0 --values prometheus-operator-config.yaml
Expand Down
2 changes: 1 addition & 1 deletion guides/production-notes/production-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ To ensure MultiJuicer runs as smoothly during your CTF's / trainings / workshops
3. Make sure the value you have configured for `juiceShop.maxInstances` fits your CTF / training / whatever you are running. The default is set to only allow 10 instances. Set to -1 to remove any restrictions.
4. Set `balancer.replicas` to at least 2, so that you have at least one fall back JuiceBalancer when one crashes or the node it lives on goes down.
5. When running a CTF with JuiceShop challenge flags, make sure to change `juiceShop.ctfKey` from the default. Otherwise users will be able to generate their own flags relatively easily. See
6. When using prometheus metrics, e.g. when you have followed the [Monitoring SetUp Guide](https://github.com/iteratec/multi-juicer/blob/master/guides/monitoring-setup/monitoring.md) you'll want to change `balancer.metrics.basicAuth.password` to a non default values. Otherwise users can use the default value to access the technical metrics of the JuiceBalancer pods.
6. When using prometheus metrics, e.g. when you have followed the [Monitoring SetUp Guide](https://github.com/iteratec/multi-juicer/blob/main/guides/monitoring-setup/monitoring.md) you'll want to change `balancer.metrics.basicAuth.password` to a non default values. Otherwise users can use the default value to access the technical metrics of the JuiceBalancer pods.

## TLDR

Expand Down
2 changes: 1 addition & 1 deletion helm/multi-juicer/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: multi-juicer
description: Run Multi User "Capture the Flags" or Security Trainings with OWASP Juice Shop
icon: https://raw.githubusercontent.com/iteratec/multi-juicer/master/images/multijuicer-icon-only.png
icon: https://raw.githubusercontent.com/iteratec/multi-juicer/main/images/multijuicer-icon-only.png

home: https://github.com/iteratec/multi-juicer
sources:
Expand Down
Loading

0 comments on commit fb84088

Please sign in to comment.