Merge branch 'master' into aws-custom-cluster

ant-media · Sep 1, 2024 · b5f3070 · b5f3070
2 parents 392a183 + afe9d85
commit b5f3070
Show file tree

Hide file tree

Showing 9 changed files with 482 additions and 17 deletions.
diff --git a/.github/workflows/samples.yml b/.github/workflows/samples.yml
@@ -47,7 +47,7 @@ jobs:
         
     - name: Install ChromeDriver
       run: |
-        wget https://storage.googleapis.com/chrome-for-testing-public/126.0.6478.63/linux64/chromedriver-linux64.zip
+        wget https://storage.googleapis.com/chrome-for-testing-public/127.0.6533.119/linux64/chromedriver-linux64.zip
         unzip chromedriver-linux64.zip
         cd chromedriver-linux64
         sudo mv chromedriver /usr/bin/chromedriver

diff --git a/kubernetes/ams-k8s-deployment-edge.yaml b/kubernetes/ams-k8s-deployment-edge.yaml
@@ -45,20 +45,29 @@ spec:
 # You may also need to add -u and -p parameters for
 # specifying mongodb username and passwords respectively         
         args: ["-g", "true", "-s", "true", "-r", "true", "-m", "cluster", "-h", "mongo"]
+        volumeMounts:
+        - mountPath: /tmp
+          name: temp-volume
         livenessProbe:
           httpGet:
             path: / 
             port: 5080
-          initialDelaySeconds: 10
+          initialDelaySeconds: 30
           periodSeconds: 10
         readinessProbe:
           httpGet:
             path: /
             port: 5080
-          initialDelaySeconds: 10
+          initialDelaySeconds: 30
           periodSeconds: 10
         resources:
           requests:
              cpu: 4000m
+      volumes:
+      - hostPath:
+          path: /temp-data
+          type: DirectoryOrCreate
+        name: temp-volume
+
  #     imagePullSecrets:
  #     - name: docker
diff --git a/kubernetes/ams-k8s-deployment-origin.yaml b/kubernetes/ams-k8s-deployment-origin.yaml
@@ -45,6 +45,9 @@ spec:
 # You may also need to add -u and -p parameters for
 # specifying mongodb username and passwords respectively         
         args: ["-g", "true", "-s", "true", "-r", "true", "-m", "cluster", "-h", "mongo"]
+        volumeMounts:
+        - mountPath: /tmp
+          name: temp-volume
         livenessProbe:
           httpGet:
             path: / 
@@ -60,5 +63,11 @@ spec:
         resources:
           requests:
              cpu: 4000m
+      volumes:
+      - hostPath:
+          path: /temp-data
+          type: DirectoryOrCreate
+        name: temp-volume
+
  #     imagePullSecrets:
  #     - name: docker
diff --git a/kubernetes/ams-with-turn-server/ams-k8s-deployment-edge.yaml b/kubernetes/ams-with-turn-server/ams-k8s-deployment-edge.yaml
@@ -34,6 +34,9 @@ spec:
 # specifying mongodb username and passwords respectively         
 # args: ["-g", "true", "-s", "true", "-r", "true", "-m", "cluster", "-h", "mongo"]
         args: ["-r", "true", "-m", "cluster", "-h", "mongo"]
+        volumeMounts:
+        - mountPath: /tmp
+          name: temp-volume
         livenessProbe:
           httpGet:
             path: / 
@@ -49,5 +52,11 @@ spec:
         resources:
           requests:
              cpu: 4000m
+      volumes:
+      - hostPath:
+          path: /temp-data
+          type: DirectoryOrCreate
+        name: temp-volume
+
  #     imagePullSecrets:
  #     - name: docker
diff --git a/kubernetes/ams-with-turn-server/ams-k8s-deployment-origin.yaml b/kubernetes/ams-with-turn-server/ams-k8s-deployment-origin.yaml
@@ -34,6 +34,9 @@ spec:
 # specifying mongodb username and passwords respectively         
 # args: ["-g", "true", "-s", "true", "-r", "true", "-m", "cluster", "-h", "mongo"]
         args: ["-r", "true", "-m", "cluster", "-h", "mongo"]
+        volumeMounts:
+        - mountPath: /tmp
+          name: temp-volume
         livenessProbe:
           httpGet:
             path: / 
@@ -49,5 +52,11 @@ spec:
         resources:
           requests:
              cpu: 4000m
+      volumes:
+      - hostPath:
+          path: /temp-data
+          type: DirectoryOrCreate
+        name: temp-volume
+
  #     imagePullSecrets:
  #     - name: docker
diff --git a/load-testing/rtmp_publisher.sh b/load-testing/rtmp_publisher.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+file=$1
+server=$2
+noofclients=$3
+
+for (( i=1; i <= $noofclients; ++i ))
+do
+  COMMAND="ffmpeg -re -stream_loop -1 -i ${file} -codec copy -f flv ${server}_${i}"
+  $COMMAND >/dev/null 2>&1 &
+  echo "running command $COMMAND"
+  sleep 1
+done
diff --git a/load-testing/srt_publishers.sh b/load-testing/srt_publishers.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+file=$1
+server=$2
+noofclients=$3
+
+for (( i=1; i <= $noofclients; ++i ))
+do
+  COMMAND="ffmpeg -re -stream_loop -1 -i ${file} -codec copy -f mpegts ${server}_${i}"
+  $COMMAND >/dev/null 2>&1 &
+  echo "running command $COMMAND"
+  sleep 1
+done