chore(jackett): refactor ServiceType to simplify it (#1285)

* chore(jackett): refactor ServiceType to simplify it

* put securityContext hidden behind a checkbox

* chore(Apps): put deployment config behind checkbox

(cherry picked from commit c75410141ae2f1394f38437c42042ce689604fc8)

* bump common on Jackett for testing
This commit is contained in:
Kjeld Schouten-Lebbing
2021-11-06 12:00:55 +01:00
committed by GitHub
parent 5e6ebf9fad
commit 4dfe95fa9a
4 changed files with 172 additions and 195 deletions
+2 -2
View File
@@ -3,7 +3,7 @@ appVersion: "0.19.124"
dependencies: dependencies:
- name: common - name: common
repository: https://truecharts.org repository: https://truecharts.org
version: 8.3.19 version: 8.4.0
deprecated: false deprecated: false
description: API Support for your favorite torrent trackers. description: API Support for your favorite torrent trackers.
home: https://github.com/truecharts/apps/tree/master/charts/stable/jackett home: https://github.com/truecharts/apps/tree/master/charts/stable/jackett
@@ -24,7 +24,7 @@ name: jackett
sources: sources:
- https://github.com/Jackett/Jackett - https://github.com/Jackett/Jackett
type: application type: application
version: 9.0.6 version: 9.0.7
annotations: annotations:
truecharts.org/catagories: | truecharts.org/catagories: |
- media - media
+37 -62
View File
@@ -24,12 +24,20 @@ questions:
type: boolean type: boolean
default: true default: true
# Include{global} # Include{global}
- variable: controller - variable: controller
group: "Controller" group: "Controller"
label: "" label: ""
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: advanced
label: "Show Advanced Controller Settings"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: type - variable: type
description: "Please specify type of workload to deploy" description: "Please specify type of workload to deploy"
label: "(Advanced) Controller Type" label: "(Advanced) Controller Type"
@@ -89,60 +97,24 @@ questions:
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: enabled # Include{serviceselector}
label: "Enable the service"
schema:
type: boolean
default: true
hidden: true
- variable: type
label: "Service Type"
description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
schema:
type: string
default: "NodePort"
enum:
- value: "NodePort"
description: "NodePort"
- value: "ClusterIP"
description: "ClusterIP"
- value: "LoadBalancer"
description: "LoadBalancer"
- variable: loadBalancerIP
label: "LoadBalancer IP"
description: "LoadBalancerIP"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: string
default: ""
- variable: externalIPs
label: "External IP's"
description: "External IP's"
schema:
show_if: [["type", "=", "LoadBalancer"]]
type: list
default: []
items:
- variable: externalIP
label: "External IP"
schema:
type: string
- variable: ports
label: "Service's Port(s) Configuration"
schema:
type: dict
attrs:
- variable: main - variable: main
label: "Main Service Port Configuration" label: "Main Service Port Configuration"
schema: schema:
type: dict type: dict
attrs: attrs:
- variable: advanced
label: "Show Advanced settings"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: enabled - variable: enabled
label: "Enable the port" label: "Enable the port"
schema: schema:
type: boolean type: boolean
default: true default: true
hidden: true
- variable: protocol - variable: protocol
label: "Port Type" label: "Port Type"
schema: schema:
@@ -157,29 +129,25 @@ questions:
description: "TCP" description: "TCP"
- value: "UDP" - value: "UDP"
description: "UDP" description: "UDP"
- variable: targetPort
label: "Target Port"
description: "This port exposes the container port on the service"
schema:
type: int
default: 9117
editable: false
hidden: true
- variable: port
label: "Container Port"
schema:
type: int
default: 9117
editable: true
required: true
- variable: nodePort - variable: nodePort
label: "Node Port (Optional)" label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort" description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
schema: schema:
type: int type: int
min: 9000 min: 9000
max: 65535 max: 65535
default: 36009 - variable: targetPort
label: "Target Port"
description: "The internal(!) port on the container the Application runs on"
schema:
type: int
default: 9117
- variable: port
label: "This port exposes the container port on the service"
schema:
type: int
default: 9117
required: true
- variable: serviceexpert - variable: serviceexpert
group: "Networking and Services" group: "Networking and Services"
@@ -379,8 +347,15 @@ questions:
# Include{ingressList} # Include{ingressList}
- variable: securityContext - variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions" group: "Security and Permissions"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: securityContext
label: "Security Context" label: "Security Context"
schema: schema:
type: dict type: dict
+2
View File
@@ -11,8 +11,10 @@ securityContext:
service: service:
main: main:
enabled: true enabled: true
protocol: "HTTP"
ports: ports:
main: main:
targetPort: 9117
port: 9117 port: 9117
probes: probes: