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

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
charts/stable/jackett/Chart.yaml
+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
charts/stable/jackett/questions.yaml
+111 -136
View File
@@ -24,47 +24,55 @@ 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: type - variable: advanced
description: "Please specify type of workload to deploy" label: "Show Advanced Controller Settings"
label: "(Advanced) Controller Type"
schema: schema:
type: string type: boolean
default: "deployment" default: false
required: true show_subquestions_if: true
enum: subquestions:
- value: "deployment" - variable: type
description: "Deployment" description: "Please specify type of workload to deploy"
- value: "statefulset" label: "(Advanced) Controller Type"
description: "Statefulset" schema:
- value: "daemonset" type: string
description: "Daemonset" default: "deployment"
- variable: replicas required: true
description: "Number of desired pod replicas" enum:
label: "Desired Replicas" - value: "deployment"
schema: description: "Deployment"
type: int - value: "statefulset"
default: 1 description: "Statefulset"
required: true - value: "daemonset"
- variable: strategy description: "Daemonset"
description: "Please specify type of workload to deploy" - variable: replicas
label: "(Advanced) Update Strategy" description: "Number of desired pod replicas"
schema: label: "Desired Replicas"
type: string schema:
default: "Recreate" type: int
required: true default: 1
enum: required: true
- value: "Recreate" - variable: strategy
description: "Recreate: Kill existing pods before creating new ones" description: "Please specify type of workload to deploy"
- value: "RollingUpdate" label: "(Advanced) Update Strategy"
description: "RollingUpdate: Create new pods and then kill old ones" schema:
- value: "OnDelete" type: string
description: "(Legacy) OnDelete: ignore .spec.template changes" default: "Recreate"
required: true
enum:
- value: "Recreate"
description: "Recreate: Kill existing pods before creating new ones"
- value: "RollingUpdate"
description: "RollingUpdate: Create new pods and then kill old ones"
- value: "OnDelete"
description: "(Legacy) OnDelete: ignore .spec.template changes"
# Include{controllerExpert} # Include{controllerExpert}
- variable: env - variable: env
@@ -89,97 +97,57 @@ 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: enabled - variable: advanced
label: "Enable the port" label: "Show Advanced settings"
schema: schema:
type: boolean type: boolean
default: true default: false
hidden: true show_subquestions_if: true
- variable: protocol subquestions:
label: "Port Type" - variable: enabled
schema: label: "Enable the port"
type: string schema:
default: "HTTP" type: boolean
enum: default: true
- value: HTTP - variable: protocol
description: "HTTP" label: "Port Type"
- value: "HTTPS" schema:
description: "HTTPS" type: string
- value: TCP default: "HTTP"
description: "TCP" enum:
- value: "UDP" - value: HTTP
description: "UDP" description: "HTTP"
- variable: targetPort - value: "HTTPS"
label: "Target Port" description: "HTTPS"
description: "This port exposes the container port on the service" - value: TCP
schema: description: "TCP"
type: int - value: "UDP"
default: 9117 description: "UDP"
editable: false - variable: nodePort
hidden: true 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: 9117
- variable: port - variable: port
label: "Container Port" label: "This port exposes the container port on the service"
schema: schema:
type: int type: int
default: 9117 default: 9117
editable: true
required: true required: true
- variable: nodePort
label: "Node Port (Optional)"
description: "This port gets exposed to the node. Only considered when service type is NodePort"
schema:
type: int
min: 9000
max: 65535
default: 36009
- variable: serviceexpert - variable: serviceexpert
group: "Networking and Services" group: "Networking and Services"
@@ -379,32 +347,39 @@ questions:
# Include{ingressList} # Include{ingressList}
- variable: securityContext - variable: advancedSecurity
label: "Show Advanced Security Settings"
group: "Security and Permissions" group: "Security and Permissions"
label: "Security Context"
schema: schema:
type: dict type: boolean
attrs: default: false
- variable: privileged show_subquestions_if: true
label: "Privileged mode" subquestions:
- variable: securityContext
label: "Security Context"
schema: schema:
type: boolean type: dict
default: false attrs:
- variable: readOnlyRootFilesystem - variable: privileged
label: "ReadOnly Root Filesystem" label: "Privileged mode"
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: allowPrivilegeEscalation - variable: readOnlyRootFilesystem
label: "Allow Privilege Escalation" label: "ReadOnly Root Filesystem"
schema: schema:
type: boolean type: boolean
default: false default: false
- variable: runAsNonRoot - variable: allowPrivilegeEscalation
label: "runAsNonRoot" label: "Allow Privilege Escalation"
schema: schema:
type: boolean type: boolean
default: true default: false
- variable: runAsNonRoot
label: "runAsNonRoot"
schema:
type: boolean
default: true
- variable: podSecurityContext - variable: podSecurityContext
group: "Security and Permissions" group: "Security and Permissions"
charts/stable/jackett/values.yaml
+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:
templates/questions/controllerExpert.yaml
+57 -57
View File
@@ -1,64 +1,64 @@
- variable: advanced - variable: advanced
label: "Show Expert Configuration Options" label: "Show Expert Configuration Options"
schema:
type: boolean
default: false
show_subquestions_if: true
subquestions:
- variable: extraArgs
label: "Extra Args"
schema: schema:
type: list type: boolean
default: [] default: false
items: show_subquestions_if: true
- variable: argItem subquestions:
label: "Arg" - variable: extraArgs
label: "Extra Args"
schema: schema:
type: dict type: list
attrs: default: []
- variable: name items:
label: "Name" - variable: argItem
label: "Arg"
schema: schema:
type: string type: dict
- variable: value attrs:
label: "Value" - variable: name
schema: label: "Name"
type: string schema:
- variable: labelsList type: string
label: "Controller Labels" - variable: value
schema: label: "Value"
type: list schema:
default: [] type: string
items: - variable: labelsList
- variable: labelItem label: "Controller Labels"
label: "Label"
schema: schema:
type: dict type: list
attrs: default: []
- variable: name items:
label: "Name" - variable: labelItem
label: "Label"
schema: schema:
type: string type: dict
- variable: value attrs:
label: "Value" - variable: name
schema: label: "Name"
type: string schema:
- variable: annotationsList type: string
label: " Controller Annotations" - variable: value
schema: label: "Value"
type: list schema:
default: [] type: string
items: - variable: annotationsList
- variable: annotationItem label: " Controller Annotations"
label: "Label"
schema: schema:
type: dict type: list
attrs: default: []
- variable: name items:
label: "Name" - variable: annotationItem
label: "Label"
schema: schema:
type: string type: dict
- variable: value attrs:
label: "Value" - variable: name
schema: label: "Name"
type: string schema:
type: string
- variable: value
label: "Value"
schema:
type: string