Merge pull request #33 from media-streaming-mesh/camera_service_name_…

…update Update: the Camera Deployment Name is updated to match with AppName.
media-streaming-mesh · Jun 26, 2023 · aaebbf7 · aaebbf7
2 parents a3715df + e5f7003
commit aaebbf7
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 31 deletions.
diff --git a/deployments/camera/Chart.yaml b/deployments/camera/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: camera
 description: A Helm chart to deploy a camera on MSM
-version: 0.2.4
+version: 0.2.5
diff --git a/deployments/camera/README.md b/deployments/camera/README.md
@@ -1,6 +1,6 @@
 # camera
 
-![version: 0.2.4](https://img.shields.io/badge/version-0.2.4-informational?style=flat-square)    [![artifact hub](https://img.shields.io/badge/artifact%20hub-camera-informational?style=flat-square)](https://artifacthub.io/packages/helm/media-streaming-mesh/camera)
+![version: 0.2.5](https://img.shields.io/badge/version-0.2.5-informational?style=flat-square)    [![artifact hub](https://img.shields.io/badge/artifact%20hub-camera-informational?style=flat-square)](https://artifacthub.io/packages/helm/media-streaming-mesh/camera)
 
 A Helm chart to deploy a camera on MSM
 

diff --git a/deployments/camera/templates/deployment.yaml b/deployments/camera/templates/deployment.yaml
@@ -2,7 +2,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: msm-live
+  name: {{ .Values.config.appName }}
   labels:
     {{- include "Camera.labels" . | nindent 4 }}
     app: {{ .Values.config.appName }}

diff --git a/deployments/rtsp/Chart.yaml b/deployments/rtsp/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.13
+version: 0.0.14
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/deployments/rtsp/README.md b/deployments/rtsp/README.md
@@ -1,6 +1,6 @@
 # rtsp
 
-![version: 0.0.13](https://img.shields.io/badge/version-0.0.13-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 1.16.0](https://img.shields.io/badge/app%20version-1.16.0-informational?style=flat-square)  [![artifact hub](https://img.shields.io/badge/artifact%20hub-rtsp-informational?style=flat-square)](https://artifacthub.io/packages/helm/media-streaming-mesh/rtsp)
+![version: 0.0.14](https://img.shields.io/badge/version-0.0.14-informational?style=flat-square) ![type: application](https://img.shields.io/badge/type-application-informational?style=flat-square) ![app version: 1.16.0](https://img.shields.io/badge/app%20version-1.16.0-informational?style=flat-square)  [![artifact hub](https://img.shields.io/badge/artifact%20hub-rtsp-informational?style=flat-square)](https://artifacthub.io/packages/helm/media-streaming-mesh/rtsp)
 
 A Helm chart for RSTP Server and (Internal) Client
 

diff --git a/deployments/rtsp/templates/deployment.yaml b/deployments/rtsp/templates/deployment.yaml
@@ -24,35 +24,11 @@ spec:
           image: "{{ .Values.clientImage.name }}:{{ .Values.clientImage.tag }}"
           imagePullPolicy: IfNotPresent
           command: ["ffmpeg"]
-          args: ["-re", "-stream_loop", "-1", "-i", "/tmp/video.mp4", "-an", "-c:v", "copy", "-f", "rtsp", "rtsp://0.0.0.0:554/mystream"]
+          args: ["-re", "-stream_loop", "-1", "-i", "/tmp/coding.mp4", "-an", "-c:v", "copy", "-f", "rtsp", "rtsp://0.0.0.0:554/mystream"]
           volumeMounts:
             - mountPath: /tmp
               name: movies
       volumes:
         - name: movies
           hostPath:
             path: /tmp
----
-# rtsp-client
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: rtsp-client
-  labels:
-    app: client
-    {{- include "MSM-RTSP.labels" . | nindent 4 }}
-spec:
-  replicas: 2
-  selector:
-    matchLabels:
-      app: client
-  template:
-    metadata:
-      labels:
-        app: client
-        sidecar.mediastreamingmesh.io/inject: "true"
-    spec:
-      containers:
-        - name: rtsp-client
-          image: "{{ .Values.clientImage.name }}:{{ .Values.clientImage.tag }}"
-          imagePullPolicy: IfNotPresent
diff --git a/deployments/rtsp/templates/service.yaml b/deployments/rtsp/templates/service.yaml
@@ -8,7 +8,6 @@ metadata:
     {{- include "MSM-RTSP.labels" . | nindent 4 }}
 spec:
   type: ClusterIP
-  clusterIP: 10.96.10.1
   ports:
     - name: rtsp
       port: 554