From 90087a71dc3d1e5788126fd85c2b977ba1255277 Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Tue, 29 Nov 2022 01:35:15 +0200 Subject: [PATCH] fix(lms): update ports (#4933) --- charts/incubator/jenkins/Chart.yaml | 2 +- charts/incubator/jenkins/questions.yaml | 82 +++++-------- .../stable/logitech-media-server/Chart.yaml | 2 +- .../logitech-media-server/questions.yaml | 112 ++++++------------ .../stable/logitech-media-server/values.yaml | 20 +--- 5 files changed, 70 insertions(+), 148 deletions(-) diff --git a/charts/incubator/jenkins/Chart.yaml b/charts/incubator/jenkins/Chart.yaml index 5b433a9673e..4c32a2f7969 100644 --- a/charts/incubator/jenkins/Chart.yaml +++ b/charts/incubator/jenkins/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/jenkins - https://hub.docker.com/r/jenkins/jenkins type: application -version: 2.0.1 +version: 2.0.2 annotations: truecharts.org/SCALE-support: "true" truecharts.org/catagories: | diff --git a/charts/incubator/jenkins/questions.yaml b/charts/incubator/jenkins/questions.yaml index b25a53e09d2..1017bfe44b6 100644 --- a/charts/incubator/jenkins/questions.yaml +++ b/charts/incubator/jenkins/questions.yaml @@ -9,23 +9,23 @@ questions: # Include{replica1} # Include{controllerExpertExtraArgs} - variable: env - group: "App Configuration" - label: "Image Environment" + group: App Configuration + label: Image Environment schema: additional_attrs: true type: dict attrs: - variable: JENKINS_JAVA_OPTS - label: "JENKINS_JAVA_OPTS" - description: "You might need to customize the JVM running Jenkins, typically to adjust system properties or tweak heap memory settings." + label: JENKINS_JAVA_OPTS + description: You might need to customize the JVM running Jenkins, typically to adjust system properties or tweak heap memory settings. schema: type: string default: "" # 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 @@ -33,49 +33,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: 10280 required: true - - variable: advanced - label: "Show Advanced settings" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "HTTP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - - variable: nodePort - label: "Node Port (Optional)" - description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer" - schema: - type: int - min: 9000 - max: 65535 - variable: agent - label: "Agent Service" - description: "Agent Service" + label: Agent Service + description: Agent Service schema: additional_attrs: true type: dict @@ -83,14 +55,14 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: agent - label: "Agent Service Port Configuration" + label: Agent 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: 50000 @@ -101,8 +73,8 @@ questions: # Include{serviceList} # Include{persistenceRoot} - variable: data - label: "App Data Storage" - description: "Stores the Application Data." + label: App Data Storage + description: Stores the Application Data. schema: additional_attrs: true type: dict @@ -111,7 +83,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -123,41 +95,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: 1000 diff --git a/charts/stable/logitech-media-server/Chart.yaml b/charts/stable/logitech-media-server/Chart.yaml index 1f2634d3631..ca441ee948b 100644 --- a/charts/stable/logitech-media-server/Chart.yaml +++ b/charts/stable/logitech-media-server/Chart.yaml @@ -24,7 +24,7 @@ sources: - https://github.com/Logitech/slimserver - https://hub.docker.com/r/lmscommunity/logitechmediaserver type: application -version: 6.0.4 +version: 6.1.0 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/logitech-media-server/questions.yaml b/charts/stable/logitech-media-server/questions.yaml index ca904fb095c..cd3a1689ae7 100644 --- a/charts/stable/logitech-media-server/questions.yaml +++ b/charts/stable/logitech-media-server/questions.yaml @@ -11,8 +11,8 @@ questions: # Include{containerConfig} # Include{serviceRoot} - variable: main - label: "Main Service" - description: "Logitech Media Web UI and music streaming" + label: Main Service + description: Logitech Media Web UI and music streaming schema: additional_attrs: true type: dict @@ -20,21 +20,21 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: main - label: "Web Interface and music streaming port" + label: Web Interface and music streaming port 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: 7000 + default: 9000 required: true - variable: cli - label: "CLI Service" - description: "Logitech Media Server Telnet Command Line Interface" + label: CLI Service + description: Logitech Media Server Telnet Command Line Interface schema: additional_attrs: true type: dict @@ -42,35 +42,21 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: cli - label: "Port used for remote control using the Telnet Command Line interface" + label: Port used for remote control using the Telnet Command Line interface schema: additional_attrs: true type: dict attrs: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "TCP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - 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: 10059 + default: 9090 required: true - variable: playertcp - label: "Logitech Media Server Player TCP Communcation" - description: "Logitech Media Server Player Service for TCP communication" + label: Logitech Media Server Player TCP Communcation + description: Logitech Media Server Player Service for TCP communication schema: additional_attrs: true type: dict @@ -78,35 +64,21 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: slimprototcp - label: "Player to server TCP communication" + label: Player to server TCP communication schema: additional_attrs: true type: dict attrs: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "TCP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - 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: 3483 required: true - variable: playerudp - label: "Logitech Media Server Player Communcation" - description: "Logitech Media Server Player Service for UDP communication" + label: Logitech Media Server Player Communcation + description: Logitech Media Server Player Service for UDP communication schema: additional_attrs: true type: dict @@ -114,28 +86,14 @@ questions: # Include{serviceSelectorLoadBalancer} # Include{serviceSelectorExtras} - variable: slimprotoudp - label: "Player to server UDP communication" + label: Player to server UDP communication schema: additional_attrs: true type: dict attrs: - - variable: protocol - label: "Port Type" - schema: - type: string - default: "UDP" - enum: - - value: HTTP - description: "HTTP" - - value: "HTTPS" - description: "HTTPS" - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" - 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: 3483 @@ -146,8 +104,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 @@ -156,7 +114,7 @@ questions: # Include{persistenceList} # Include{ingressRoot} - variable: main - label: "Main Ingress" + label: Main Ingress schema: additional_attrs: true type: dict @@ -168,41 +126,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/logitech-media-server/values.yaml b/charts/stable/logitech-media-server/values.yaml index 0b89bcf0936..1ef151ee172 100644 --- a/charts/stable/logitech-media-server/values.yaml +++ b/charts/stable/logitech-media-server/values.yaml @@ -2,13 +2,9 @@ image: repository: tccr.io/truecharts/logitechmediaserver pullPolicy: IfNotPresent tag: 8.4.0@sha256:a22d99d15cb5cba04746aa7be636635d6b7b036901db2d1fd99a222fd64b5551 + env: - # Permissions Settings HTTP_PORT: "{{ .Values.service.main.ports.main.port }}" - # Port to host the web service on. This will be the internal container port exposed and needs to be the same as the public service port. - # The main http port always has to be a 1:1 mapping between external and internal port. - # You can't just map it like -p 9002:9000, as Logitech Media Server is telling players on which port to connect. - # Therefore if you have to use a different http port for LMS (other than 9000) you'll have to set the HTTP_PORT environment variable securityContext: readOnlyRootFilesystem: false @@ -22,38 +18,34 @@ service: main: ports: main: - # Please note that the main http port always has to be a 1:1 mapping between external and internal port. - # You can't just map it like -p 7000:9000, as Logitech Media Server is telling players on which port to connect. - # Therefore if you have to use a different http port for LMS (other than 9000) you'll have to set the HTTP_PORT environment variable - targetPort: 7000 - port: 7000 + port: 9000 cli: enabled: true ports: cli: enabled: true + port: 9090 targetPort: 9090 - port: 10059 playertcp: enabled: true ports: slimprototcp: enabled: true - targetPort: 3483 port: 3483 + targetPort: 3483 playerudp: enabled: true ports: slimprotoudp: enabled: true - targetPort: 3483 port: 3483 protocol: UDP + targetPort: 3483 persistence: config: enabled: true - mountPath: "/config" + mountPath: /config portal: enabled: true