global config HLS_fragment value for oryx and nginx pod.

ossrs · Aug 28, 2024 · 59c3e1e · 59c3e1e
1 parent 5e536b6
commit 59c3e1e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/oryx-nginx-hls/charts/nginx-cache/templates/deployment.yaml b/oryx-nginx-hls/charts/nginx-cache/templates/deployment.yaml
@@ -64,6 +64,8 @@ spec:
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
+            - name: SRS_M3U8_EXPIRE
+              value: {{ .Values.global.hlsFragment | quote }}
       volumes:
       {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}

diff --git a/oryx-nginx-hls/charts/nginx-cache/values.yaml b/oryx-nginx-hls/charts/nginx-cache/values.yaml
@@ -17,7 +17,6 @@ fullnameOverride: ""
 # The configuration for nginx cach.
 # must have SRS_M3U8_EXPIRE, SRS_TS_EXPIRE
 conf:
-  SRS_M3U8_EXPIRE: 10
   SRS_TS_EXPIRE: 3600
 
 serviceAccount:

diff --git a/oryx-nginx-hls/templates/deployment.yaml b/oryx-nginx-hls/templates/deployment.yaml
@@ -73,6 +73,8 @@ spec:
             - name: {{ $key }}
               value: {{ $value | quote }}
             {{- end }}
+            - name: SRS_VHOST_HLS_HLS_FRAGMENT
+              value: {{ .Values.global.hlsFragment | quote }}
             # Overwrite the config by env.
             {{- range .Values.env }}
             - name: {{ .name }}

diff --git a/oryx-nginx-hls/values.yaml b/oryx-nginx-hls/values.yaml
@@ -21,7 +21,6 @@ replicaCount: 1
 conf:
   SRS_LOG_TANK: "console"
   # below four confs used to force HLS high performance and HLS Low Latency
-  SRS_VHOST_HLS_HLS_FRAGMENT: 2
   SRS_VHOST_HLS_HLS_WINDOW: 16
   SRS_VHOST_HLS_HLS_CTX: "off"
   SRS_VHOST_HLS_HLS_TS_CTX: "off"
@@ -129,4 +128,5 @@ tolerations: []
 affinity: {}
 
 global:
-  oryxHostName: oryx-host-name
+  oryxHostName: oryx-host-name
+  hlsFragment: 2