From e191f3a2f84803f6ee279018d88593cdd2275a0b Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Wed, 15 Feb 2023 05:54:58 -0500 Subject: [PATCH] fix(aria2) disable portal and added more gui options. (#6697) * fix(aria2) remove portal and clean up gui * update values * add gui options * rar * Update charts/stable/aria2/questions.yaml Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Signed-off-by: xstar97 <9399967+xstar97@users.noreply.github.com> * bunmp --------- Signed-off-by: xstar97 <9399967+xstar97@users.noreply.github.com> Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com> --- charts/stable/aria2/questions.yaml | 78 ++++++++++++++++++------------ charts/stable/aria2/values.yaml | 49 ++++++++++--------- 2 files changed, 73 insertions(+), 54 deletions(-) diff --git a/charts/stable/aria2/questions.yaml b/charts/stable/aria2/questions.yaml index 8289dbb042d..8b4cd666089 100644 --- a/charts/stable/aria2/questions.yaml +++ b/charts/stable/aria2/questions.yaml @@ -1,7 +1,5 @@ # Include{groups} -portals: - open: -# Include{portalLink} +portals: {} questions: # Include{global} # Include{controller} @@ -9,24 +7,42 @@ questions: # Include{replica1} # Include{controllerExpertExtraArgs} - variable: secretEnv - group: "App Configuration" - label: "Image Secrets" + group: App Configuration + label: Image Secrets schema: additional_attrs: true type: dict attrs: - variable: RPC_SECRET - label: "RPC_SECRET" - description: "Sets the RPC_SECRET env var" + label: RPC Secret + description: Set RPC secret authorization token. schema: type: string private: true - default: "REPLACETHIS" + default: "" + - variable: DISK_CACHE + label: Disk Cache + description: Set up disk cache. SIZE can include K or M. + schema: + type: string + default: "64M" + - variable: UPDATE_TRACKERS + label: Update Trackers + description: Whether to update BT Trackers List automatically. + schema: + type: boolean + default: true + - variable: CUSTOM_TRACKER_URL + label: Custom Trackers URL + description: Custom BT Trackers List URL. + schema: + type: string + default: "https://trackerslist.com/all_aria2.txt" # 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 @@ -34,21 +50,21 @@ 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: 6800 required: true - variable: listen - label: "Listen Service" - description: "" + label: Listen Service + description: schema: additional_attrs: true type: dict @@ -56,14 +72,14 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: listen - label: "Listen Service Port Configuration" + label: Listen 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: 6888 @@ -74,8 +90,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: config - label: "App Config Storage" - description: "Stores the Application Configuration." + label: App Config Storage + description: Stores the Application Configuration. schema: additional_attrs: true type: dict @@ -84,7 +100,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -96,41 +112,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/stable/aria2/values.yaml b/charts/stable/aria2/values.yaml index b9720b5348e..3748d58bcd8 100644 --- a/charts/stable/aria2/values.yaml +++ b/charts/stable/aria2/values.yaml @@ -3,27 +3,6 @@ image: tag: latest@sha256:08a35fe3204c00dbdc609b1abc8c05c349764c3caecb9dadb970dc470c5b1f41 pullPolicy: IfNotPresent -secretEnv: - RPC_SECRET: "ChangemeNow" - -env: - RPC_PORT: 6800 - # LISTEN_PORT: 6888 - -service: - main: - ports: - main: - port: 6800 - targetPort: 6800 - listen: - enabled: true - ports: - listen: - enabled: true - port: 6888 - targetPort: 6888 - securityContext: readOnlyRootFilesystem: false runAsNonRoot: false @@ -32,12 +11,36 @@ podSecurityContext: runAsUser: 0 runAsGroup: 0 +secretEnv: + RPC_SECRET: "ChangemeNow" + +env: + RPC_PORT: "{{ .Values.service.main.ports.main.port }}" + LISTEN_PORT: "{{ .Values.service.listen.ports.listen.port }}" + UMASK_SET: "{{ .Values.security.UMASK }}" + DISK_CACHE: 64M + IPV6_MODE: false + UPDATE_TRACKERS: false + CUSTOM_TRACKER_URL: "https://trackerslist.com/all_aria2.txt" + +service: + main: + ports: + main: + port: 6800 + listen: + enabled: true + ports: + listen: + enabled: true + port: 6888 + persistence: config: enabled: true - mountPath: "/config" + mountPath: /config varrun: enabled: true portal: - enabled: true + enabled: false