From 473156684e1080027d97f903fbd02b3c9ffc8beb Mon Sep 17 00:00:00 2001
From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
Date: Wed, 15 Feb 2023 10:09:28 -0500
Subject: [PATCH] fix(acestream) code cleanup + env variables. (#7236)

* fix(acestream) code cleanup + env variables.

* update

* fix whitespace

---------

Signed-off-by: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com>
---
 charts/incubator/acestream/Chart.yaml     | 15 +++++-----
 charts/incubator/acestream/questions.yaml | 36 +++++++++++------------
 charts/incubator/acestream/values.yaml    | 21 ++++++++-----
 3 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/charts/incubator/acestream/Chart.yaml b/charts/incubator/acestream/Chart.yaml
index 8bbdfb99429..9e874a67e42 100644
--- a/charts/incubator/acestream/Chart.yaml
+++ b/charts/incubator/acestream/Chart.yaml
@@ -1,15 +1,11 @@
-annotations:
-  truecharts.org/SCALE-support: "true"
-  truecharts.org/catagories: |
-    - MediaServer-Video
 apiVersion: v2
-appVersion: "latest"
+appVersion: "2.0.2.8"
 dependencies:
   - name: common
     repository: https://library-charts.truecharts.org
     version: 11.1.2
 deprecated: false
-description: "Acestream-engine"
+description: IPTV service providing streaming, playlist, search engine and epg.
 home: https://truecharts.org/charts/incubator/acestream
 icon: https://truecharts.org/img/hotlink-ok/chart-icons/acestream.png
 keywords:
@@ -26,4 +22,9 @@ sources:
   - https://hub.docker.com/r/vstavrinov/acestream-service
   - https://github.com/vstavrinov/acestream-service
 type: application
-version: 2.0.17
+version: 3.0.0
+annotations:
+  truecharts.org/catagories: |
+    - MediaServer-Video
+  truecharts.org/SCALE-support: "true"
+  truecharts.org/grade: U
diff --git a/charts/incubator/acestream/questions.yaml b/charts/incubator/acestream/questions.yaml
index dd89cc3e14b..3707035c9c2 100644
--- a/charts/incubator/acestream/questions.yaml
+++ b/charts/incubator/acestream/questions.yaml
@@ -11,8 +11,8 @@ questions:
 # Include{containerConfig}
 # Include{serviceRoot}
         - variable: main
-          label: "Main Service"
-          description: "The Primary service on which the healthcheck runs, often the webUI"
+          label: Main Service
+          description: The Primary service on which the healthcheck runs, often the webUI
           schema:
             additional_attrs: true
             type: dict
@@ -20,14 +20,14 @@ questions:
 # Include{serviceSelectorLoadBalancer}
 # Include{serviceSelectorExtras}
                     - variable: main
-                      label: "Main Service Port Configuration"
+                      label: Main Service Port Configuration
                       schema:
                         additional_attrs: true
                         type: dict
                         attrs:
                           - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
+                            label: Port
+                            description: This port exposes the container port on the service
                             schema:
                               type: int
                               default: 8008
@@ -38,8 +38,8 @@ questions:
 # Include{serviceList}
 # Include{persistenceRoot}
         - variable: acestreamcache
-          label: "acestreamcache Storage"
-          description: "Stream cache data"
+          label: App Cache Storage
+          description: Stores the Application Cache.
           schema:
             additional_attrs: true
             type: dict
@@ -48,7 +48,7 @@ questions:
 # Include{persistenceList}
 # Include{ingressRoot}
         - variable: main
-          label: "Main Ingress"
+          label: Main Ingress
           schema:
             additional_attrs: true
             type: dict
@@ -60,41 +60,41 @@ questions:
 # Include{security}
 # Include{securityContextAdvancedRoot}
               - variable: privileged
-                label: "Privileged mode"
+                label: Privileged mode
                 schema:
                   type: boolean
                   default: false
               - variable: readOnlyRootFilesystem
-                label: "ReadOnly Root Filesystem"
+                label: ReadOnly Root Filesystem
                 schema:
                   type: boolean
                   default: false
               - variable: allowPrivilegeEscalation
-                label: "Allow Privilege Escalation"
+                label: Allow Privilege Escalation
                 schema:
                   type: boolean
                   default: false
               - variable: runAsNonRoot
-                label: "runAsNonRoot"
+                label: runAsNonRoot
                 schema:
                   type: boolean
                   default: false
 # Include{podSecurityContextRoot}
         - variable: runAsUser
-          label: "runAsUser"
-          description: "The UserID of the user running the application"
+          label: runAsUser
+          description: The UserID of the user running the application
           schema:
             type: int
             default: 0
         - variable: runAsGroup
-          label: "runAsGroup"
-          description: The groupID this App of the user running the application"
+          label: runAsGroup
+          description: The groupID this App of the user running the application
           schema:
             type: int
             default: 0
         - variable: fsGroup
-          label: "fsGroup"
-          description: "The group that should own ALL storage."
+          label: fsGroup
+          description: The group that should own ALL storage.
           schema:
             type: int
             default: 568
diff --git a/charts/incubator/acestream/values.yaml b/charts/incubator/acestream/values.yaml
index 68c891be7c9..b28dfcd5455 100644
--- a/charts/incubator/acestream/values.yaml
+++ b/charts/incubator/acestream/values.yaml
@@ -1,25 +1,32 @@
-env: {}
 image:
   pullPolicy: IfNotPresent
   repository: tccr.io/truecharts/acestream
-  tag: latest@sha256:c372e24593fe23dc0f34f143299526dbf4454bf9fc860c74839e5dd98249393a
-persistence:
-  acestreamcache:
-    enabled: true
-    mountPath: /srv/acestream/.ACEStream
+  tag: 2.0.2.8@sha256:742c6e16126d819593fd5e041e2166ba789df76edfbd3a6c628b3b83800e6743
+
 podSecurityContext:
   runAsGroup: 0
   runAsUser: 0
+
 securityContext:
   readOnlyRootFilesystem: false
   runAsNonRoot: false
+
+env:
+  SCHEME: "http"
+  ENTRY: "{{ .Values.service.main.ports.main.port }}"
+  PORT: "{{ .Values.service.main.ports.main.port }}"
+
 service:
   main:
     ports:
       main:
         port: 8008
         protocol: TCP
-        targetPort: 6878
+
+persistence:
+  acestreamcache:
+    enabled: true
+    mountPath: /srv/acestream/.ACEStream
 
 portal:
   enabled: true