Merge branch 'dev'

Signed-off-by: David Young <davidy@funkypenguin.co.nz>
elfhosted · Dec 28, 2024 · 31a7b05 · 31a7b05
2 parents 77eb496 + f1adf1e
commit 31a7b05
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 82 deletions.
diff --git a/charts/myprecious/Chart.yaml b/charts/myprecious/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 1.221.4-pre-01
+version: 1.221.4-pre-02
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -731,12 +731,12 @@ dependencies:
     repository: oci://ghcr.io/elfhosted/charts
     alias: stremioservergluetun
   - name: app-template
-    condition: stremioweb.enabled
+    condition: flixio.enabled
     version: ~0.2.1
     repository: oci://ghcr.io/elfhosted/charts
-    alias: stremioweb
+    alias: flixio
   - name: app-template
-    condition: flixioapi.enabled
+    condition: flixio.enabled
     version: ~0.2.1
     repository: oci://ghcr.io/elfhosted/charts
     alias: flixioapi

diff --git a/charts/myprecious/templates/certificates/certificate-flixio.yaml b/charts/myprecious/templates/certificates/certificate-flixio.yaml
@@ -0,0 +1,14 @@
+{{- if .Values.flixiocustomdomain.enabled }}
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: custom-domain-flixio-{{ .Values.flixiocustomdomain.cname | lower }}
+spec:
+  secretName: cert-{{ .Values.flixiocustomdomain.cname | lower }}
+  issuerRef:
+    name: letsencrypt-prod
+    kind: ClusterIssuer
+  commonName: {{ .Values.flixiocustomdomain.cname | lower }}
+  dnsNames:
+  - {{ .Values.flixiocustomdomain.cname | lower }}
+{{ end }}  
diff --git a/charts/myprecious/templates/certificates/certificate-stremioweb.yaml b/charts/myprecious/templates/certificates/certificate-stremioweb.yaml
diff --git a/charts/myprecious/templates/configmaps/configmap-flixio-api-env.yaml b/charts/myprecious/templates/configmaps/configmap-flixio-api-env.yaml
@@ -5,6 +5,6 @@ metadata:
   name: flixio-api-env
 data:
   FLIXIO_API_KEY: some-api-key
-  FLIXIO_CORS_ALLOWED_ORIGINS: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}"
+  FLIXIO_CORS_ALLOWED_ORIGINS: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}"
   FLIXIO_LOKI_LOGGING_FORMAT: "true"
 {{ end }}
diff --git a/...configmaps/configmap-stremio-web-env.yaml → ...ates/configmaps/configmap-flixio-env.yaml b/...configmaps/configmap-stremio-web-env.yaml → ...ates/configmaps/configmap-flixio-env.yaml
@@ -1,8 +1,8 @@
-{{ if .Values.stremioweb.enabled }}
+{{ if .Values.flixio.enabled }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: stremio-web-env
+  name: flixio-env
 data:
   API_KEY: some-api-key
   API_ENDPOINT: "https://{{ .Release.Name }}-flixio-api.{{ .Values.dns_domain }}"

diff --git a/charts/myprecious/templates/configmaps/configmap-gatus-config.yaml b/charts/myprecious/templates/configmaps/configmap-gatus-config.yaml
@@ -324,15 +324,24 @@ data:
           - type: email
       {{ end }}
 
-      {{ if .Values.stremioserver.enabled }}
-      - name: stremio-server
+      {{ if .Values.flixio.enabled }}
+      - name: flixio
         group: consume-media
-        url: "http://stremio-server:8080"
+        url: "http://flixio:8080"
         interval: 5m
         conditions:
           - "[STATUS] == 200"
         alerts:
           - type: email
+
+      - name: flixio-api
+        group: consume-media
+        url: "http://flixio-api:8080"
+        interval: 5m
+        conditions:
+          - "[STATUS] == 404"
+        alerts:
+          - type: email          
       {{ end }}
 
       {{ if .Values.radarr.enabled }}

diff --git a/charts/myprecious/templates/configmaps/configmap-homepage-config.yaml b/charts/myprecious/templates/configmaps/configmap-homepage-config.yaml
@@ -266,7 +266,7 @@ data:
         {{ if or .Values.stremioserver.enabled .Values.stremioserverpia.enabled .Values.stremioservergluetun.enabled }}
         - Stremio:
             icon: mdi-tv
-            {{ if .Values.stremioweb.enabled }}
+            {{ if .Values.flixio.enabled }}
               {{ if .Values.stremioserver.enabled }}
             href: "https://web.strem.io/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserver.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ else if .Values.stremioserverpia.enabled }}
@@ -276,23 +276,23 @@ data:
               {{ end }}            
             {{ else }}
               {{ if .Values.stremioserver.enabled }}
-            href: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserver.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
+            href: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserver.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ else if .Values.stremioserverpia.enabled }}
-            href: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserverpia.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
+            href: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserverpia.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ else if .Values.stremioservergluetun.enabled }}
-            href: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioservergluetun.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
+            href: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioservergluetun.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ end }}            
             {{ end }}
             description: Stremio Server
             siteMonitor: http://stremio-server:11470
         {{ end }}        
 
-        {{ if .Values.stremioweb.enabled }}
-        - Stremio:
+        {{ if .Values.flixio.enabled }}
+        - Flixio:
             icon: mdi-tv
-            href: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}"
-            description: Stremio Web
-            siteMonitor: http://stremio-web:8080
+            href: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}"
+            description: Stremio (Anonymous)
+            siteMonitor: http://flixio:8080
         {{ end }}             
 
     - Manage Media:

diff --git a/charts/myprecious/templates/configmaps/configmap-homer-config.yaml b/charts/myprecious/templates/configmaps/configmap-homer-config.yaml
@@ -498,7 +498,7 @@ data:
             subtitle: "Stremio Server"
             tag: "public"
             tagstyle: "is-danger"
-            {{ if not .Values.stremioweb.enabled }}
+            {{ if not .Values.flixio.enabled }}
               {{ if .Values.stremioserver.enabled }}
             url: "https://web.strem.io/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserver.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ else if .Values.stremioserverpia.enabled }}
@@ -508,23 +508,23 @@ data:
               {{ end }}            
             {{ else }}
               {{ if .Values.stremioserver.enabled }}
-            url: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserver.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
+            url: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserver.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ else if .Values.stremioserverpia.enabled }}
-            url: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserverpia.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
+            url: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioserverpia.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ else if .Values.stremioservergluetun.enabled }}
-            url: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioservergluetun.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
+            url: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}/?streamingServer=https%3A%2F%2F{{ .Release.Name }}-stremio-server-{{ .Values.stremioservergluetun.SECRET_STRING }}.{{ .Values.dns_domain }}#/"
               {{ end }}            
             {{ end }}
             target: "_blank" # optional html tag target attribute
           {{ end }}      
 
-          {{ if .Values.stremioweb.enabled }}
-          - name: "Stremio Web"
+          {{ if .Values.flixio.enabled }}
+          - name: "Flixio"
             logo: "assets/png/stremio.png"
-            subtitle: "Stremio Web"
+            subtitle: "Stremio (Anonymous)"
             tag: "public"
             tagstyle: "is-danger"
-            url: "https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}"
+            url: "https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}"
             target: "_blank" # optional html tag target attribute
           {{ end }}                      
 

diff --git a/charts/myprecious/templates/configmaps/configmap-stremio-server-env.yaml b/charts/myprecious/templates/configmaps/configmap-stremio-server-env.yaml
@@ -4,11 +4,11 @@ kind: ConfigMap
 metadata:
   name: stremio-server-env
 data:
-  {{ if .Values.stremioweb.enabled }}
-  {{ if .Values.stremiowebcustomdomain.enabled }}
-  WEBUI_LOCATION: https://{{ .Values.stremiowebcustomdomain.cname | lower }}
+  {{ if .Values.flixio.enabled }}
+  {{ if .Values.flixiocustomdomain.enabled }}
+  WEBUI_LOCATION: https://{{ .Values.flixiocustomdomain.cname | lower }}
   {{ else }}
-  WEBUI_LOCATION: https://{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}
+  WEBUI_LOCATION: https://{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}
   {{ end }}
   {{ else }}
   WEBUI_LOCATION: https://web.strem.io

diff --git a/charts/myprecious/templates/custom-ingressroutes/custom-ingressroute-flixio.yaml b/charts/myprecious/templates/custom-ingressroutes/custom-ingressroute-flixio.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.flixiocustomdomain.enabled }}
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: {{ .Values.flixiocustomdomain.cname | lower }}
+spec:
+  routes:
+    - match: Host(`{{ .Values.flixiocustomdomain.cname | lower }}`)
+      kind: Rule
+      services:
+        - name: flixio
+          kind: Service
+          port: 8080
+  tls:
+    secretName: cert-{{ .Values.flixiocustomdomain.cname | lower }}
+{{ end }}
diff --git a/charts/myprecious/templates/custom-ingressroutes/custom-ingressroute-stremioweb.yaml b/charts/myprecious/templates/custom-ingressroutes/custom-ingressroute-stremioweb.yaml
diff --git a/...gressroutes/ingressroute-stremio-web.yaml → ...es/ingressroutes/ingressroute-flixio.yaml b/...gressroutes/ingressroute-stremio-web.yaml → ...es/ingressroutes/ingressroute-flixio.yaml
@@ -1,14 +1,14 @@
-{{ if .Values.stremioweb.enabled }}
+{{ if .Values.flixio.enabled }}
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
-  name: {{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}
+  name: {{ .Release.Name }}-flixio.{{ .Values.dns_domain }}
 spec:
   routes:
-    - match: Host(`{{ .Release.Name }}-stremio-web.{{ .Values.dns_domain }}`)
+    - match: Host(`{{ .Release.Name }}-flixio.{{ .Values.dns_domain }}`)
       kind: Rule
       services:
-        - name: stremio-web
+        - name: flixio
           kind: Service
           port: 8080
       middlewares:

diff --git a/...mplates/services/service-stremio-web.yaml → ...us/templates/services/service-flixio.yaml b/...mplates/services/service-stremio-web.yaml → ...us/templates/services/service-flixio.yaml
@@ -1,10 +1,10 @@
-{{ if .Values.stremioweb.enabled }}
+{{ if .Values.flixio.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: stremio-web
+  name: flixio
   labels:
-    app.kubernetes.io/name: stremioweb
+    app.kubernetes.io/name: flixio
     app.kubernetes.io/instance: {{ .Release.Name }}
   annotations:
 spec:
@@ -14,6 +14,6 @@ spec:
     targetPort: 8080
     protocol: TCP
   selector:
-    app.kubernetes.io/name: stremioweb
+    app.kubernetes.io/name: flixio
     app.kubernetes.io/instance: {{ .Release.Name }}
 {{ end }}
diff --git a/charts/myprecious/values.yaml b/charts/myprecious/values.yaml
@@ -881,7 +881,7 @@ jellyfincustomdomain:
   enabled: false
 embycustomdomain:
   enabled: false
-stremiowebcustomdomain:
+flixiocustomdomain:
   enabled: false
 pairdropcustomdomain:
   enabled: false
@@ -10155,17 +10155,17 @@ stremioservergluetun:
           #!/bin/ash
           echo "disconnected" > /shared/vpnstatus
 
-stremioweb:
+flixio:
   enabled: false
   image:
     repository: ghcr.io/elfhosted/stremio-web
     tag: rolling@sha256:1e5ce4931af36e61071e27fabae0bfeffd18da1f7a6c936714ad50c05a0a5da4
   priorityClassName: tenant-normal
   podLabels:
-    app.elfhosted.com/name: stremio-web
+    app.elfhosted.com/name: flixio
   controller:
     annotations:
-      configmap.reloader.stakater.com/reload: "elfbot-all,elfbot-stremio-web"
+      configmap.reloader.stakater.com/reload: "elfbot-all,elfbot-flixio"
     strategy:
     rollingUpdate:
       unavailable: 1
@@ -10179,18 +10179,12 @@ stremioweb:
   podSecurityContext:
     seccompProfile:
       type: RuntimeDefault
-    fsGroup: 568
-    fsGroupChangePolicy: "OnRootMismatch"
-    runAsUser: 568
-    runAsGroup: 568
-    supplementalGroups:
-    - 993
   automountServiceAccountToken: false
   envFrom:
   - configMapRef:
-      name: stremio-web-env
+      name: flixio-env
   - configMapRef:
-      name: elfbot-stremio-web
+      name: elfbot-flixio
       optional: true  
   resources:
     requests:
@@ -11097,7 +11091,7 @@ stremthru:
   enabled: false
   image:
     repository: ghcr.io/elfhosted/stremthru
-    tag: 0.19.0@sha256:6a214d8d9dfa160e02f08970ff8886ca1502f697b4ec12381ee15f572140d707
+    tag: 0.19.1@sha256:1ccb62970f6940a2b22d76f4528fad0965ce53275e932c5d09571707a7d6f1ee
   priorityClassName: tenant-normal
   controller:
     annotations: