summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeterTheOne <petertheone@gmail.com>2018-02-27 22:25:25 +0100
committerPeterTheOne <petertheone@gmail.com>2018-02-27 22:25:25 +0100
commitbea5ad44f74a4df5db7b40137447506f506a24d5 (patch)
treedffd687b21ce26306202dfefbdebc59d604201d8
parentadd audio, useragent check, direct links, interface stuff (diff)
parentadded emc-05 and emc-06 (diff)
Merge branch 'k8s' of ssh://git-spreadspace@git.spreadspace.org:22000/flufigut.git into k8s
-rwxr-xr-xcontrib/k8s-emc/acme-hack/do.sh2
-rw-r--r--src/examples/elevate2018.yml4
2 files changed, 4 insertions, 2 deletions
diff --git a/contrib/k8s-emc/acme-hack/do.sh b/contrib/k8s-emc/acme-hack/do.sh
index 70750e6..86cef5d 100755
--- a/contrib/k8s-emc/acme-hack/do.sh
+++ b/contrib/k8s-emc/acme-hack/do.sh
@@ -6,7 +6,7 @@ if [ -z "$1" ]; then
fi
kubectl "$1" -f nginx-acme-cm.yml
-for node in emc-00 emc-01 emc-02 emc-03 emc-04 helene; do
+for node in emc-00 emc-01 emc-02 emc-03 emc-04 emc-05 emc-06 helene; do
cat nginx-acme-deploy.yml | sed "s/<<node>>/$node/g" | kubectl "$1" -f -
cat nginx-acme-svc.yml | sed "s/<<node>>/$node/g" | kubectl "$1" -f -
cat nginx-acme-ingress.yml | sed "s/<<name>>/$node/g" | sed "s/<<node>>/$node/g" | sed "s/<<hostname>>/$node.spreadspace.org/g" | kubectl "$1" -f -
diff --git a/src/examples/elevate2018.yml b/src/examples/elevate2018.yml
index e6583d2..eabf4f7 100644
--- a/src/examples/elevate2018.yml
+++ b/src/examples/elevate2018.yml
@@ -52,6 +52,8 @@ globals:
emc-02: "http-public2*"
emc-03: "http-public3*"
emc-04: "http-public4*"
+ emc-05: "http-public5*"
+ emc-06: "http-public6*"
deployment:
type: kubernetes
parameter:
@@ -105,7 +107,7 @@ streams:
muxes: [ av-orig, audio-orig ]
nginx-muxes: [ av-orig ]
type: http
- count: 4
+ count: 6
port: 8000
max-bw: 290000000
burst-on-connect: 5