Let oryx support config namespace.

ossrs · Jul 20, 2024 · d3d77fd · d3d77fd
1 parent 4bab3fb
commit d3d77fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/oryx-nginx-hls/charts/nginx-cache/templates/configmap.yaml b/oryx-nginx-hls/charts/nginx-cache/templates/configmap.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-config
-  namespace: default
 data:
   nginx.edge.http.conf.template: |
     proxy_cache_path  /data/nginx-cache levels=1:2 keys_zone=srs_cache:8m max_size=1000m inactive=600m;
@@ -20,7 +19,7 @@ data:
 
         location ~ /.+/.*\.(m3u8)$ {
             proxy_set_header Host $host;
-            proxy_pass http://${ORYX_SERVER}.default.svc.cluster.local:${ORYX_SERVER_PORT}$request_uri;
+            proxy_pass http://${ORYX_SERVER}.${K8S_NAMESPACE}.svc.cluster.local:${ORYX_SERVER_PORT}$request_uri;
 
             proxy_cache srs_cache;
             proxy_cache_key $scheme$proxy_host$uri$args;
@@ -32,7 +31,7 @@ data:
 
         location ~ /.+/.*\.(ts)$ {
             proxy_set_header Host $host;
-            proxy_pass http://${ORYX_SERVER}.default.svc.cluster.local:${ORYX_SERVER_PORT}$request_uri;
+            proxy_pass http://${ORYX_SERVER}.${K8S_NAMESPACE}.svc.cluster.local:${ORYX_SERVER_PORT}$request_uri;
 
             proxy_cache srs_cache;
             proxy_cache_key $scheme$proxy_host$uri;

diff --git a/oryx-nginx-hls/charts/nginx-cache/templates/deployment.yaml b/oryx-nginx-hls/charts/nginx-cache/templates/deployment.yaml
@@ -72,6 +72,8 @@ spec:
             - name: ORYX_SERVER_PORT
               value: {{ .Values.global.oryxHostPort | quote }}
             {{- end }}
+            - name: K8S_NAMESPACE
+              value: {{ .Release.Namespace }}
       volumes:
       {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}