change the transcode service name as xcode

Author: Pengfei Qu

deployment/kubernetes/helm/cdn-transcode/templates/live.yaml

@@ -21,7 +21,7 @@ spec:
         app: live-service-{{ $i }}
     spec:
       containers:
-      - image: {{ $.Values.registryPrefix }}tc_transcode_{{ lower $.Values.platform }}:latest
+      - image: {{ $.Values.registryPrefix }}tc_xcode_{{ lower $.Values.platform }}:latest
         imagePullPolicy: IfNotPresent
         command: ["/usr/local/bin/ffmpeg","-re","-stream_loop","-1",
             "-i","{{ .name }}",

deployment/kubernetes/helm/cdn-transcode/templates/vod.yaml renamed to deployment/kubernetes/helm/cdn-transcode/templates/xcode.yaml

@@ -5,34 +5,36 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
-    app: vod-service-{{ $deviceIdx }}
-  name: vod-service-{{ $deviceIdx }}
+    app: xcode-service-{{ $deviceIdx }}
+  name: xcode-service-{{ $deviceIdx }}
 spec:
   selector:
     matchLabels:
-      app: vod-service-{{ $deviceIdx }}
+      app: xcode-service-{{ $deviceIdx }}
   replicas: {{ $.Values.vodTranscode.replicas }}
   template:
     metadata:
       creationTimestamp: null
       labels:
-        app: vod-service-{{ $deviceIdx }}
+        app: xcode-service-{{ $deviceIdx }}
     spec:
       containers:
       - args:
         - bash
         - -c
         - /home/main.py
-        image: {{ $.Values.registryPrefix }}tc_transcode_{{ lower $.Values.platform }}:latest
+        image: {{ $.Values.registryPrefix }}tc_xcode_{{ lower $.Values.platform }}:latest
         imagePullPolicy: IfNotPresent
-        name: vod-service-{{ $deviceIdx }}
+        name: xcode-service-{{ $deviceIdx }}
         env:
 {{- if ne $.Values.platform "Xeon" }}
           - name: HW_ACC_TYPE
             value: {{ $.Values.hwAccType }}
           - name: HW_DEVICE
             value: /dev/dri/renderD{{ add $deviceIdx 128 }}
 {{- end }}
+          - name: SCENARIO
+            value: {{ $.Values.scenario | quote }}
           - name: NO_PROXY
             value: "*"
           - name: no_proxy
@@ -64,7 +66,7 @@ spec:
 {{- end }}
 
 
-{{- if eq "transcode" $.Values.scenario }}
+{{- if ne "cdn" $.Values.scenario }}
 ---
 
 apiVersion: batch/v1

deployment/kubernetes/helm/cdn-transcode/templates/zookeeper.yaml

@@ -37,7 +37,7 @@ spec:
         - name: ZOOKEEPER_CLIENT_PORT
           value: "2181"
         - name: ZOOKEEPER_HEAP_OPTS
-          value: -Xmx{{ .Values.zookeeper.heapSize }} -Xms{{ .Values.zookeeper.heapSize }}
+          value: -Xmx{{ $.Values.zookeeper.heapSize }} -Xms{{ $.Values.zookeeper.heapSize }}
         - name: ZOOKEEPER_LOG4J_LOGGERS
           value: zookeepr=ERROR
         - name: ZOOKEEPER_LOG4J_ROOT_LOGLEVEL

deployment/kubernetes/volume-info.sh

@@ -1,9 +1,9 @@
 #!/bin/bash -e
 
-export VIDEO_ARCHIVE_VOLUME_PATH=/tmp/archive/video
+export VIDEO_ARCHIVE_VOLUME_PATH=/home/${USER}/sdp/archive/video
 export VIDEO_ARCHIVE_VOLUME_SIZE=2
 export VIDEO_ARCHIVE_VOLUME_HOST=$1
 
-export VIDEO_CACHE_VOLUME_PATH=/tmp/cache/video
+export VIDEO_CACHE_VOLUME_PATH=/home/${USER}/sdp/cache/video
 export VIDEO_CACHE_VOLUME_SIZE=2
 export VIDEO_CACHE_VOLUME_HOST=$2

deployment/kubernetes/yaml/live.yaml.m4

@@ -23,7 +23,7 @@ spec:
       enableServiceLinks: false
       containers:
         - name: live-defn(`LIDX')
-          image: defn(`REGISTRY_PREFIX')tc_transcode_xeon:latest
+          image: defn(`REGISTRY_PREFIX')tc_xcode_xeon:latest
           imagePullPolicy: IfNotPresent
           resources:
             limits:

deployment/kubernetes/yaml/vod.yaml.m4 renamed to deployment/kubernetes/yaml/xcode.yaml.m4

@@ -7,25 +7,25 @@ loop(DEVICEIDX,0,eval(defn(`HW_DEVICE_NUM')-1),`
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: vod-defn(`DEVICEIDX')
+  name: xcode-defn(`DEVICEIDX')
   labels:
-    app: vod-defn(`DEVICEIDX')
+    app: xcode-defn(`DEVICEIDX')
 spec:
   replicas: defn(`NVODS')
   selector:
     matchLabels:
-      app: vod-defn(`DEVICEIDX')
+      app: xcode-defn(`DEVICEIDX')
   template:
     metadata:
       labels:
-        app: vod-defn(`DEVICEIDX')
+        app: xcode-defn(`DEVICEIDX')
     spec:
       enableServiceLinks: false
       containers:
-        - name: vod-defn(`DEVICEIDX')
-          image: defn(`REGISTRY_PREFIX')`tc_transcode_'defn(`PLATFORM_SUFFIX'):latest
+        - name: xcode-defn(`DEVICEIDX')
+          image: defn(`REGISTRY_PREFIX')`tc_xcode_'defn(`PLATFORM_SUFFIX'):latest
           imagePullPolicy: IfNotPresent
-ifelse(defn(`SCENARIO'),`transcode',`dnl
+ifelse(defn(`SCENARIO'),`cdn',,`dnl
           resources:
             limits:
               cpu: eval(defn(`VOD_CPU')*4)
@@ -41,6 +41,8 @@ ifelse(defn(`PLATFORM'),`Xeon',,`dnl
             - name: HW_DEVICE
               value: "`/dev/dri/renderD'eval(defn(`DEVICEIDX')+128)"
 ')dnl
+            - name: `SCENARIO'
+              value: "defn(`SCENARIO')"
             - name: NO_PROXY
               value: "*"
             - name: no_proxy
@@ -72,7 +74,7 @@ PLATFORM_NODE_SELECTOR(`Xeon')dnl
 ---
 ')
 
-ifelse(defn(`SCENARIO'),`transcode',`
+ifelse(defn(`SCENARIO'),`cdn',,`
 ---
 
 apiVersion: batch/v1

xcode-server/CMakeLists.txt

@@ -1,3 +1,3 @@
-set(service "tc_transcode_service")
+set(service "tc_xcode_service")
 include("${CMAKE_SOURCE_DIR}/script/service.cmake")
 add_dependencies(build_${service} build_tc_common)

xcode-server/SG1/Dockerfile

@@ -1,4 +1,4 @@
-# tc_transcode_sg1
+# tc_xcode_sg1
 
 FROM openvisualcloud/sg1-ubuntu1804-media-ffmpeg:21.3
 

xcode-server/Xeon/Dockerfile

@@ -1,4 +1,4 @@
-# tc_transcode_xeon
+# tc_xcode_xeon
 
 FROM openvisualcloud/xeon-ubuntu1804-media-ffmpeg:21.3
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y -q --no-install-recommends python3-tornado python3-kafka python3-kazoo python3-psutil && rm -rf /var/lib/apt/lists/*

xcode-server/XeonE3/Dockerfile

@@ -1,4 +1,4 @@
-# tc_transcode_xeone3
+# tc_xcode_xeone3
 
 FROM openvisualcloud/xeone3-ubuntu1804-media-ffmpeg:21.3