Merge pull request #889 from stavros-k/emby-stable

move emby fixes to stable

charts/emby/1.0.14/questions.yaml

@@ -1,193 +0,0 @@
-groups:
-  - name: "Emby Server Configuration"
-    description: "Configure Emby Server"
-  - name: "Networking"
-    description: "Configure networking for container"
-  - name: "Storage"
-    description: "Persist and share data that is separate from the lifecycle of the container"
-  - name: "Workload Details"
-    description: "Configure how workload should be deployed"
-  - name: "Scaling/Upgrade Policy"
-    description: "Configure how pods are replaced when configuration is upgraded"
-  - name: "Restart Policy"
-    description: "Configure when pod should be restarted in case of failure"
-  - name: "Resource Reservation"
-    description: "Specify resources to be allocated to workload"
-  - name: "Resource Limits"
-    description: "Set CPU/memory limits for Kubernetes Pod"
-
-portals:
-  web_portal:
-    protocols:
-      - "http"
-    host:
-      - "$node_ip"
-    ports:
-      - "$variable-embyServerHttp.port"
-    path: "/web"
-
-questions:
-  - variable: hostNetwork
-    label: "Configure Host Network"
-    group: "Networking"
-    schema:
-      type: boolean
-      default: false
-
-  - variable: environmentVariables
-    label: "Environment Variables for Emby Server"
-    group: "Emby Server Configuration"
-    schema:
-      type: list
-      default: []
-      items:
-        - variable: environmentVariable
-          label: "Environment Variable"
-          schema:
-            type: dict
-            attrs:
-              - variable: name
-                label: "Name"
-                schema:
-                  type: string
-              - variable: value
-                label: "Value"
-                schema:
-                  type: string
-
-  # Update strategy
-  - variable: updateStrategy
-    description: "Upgrade Policy"
-    label: "Update Strategy"
-    group: "Scaling/Upgrade Policy"
-    schema:
-      type: string
-      default: "Recreate"
-      enum:
-        - value: "RollingUpdate"
-          description: "Create new pods and then kill old ones"
-        - value: "Recreate"
-          description: "Kill existing pods before creating new ones"
-
-  # Port configuration
-  - variable: embyServerHttp
-    label: "Configure Emby Server HTTP Service"
-    group: "Networking"
-    schema:
-      type: dict
-      attrs:
-        - variable: port
-          label: "Port to expose for Emby Server UI"
-          schema:
-            type: int
-            min: 9000
-            max: 65535
-            default: 9096
-
-  # Specify GPU configuration
-  - variable: gpuConfiguration
-    label: "GPU Configuration"
-    group: "Resource Reservation"
-    schema:
-      type: dict
-      $ref:
-        - "definitions/gpuConfiguration"
-      attrs: []
-
-  - variable: appVolumeMounts
-    label: "Emby Server Storage"
-    group: "Storage"
-    schema:
-      type: dict
-      attrs:
-        - variable: config
-          label: "Config Volume"
-          schema:
-            type: dict
-            attrs:
-              - variable: datasetName
-                label: "Emby Server Config Volume Name"
-                schema:
-                  type: string
-                  $ref:
-                    - "normalize/ixVolume"
-                  show_if: [["hostPathEnabled", "=", false]]
-                  default: "ix-emby_config"
-                  editable: false
-                  hidden: true
-              - variable: mountPath
-                label: "Emby Server Config Mount Path"
-                description: "Path where the volume will be mounted inside the pod"
-                schema:
-                  type: path
-                  editable: false
-                  hidden: true
-                  default: "/config"
-              - variable: hostPathEnabled
-                label: "Enable Host Path for Emby Server Config Volume"
-                schema:
-                  type: boolean
-                  default: false
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: hostPath
-                      label: "Host Path for Emby Server Config Volume"
-                      schema:
-                        type: hostpath
-                        required: true
-
-  - variable: extraAppVolumeMounts
-    label: "Emby Server Extra Host Path Volumes"
-    group: "Storage"
-    schema:
-      type: list
-      items:
-        - variable: extraAppVolume
-          label: "Emby Server Host Path Volume"
-          description: "Add an extra host path volume for emby application"
-          schema:
-            type: dict
-            attrs:
-              - variable: mountPath
-                label: "Mount Path in Pod"
-                description: "Path where the volume will be mounted inside the pod"
-                schema:
-                  type: path
-                  required: true
-              - variable: hostPath
-                label: "Host Path"
-                description: "Host path"
-                schema:
-                  type: hostpath
-                  required: true
-              - variable: readOnly
-                label: "Read Only"
-                description: "Mount hostpath in read-only mode"
-                schema:
-                  type: boolean
-                  default: false
-
-  - variable: enableResourceLimits
-    label: "Enable Pod resource limits"
-    group: "Resource Limits"
-    schema:
-      type: boolean
-      default: false
-  - variable: cpuLimit
-    label: "CPU Limit"
-    description: "CPU resource limit allow  plain integer values with suffix m(milli) e.g 1000m, 100."
-    group: "Resource Limits"
-    schema:
-      type: string
-      show_if: [["enableResourceLimits", "=", true]]
-      valid_chars: "^\\d+(?:\\.\\d+(?!.*m$)|m?$)"
-      default: "4000m"
-  - variable: memLimit
-    label: "Memory Limit"
-    group: "Resource Limits"
-    description: "Memory limits is specified by number of bytes. Followed by quantity suffix like E,P,T,G,M,k and Ei,Pi,Ti,Mi,Gi,Ki can also be used. e.g 129e6, 129M,  128974848000m, 123Mi"
-    schema:
-      type: string
-      show_if: [["enableResourceLimits", "=", true]]
-      valid_chars: "^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$"
-      default: "8Gi"

charts/emby/1.0.14/templates/deployment.yaml

@@ -1,74 +0,0 @@
-{{ include "common.storage.hostPathValidate" .Values }}
-{{ include "common.deployment.common_config" . | nindent 0 }}
-spec: {{ include "common.deployment.common_spec" . | nindent 2 }}
-  template: {{ include "common.deployment.pod.metadata" . | nindent 4 }}
-    spec:
-    {{- if .Values.hostNetwork }}
-      hostNetwork: {{ .Values.hostNetwork }}
-      dnsPolicy: ClusterFirstWithHostNet
-    {{- end }}
-      hostname: {{ template "common.names.fullname" . }}
-      containers:
-        - name: {{ .Chart.Name }}
-          {{ include "common.resources.limitation" . | nindent 10 }}
-          {{ include "common.containers.imageConfig" .Values.image | nindent 10 }}
-          volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }}
-            {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
-            - name: extrappvolume-{{ $index }}
-              mountPath: {{ $hostPathConfiguration.mountPath }}
-              {{ if $hostPathConfiguration.readOnly }}
-              readOnly: {{ $hostPathConfiguration.readOnly }}
-              {{ end }}
-            {{ end }}
-          ports:
-          - name: emby
-            protocol: TCP
-            containerPort: 8096
-          {{- if .Values.hostNetwork }}
-            hostPort: {{ .Values.embyServerHttp.port }}
-          {{- end }}
-          - name: emby-dlna
-            protocol: UDP
-            containerPort: 1900
-          - name: emby-lnd
-            protocol: UDP
-            containerPort: 7359
-          env:
-            - name: KUBE_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            {{ $envList := (default list .Values.environmentVariables) }}
-            {{ if and .Values.gpuConfiguration (hasKey .Values.gpuConfiguration "nvidia.com/gpu") (gt (get .Values.gpuConfiguration "nvidia.com/gpu" | toDecimal) 0) }}
-            {{ $envList = mustAppend $envList (dict "name" "NVIDIA_DRIVER_CAPABILITIES" "value" "all") }}
-            {{ end }}
-            {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }}
-          readinessProbe:
-            httpGet:
-              path: /emby/System/Ping
-              port: 8096
-            failureThreshold: 5
-            periodSeconds: 15
-          livenessProbe:
-            httpGet:
-              path: /emby/System/Ping
-              port: 8096
-            failureThreshold: 5
-            periodSeconds: 15
-          startupProbe:
-            httpGet:
-              path: /emby/System/Ping
-              port: 8096
-            initialDelaySeconds: 5
-            failureThreshold: 40
-            periodSeconds: 15
-      volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }}
-        {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }}
-        - name: extrappvolume-{{ $index }}
-          hostPath:
-            path: {{ $hostPathConfiguration.hostPath }}
-        {{ end }}

charts/emby/1.0.14/Chart.yaml → charts/emby/1.0.15/Chart.yaml

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

test/emby/1.0.14/questions.yaml → charts/emby/1.0.15/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

charts/emby/1.0.14/templates/NOTES.txt → charts/emby/1.0.15/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.14/templates/deployment.yaml → charts/emby/1.0.15/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

charts/emby/1.0.15/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 }}

charts/emby/1.0.14/templates/service-tcp.yaml → charts/emby/1.0.15/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 }}

test/emby/1.0.14/.helmignore

@@ -1,24 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-.vscode/
-# OWNERS file for Kubernetes
-OWNERS

test/emby/1.0.14/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:f17f3d458ca0210a52e39da0dce35034e900b36f2040d4b19bed46a7aae91506
-generated: "2022-07-28T22:31:02.894743529+05:00"

test/emby/1.0.14/Chart.yaml

@@ -1,16 +0,0 @@
-apiVersion: v2
-appVersion: 4.7.10.0
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-description: Emby Server
-home: https://emby.media/
-icon: https://images-na.ssl-images-amazon.com/images/I/41NwssJC1iL.png
-keywords:
-- emby
-- media
-name: emby
-sources:
-- https://hub.docker.com/r/emby/embyserver
-version: 1.0.14

test/emby/1.0.14/README.md

@@ -1,5 +0,0 @@
-# Emby Server helm chart
-
-## Configuration
-
-Please refer to questions.yaml for a detailed overview on supported configurable items.

test/emby/1.0.14/app-readme.md

@@ -1,3 +0,0 @@
-# Emby Server
-
-Emby Server is a personal media server with apps on just about every device

test/emby/1.0.14/ix_values.yaml

@@ -1,4 +0,0 @@
-image:
-  pullPolicy: IfNotPresent
-  repository: emby/embyserver
-  tag: 4.7.10.0

test/emby/1.0.14/requirements.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../library/common/2207.0.0
-  version: 2207.0.0
-digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0
-generated: "2021-12-06T21:24:36.674776+05:00"

test/emby/1.0.14/templates/NOTES.txt

@@ -1,3 +0,0 @@
-1. Get the application URL by running these commands:
-
-http://$node_ip:{{ .Values.embyServerHttp.port }}/

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

@@ -1,15 +0,0 @@
-{{ $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") }}
-{{ $params := . }}
-{{ $_ := set $params "commonService" (dict "ports" $ports ) }}
-{{ if .Values.hostNetwork }}
-{{ $_ := set $params.commonService "nameSuffix" "tcp-cluster-ip" }}
-{{ $_1 := set $params.commonService "type" "ClusterIP" }}
-{{ else }}
-{{ $_ := set $params.commonService "nameSuffix" "tcp" }}
-{{ $_1 := set $params.commonService "type" "NodePort" }}
-{{ end }}
-{{ include "common.classes.service" $params }}

test/emby/1.0.14/templates/service-udp.yaml

@@ -1,6 +0,0 @@
-{{ $ports := list }}
-{{ $ports = mustAppend $ports (dict "name" "emby-dlna" "port" 1900 "protocol" "UDP" "targetPort" "emby-dlna") }}
-{{ $ports = mustAppend $ports (dict "name" "emby-lnd" "port" 7359 "protocol" "UDP" "targetPort" "emby-lnd") }}
-{{ $params := . }}
-{{ $_ := set $params "commonService" (dict "type" "ClusterIP" "ports" $ports "nameSuffix" "udp" ) }}
-{{ include "common.classes.service" $params }}

test/emby/1.0.14/templates/tests/deployment-check.yaml

@@ -1,21 +0,0 @@
-{{- $serviceName := (include "common.names.fullname" .) -}}
-apiVersion: v1
-kind: Pod
-metadata:
-  name: "{{ .Release.Name }}-emby-test"
-  labels:
-    app: {{ .Release.Name }}
-    release: {{ .Release.Name }}
-  annotations:
-    "helm.sh/hook": test
-spec:
-    containers:
-      - name: test-curl
-        image: alpine/curl
-        imagePullPolicy: "IfNotPresent"
-        command:
-          - /bin/sh
-          - -ec
-          - |
-            curl --connect-timeout 5 --max-time 10 --retry 5 --retry-delay 15 --retry-max-time 90 --retry-all-errors -ksf http://{{ $serviceName }}-tcp:32496/emby/System/Ping
-    restartPolicy: Never

test/emby/1.0.14/test_values.yaml

@@ -1,19 +0,0 @@
-appVolumeMounts:
-  config:
-    emptyDir: true
-    mountPath: /config
-embyServerHttp:
-  port: 32496
-emptyDirVolumes: true
-environmentVariables: []
-extraAppVolumeMounts:
-- hostPath: /mnt/extras/something
-  mountPath: /mnt/extras
-  readOnly: true
-gpuConfiguration: {}
-hostNetwork: false
-image:
-  pullPolicy: IfNotPresent
-  repository: emby/embyserver
-  tag: 4.7.10.0
-updateStrategy: Recreate

test/emby/1.0.15/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 4.7.9.0
+appVersion: 4.7.10.0
 dependencies:
 - name: common
   repository: file://../../../library/common/2207.0.0

test/emby/1.0.15/ix_values.yaml

@@ -1,4 +1,4 @@
 image:
   pullPolicy: IfNotPresent
   repository: emby/embyserver
-  tag: 4.7.9.0
+  tag: 4.7.10.0

test/emby/1.0.15/test_values.yaml

@@ -15,5 +15,5 @@ hostNetwork: false
 image:
   pullPolicy: IfNotPresent
   repository: emby/embyserver
-  tag: 4.7.9.0
+  tag: 4.7.10.0
 updateStrategy: Recreate