Remove unneeded ports (80/443) from emby and fix hostnetwork

test/emby/1.0.13/Chart.yaml → test/emby/1.0.14/Chart.yaml

@@ -13,4 +13,4 @@ keywords:
 name: emby
 sources:
 - https://hub.docker.com/r/emby/embyserver
-version: 1.0.13
+version: 1.0.14

test/emby/1.0.13/questions.yaml → test/emby/1.0.14/questions.yaml

@@ -23,12 +23,12 @@ portals:
     host:
       - "$node_ip"
     ports:
-      - "$variable-embyServerHttp.port"
+      - "$kubernetes-resource_configmap_portal_port"
     path: "/web"
 
 questions:
   - variable: hostNetwork
-    label: "Configure Host Network"
+    label: "Enable Host Network"
     group: "Networking"
     schema:
       type: boolean
@@ -74,6 +74,7 @@ questions:
     label: "Configure Emby Server HTTP Service"
     group: "Networking"
     schema:
+      show_if: [[ "hostNetwork", "!=", true]]
       type: dict
       attrs:
         - variable: port

test/emby/1.0.13/templates/NOTES.txt → test/emby/1.0.14/templates/NOTES.txt

@@ -1,3 +1,7 @@
 1. Get the application URL by running these commands:
 
+{{- if .Values.hostNetwork }}
+http://$node_ip:8096/
+{{ else }}
 http://$node_ip:{{ .Values.embyServerHttp.port }}/
+{{ end }}

test/emby/1.0.13/templates/deployment.yaml → test/emby/1.0.14/templates/deployment.yaml

@@ -24,9 +24,6 @@ spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
           - name: emby
             protocol: TCP
             containerPort: 8096
-          {{- if .Values.hostNetwork }}
-            hostPort: {{ .Values.embyServerHttp.port }}
-          {{- end }}
           - name: emby-dlna
             protocol: UDP
             containerPort: 1900

test/emby/1.0.14/templates/portal.tpl

@@ -0,0 +1,10 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: portal
+data:
+  {{- if .Values.hostNetwork }}
+  port: "8096"
+  {{- else }}
+  port: {{ .Values.embyServerHttp.port | quote }}
+  {{- end }}

test/emby/1.0.13/templates/service-tcp.yaml → test/emby/1.0.14/templates/service-tcp.yaml

@@ -1,8 +1,10 @@
 {{ $svc := .Values.embyServerHttp }}
 {{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "emby" "port" $svc.port "nodePort" $svc.port "targetPort" "emby") }}
-{{ $ports = mustAppend $ports (dict "name" "http" "port" 80 "targetPort" "emby") }}
-{{ $ports = mustAppend $ports (dict "name" "https" "port" 443 "targetPort" "emby") }}
+{{ if .Values.hostNetwork }}
+{{ $ports = mustAppend $ports (dict "name" "http" "port" 8096 "targetPort" 8096) }}
+{{ else }}
+{{ $ports = mustAppend $ports (dict "name" "http" "port" $svc.port "nodePort" $svc.port "targetPort" 8096) }}
+{{ end }}
 {{ $params := . }}
 {{ $_ := set $params "commonService" (dict "ports" $ports ) }}
 {{ if .Values.hostNetwork }}