DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 35 Packages Projects Releases 1 Wiki Activity

fix(omada-controller): Use correct ports for v5.x and fix typo (#1962)

Browse Source 
* fix(omada-controller): Use correct ports for v5.x and fix typo

* doc ports and default to udp questions

* udp
This commit is contained in:
Stavros Kois
2022-02-25 00:49:14 +01:00
committed by GitHub
parent 2291274aee
commit 87bd915681
4 changed files with 266 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/incubator/omada-controller/Chart.yaml
+1 -1
View File
@@ -18,7 +18,7 @@ name: omada-controller
sources: sources:
- https://github.com/mbentley/docker-omada-controller - https://github.com/mbentley/docker-omada-controller
- https://github.com/truecharts/apps/tree/master/charts/omada-controller - https://github.com/truecharts/apps/tree/master/charts/omada-controller
version: 4.0.66 version: 4.0.67
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
charts/incubator/omada-controller/questions.yaml
+256
View File
@@ -203,6 +203,262 @@ questions:
schema: schema:
type: int type: int
default: 8843 default: 8843
- variable: omada-tcp
label: "Omada TCP"
description: "Omada TCP"
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: omada-tcp1
label: "Omada TCP 1"
description: "Omada Controller or EAP Discovery Utility manages Omada devices before Omada Controller v5.x."
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 29811
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: "TCP"
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: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 29811
- variable: omada-tcp2
label: "Omada TCP 2"
description: "Omada Controller or EAP Discovery Utility manages Omada devices before Omada Controller v5.x."
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 29812
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: "TCP"
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: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 29812
- variable: omada-tcp3
label: "Omada TCP 3"
description: "Omada Controller upgrades Omada devices before Omada Controller v5.x."
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 29813
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: "TCP"
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: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 29813
- variable: omada-tcp4
label: "Omada TCP 4"
description: "Omada Controller or EAP Discovery Utility adopts Omada devices since Omada Controller v5.x."
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 29814
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: "TCP"
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: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 29814
- variable: omada-udp
label: "Omada UDP"
description: "Omada UDP"
schema:
additional_attrs: true
type: dict
attrs:
# Include{serviceSelector}
- variable: omada-udp1
label: "Omada UDP 1"
description: "Omada Controller or EAP Discovery Utility discovers Omada devices."
schema:
additional_attrs: true
type: dict
attrs:
- variable: port
label: "Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 29810
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: "UDP"
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: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 29810
- variable: serviceexpert - variable: serviceexpert
group: "Networking and Services" group: "Networking and Services"
charts/incubator/omada-controller/values.yaml
+8 -32
View File
@@ -1,9 +1,6 @@
image: image:
# -- image repository
repository: tccr.io/truecharts/omada-controller repository: tccr.io/truecharts/omada-controller
# -- image tag
tag: v5.0@sha256:31b3cd5a6eee52c2b04a694f8a103447fc98a03b52f3b20c49d867058f15e314 tag: v5.0@sha256:31b3cd5a6eee52c2b04a694f8a103447fc98a03b52f3b20c49d867058f15e314
# -- image pull policy
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
securityContext: securityContext:
@@ -14,14 +11,9 @@ podSecurityContext:
runAsUser: 0 runAsUser: 0
runAsGroup: 0 runAsGroup: 0
# -- environment variables. See [image docs](https://github.com/mbentley/docker-omada-controller) for more details.
# @default -- See below
env: env:
# -- Set the container timezone
TZ: UTC TZ: UTC
# -- Configures service settings for the chart.
# @default -- See values.yaml
service: service:
main: main:
ports: ports:
@@ -33,28 +25,29 @@ service:
enabled: true enabled: true
ports: ports:
comm: comm:
protocol: HTTPS
enabled: true enabled: true
port: 8843 port: 8843
targetPor: 8843 targetPort: 8843
omada-tcp: omada-tcp:
enabled: true enabled: true
ports: ports:
omada-tcp1: omada-tcp1:
enabled: true
port: 29810
targetPort: 29810
omada-tcp2:
enabled: true enabled: true
port: 29811 port: 29811
targetPort: 29811 targetPort: 29811
omada-tcp3: omada-tcp2:
enabled: true enabled: true
port: 29812 port: 29812
targetPort: 29812 targetPort: 29812
omada-tcp4: omada-tcp3:
enabled: true enabled: true
port: 29813 port: 29813
targetPort: 29813 targetPort: 29813
omada-tcp4:
enabled: true
port: 29814
targetPort: 29814
omada-udp: omada-udp:
enabled: true enabled: true
ports: ports:
@@ -63,24 +56,7 @@ service:
protocol: UDP protocol: UDP
port: 29810 port: 29810
targetPort: 29810 targetPort: 29810
omada-udp2:
enabled: true
protocol: UDP
port: 29811
targetPort: 29811
omada-udp3:
enabled: true
protocol: UDP
port: 29812
targetPort: 29812
omada-udp4:
enabled: true
protocol: UDP
port: 29813
targetPort: 29813
# -- Configure persistence settings for the chart under this key.
# @default -- See values.yaml
persistence: persistence:
data: data:
enabled: true enabled: true
docs/manual/default-ports.md
+1 -4
View File
@@ -332,14 +332,11 @@ These defaults can of course be changed, but as we guarantee "sane, working defa
| impostor-server | main | main | 22023 | UDP | | | impostor-server | main | main | 22023 | UDP | |
| joplin-server | main | main | 22300 | TCP | | | joplin-server | main | main | 22300 | TCP | |
| minecraft-java | main | main | 25565 | TCP | | | minecraft-java | main | main | 25565 | TCP | |
| omada-controller | omada-tcp | omada-tcp1 | 29810 | TCP | |
| omada-controller | omada-udp | omada-udp1 | 29810 | UDP | | | omada-controller | omada-udp | omada-udp1 | 29810 | UDP | |
| omada-controller | omada-tcp | omada-tcp2 | 29811 | TCP | | | omada-controller | omada-tcp | omada-tcp2 | 29811 | TCP | |
| omada-controller | omada-udp | omada-udp2 | 29811 | UDP | |
| omada-controller | omada-tcp | omada-tcp3 | 29812 | TCP | | | omada-controller | omada-tcp | omada-tcp3 | 29812 | TCP | |
| omada-controller | omada-udp | omada-udp3 | 29812 | UDP | |
| omada-controller | omada-tcp | omada-tcp4 | 29813 | TCP | | | omada-controller | omada-tcp | omada-tcp4 | 29813 | TCP | |
| omada-controller | omada-udp | omada-udp4 | 29813 | UDP | | | omada-controller | omada-udp | omada-tcp4 | 29814 | TCP | |
| minetest | main | main | 30000 | UDP | | | minetest | main | main | 30000 | UDP | |
| teamspeak3 | files | files | 30033 | TCP | | | teamspeak3 | files | files | 30033 | TCP | |
| plex | main | main | 32400 | TCP | Potential conflict with plex (Official) | | plex | main | main | 32400 | TCP | Potential conflict with plex (Official) |