From 8fcda955e2508292ac457b1de5f53f5d7577b17b Mon Sep 17 00:00:00 2001 From: Stavros Kois <47820033+stavros-k@users.noreply.github.com> Date: Sat, 9 Jul 2022 22:29:01 +0300 Subject: [PATCH] chore(apps): combine some ports (#3096) * chore(apps): combine some ports * lints * move `protocol` under `ports` rather under `service` * bump cloudd --- charts/incubator/adguard-home/Chart.yaml | 2 +- charts/incubator/adguard-home/questions.yaml | 74 +++--------- charts/incubator/adguard-home/values.yaml | 26 +---- charts/incubator/cloudflared/Chart.yaml | 2 +- charts/incubator/cloudflared/values.yaml | 2 +- charts/incubator/etesync/Chart.yaml | 2 +- charts/incubator/etesync/values.yaml | 2 +- charts/incubator/homebridge/Chart.yaml | 2 +- charts/incubator/homebridge/values.yaml | 2 +- charts/incubator/privatebin/Chart.yaml | 2 +- charts/incubator/privatebin/values.yaml | 2 +- charts/incubator/radicale/Chart.yaml | 2 +- charts/incubator/radicale/values.yaml | 2 +- charts/incubator/technitium/Chart.yaml | 2 +- charts/incubator/technitium/questions.yaml | 15 +-- charts/incubator/technitium/values.yaml | 5 +- charts/stable/deluge/Chart.yaml | 2 +- charts/stable/deluge/questions.yaml | 8 -- charts/stable/deluge/values.yaml | 3 - charts/stable/grafana/values.yaml | 2 +- charts/stable/ipfs/Chart.yaml | 2 +- charts/stable/ipfs/questions.yaml | 12 +- charts/stable/ipfs/values.yaml | 5 +- charts/stable/jackett/Chart.yaml | 2 +- charts/stable/jackett/values.yaml | 2 +- .../stable/logitech-media-server/Chart.yaml | 2 +- .../logitech-media-server/questions.yaml | 11 +- .../stable/logitech-media-server/values.yaml | 5 +- charts/stable/openhab/Chart.yaml | 2 +- charts/stable/openhab/values.yaml | 4 +- charts/stable/openspeedtest/Chart.yaml | 2 +- charts/stable/openspeedtest/values.yaml | 2 +- charts/stable/pihole/Chart.yaml | 2 +- charts/stable/pihole/questions.yaml | 103 ++++++++-------- charts/stable/pihole/values.yaml | 7 +- charts/stable/qbittorrent/Chart.yaml | 2 +- charts/stable/qbittorrent/questions.yaml | 13 +-- .../qbittorrent/templates/_configmap.tpl | 2 +- charts/stable/qbittorrent/values.yaml | 5 +- charts/stable/resilio-sync/Chart.yaml | 2 +- charts/stable/resilio-sync/questions.yaml | 110 ++++++++---------- charts/stable/resilio-sync/values.yaml | 5 +- charts/stable/storj-node/Chart.yaml | 2 +- charts/stable/storj-node/questions.yaml | 14 +-- charts/stable/storj-node/values.yaml | 5 +- charts/stable/syncthing/Chart.yaml | 2 +- charts/stable/syncthing/questions.yaml | 8 -- charts/stable/syncthing/values.yaml | 3 - charts/stable/transmission/Chart.yaml | 2 +- charts/stable/transmission/questions.yaml | 13 +-- charts/stable/transmission/values.yaml | 7 +- charts/stable/verysync/Chart.yaml | 2 +- charts/stable/verysync/questions.yaml | 19 +-- charts/stable/verysync/values.yaml | 5 +- 54 files changed, 170 insertions(+), 373 deletions(-) diff --git a/charts/incubator/adguard-home/Chart.yaml b/charts/incubator/adguard-home/Chart.yaml index 3b24fe54a53..de955fd0824 100644 --- a/charts/incubator/adguard-home/Chart.yaml +++ b/charts/incubator/adguard-home/Chart.yaml @@ -18,7 +18,7 @@ maintainers: name: adguard-home sources: - https://hub.docker.com/r/adguard/adguardhome -version: 1.0.8 +version: 1.0.9 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/adguard-home/questions.yaml b/charts/incubator/adguard-home/questions.yaml index a238df2eaa1..a815dee4034 100644 --- a/charts/incubator/adguard-home/questions.yaml +++ b/charts/incubator/adguard-home/questions.yaml @@ -139,9 +139,9 @@ questions: schema: type: int default: 3000 - - variable: dns-tcp - label: "dns-tcp Service" - description: "dns-tcp service" + - variable: dns + label: "DNS Service" + description: "DNS service" schema: additional_attrs: true type: dict @@ -194,14 +194,6 @@ questions: schema: type: int default: 53 - - variable: dns-udp - label: "dns-udp Service" - description: "dns-udp service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-udp label: "dns-udp Service Port Configuration" schema: @@ -249,9 +241,9 @@ questions: schema: type: int default: 53 - - variable: dns-http - label: "dns-http Service" - description: "The dns-http service." + - variable: dns-doh + label: "dns-doh Service" + description: "The dns-doh service." schema: additional_attrs: true type: dict @@ -304,14 +296,6 @@ questions: schema: type: int default: 80 - - variable: dns-https - label: "dns-https Service" - description: "The dns-https service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-https label: "dns-https Service Port Configuration" schema: @@ -336,7 +320,7 @@ questions: label: "Port Type" schema: type: string - default: "HTTP" + default: "HTTPS" enum: - value: HTTP description: "HTTP" @@ -359,14 +343,6 @@ questions: schema: type: int default: 443 - - variable: dns-https-udp - label: "dns-https-udp Service" - description: "The dns-https-udp service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-https-udp label: "dns-https-udp Service Port Configuration" schema: @@ -422,8 +398,8 @@ questions: type: dict attrs: # Include{serviceSelector} - - variable: dns-crypt - label: "dns-crypt Service Port Configuration" + - variable: dns-crypt-tcp + label: "dns-crypt-tcp Service Port Configuration" schema: additional_attrs: true type: dict @@ -446,7 +422,7 @@ questions: label: "Port Type" schema: type: string - default: "HTTP" + default: "TCP" enum: - value: HTTP description: "HTTP" @@ -469,14 +445,6 @@ questions: schema: type: int default: 5443 - - variable: dns-crypt-udp - label: "dns-crypt-udp Service" - description: "The dns-crypt-udp service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-crypt-udp label: "dns-crypt-udp Service Port Configuration" schema: @@ -524,9 +492,9 @@ questions: schema: type: int default: 5443 - - variable: dns-quic-udp-1 - label: "dns-quic-udp-1 Service" - description: "The dns-quic-udp-1 service." + - variable: dns-quic + label: "dns-quic Service" + description: "The dns-quic service." schema: additional_attrs: true type: dict @@ -579,14 +547,6 @@ questions: schema: type: int default: 784 - - variable: dns-quic-udp-2 - label: "dns-quic-udp-2 Service" - description: "The dns-quic-udp-2 service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-quic-udp-2 label: "dns-quic-udp-2 Service Port Configuration" schema: @@ -634,14 +594,6 @@ questions: schema: type: int default: 853 - - variable: dns-quic-udp-3 - label: "dns-quic-udp-3 Service" - description: "The dns-quic-udp-3 service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-quic-udp-3 label: "dns-quic-udp-3 Service Port Configuration" schema: diff --git a/charts/incubator/adguard-home/values.yaml b/charts/incubator/adguard-home/values.yaml index bdcb1b49fea..22cecbac0de 100644 --- a/charts/incubator/adguard-home/values.yaml +++ b/charts/incubator/adguard-home/values.yaml @@ -18,38 +18,29 @@ service: main: port: 10232 targetPort: 3000 - dns-tcp: + dns: enabled: true ports: dns-tcp: enabled: true port: 53 targetPort: 53 - dns-udp: - enabled: true - ports: dns-udp: enabled: true protocol: UDP port: 53 targetPort: 53 - dns-http: + dns-doh: enabled: true ports: dns-http: enabled: true port: 10233 targetPort: 80 - dns-https: - enabled: true - ports: dns-https: enabled: true port: 10234 targetPort: 443 - dns-https-udp: - enabled: true - ports: dns-https-udp: enabled: true protocol: UDP @@ -58,19 +49,16 @@ service: dns-crypt: enabled: true ports: - dns-crypt: + dns-crypt-tcp: enabled: true port: 5443 targetPort: 5443 - dns-crypt-udp: - enabled: true - ports: dns-crypt-udp: enabled: true protocol: UDP port: 5443 targetPort: 5443 - dns-quic-udp-1: + dns-quic: enabled: true ports: dns-quic-udp-1: @@ -78,17 +66,11 @@ service: protocol: UDP port: 784 targetPort: 784 - dns-quic-udp-2: - enabled: true - ports: dns-quic-udp-2: enabled: true protocol: UDP port: 853 targetPort: 853 - dns-quic-udp-3: - enabled: true - ports: dns-quic-udp-3: enabled: true protocol: UDP diff --git a/charts/incubator/cloudflared/Chart.yaml b/charts/incubator/cloudflared/Chart.yaml index afe981f85e4..14b261e7c05 100644 --- a/charts/incubator/cloudflared/Chart.yaml +++ b/charts/incubator/cloudflared/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: cloudflared -version: 0.0.4 +version: 0.0.5 appVersion: "2022.7.1" description: Client for Cloudflare Tunnel, a daemon that exposes private services through the Cloudflare edge. type: application diff --git a/charts/incubator/cloudflared/values.yaml b/charts/incubator/cloudflared/values.yaml index 9ad7123a2b4..141f2a6c0cb 100644 --- a/charts/incubator/cloudflared/values.yaml +++ b/charts/incubator/cloudflared/values.yaml @@ -17,9 +17,9 @@ podSecurityContext: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 6969 port: 6969 diff --git a/charts/incubator/etesync/Chart.yaml b/charts/incubator/etesync/Chart.yaml index 395c3e1b707..3bbc70eda60 100644 --- a/charts/incubator/etesync/Chart.yaml +++ b/charts/incubator/etesync/Chart.yaml @@ -31,7 +31,7 @@ sources: - https://github.com/victor-rds/docker-etebase - https://hub.docker.com/r/victorrds/etesync type: application -version: 0.0.4 +version: 0.0.5 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/etesync/values.yaml b/charts/incubator/etesync/values.yaml index 22ae95cf518..efa2547e7b9 100644 --- a/charts/incubator/etesync/values.yaml +++ b/charts/incubator/etesync/values.yaml @@ -50,9 +50,9 @@ secretEnv: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 3735 port: 10254 diff --git a/charts/incubator/homebridge/Chart.yaml b/charts/incubator/homebridge/Chart.yaml index b90299fa1ab..8cb826c6914 100644 --- a/charts/incubator/homebridge/Chart.yaml +++ b/charts/incubator/homebridge/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://homebridge.io/ - https://github.com/oznu/docker-homebridge type: application -version: 1.0.9 +version: 1.0.10 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/homebridge/values.yaml b/charts/incubator/homebridge/values.yaml index 15f70dac283..810ebeef0ed 100644 --- a/charts/incubator/homebridge/values.yaml +++ b/charts/incubator/homebridge/values.yaml @@ -5,9 +5,9 @@ image: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 8581 port: 8581 diff --git a/charts/incubator/privatebin/Chart.yaml b/charts/incubator/privatebin/Chart.yaml index c5b125b8b2f..4ec46f01255 100644 --- a/charts/incubator/privatebin/Chart.yaml +++ b/charts/incubator/privatebin/Chart.yaml @@ -26,7 +26,7 @@ sources: - https://github.com/PrivateBin/PrivateBin - https://hub.docker.com/r/privatebin/pdo type: application -version: 0.0.7 +version: 0.0.8 annotations: truecharts.org/catagories: | - productivity diff --git a/charts/incubator/privatebin/values.yaml b/charts/incubator/privatebin/values.yaml index 50c97866279..b354f007a1b 100644 --- a/charts/incubator/privatebin/values.yaml +++ b/charts/incubator/privatebin/values.yaml @@ -50,9 +50,9 @@ env: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 8080 port: 10248 diff --git a/charts/incubator/radicale/Chart.yaml b/charts/incubator/radicale/Chart.yaml index d3ba6044621..31157078b14 100644 --- a/charts/incubator/radicale/Chart.yaml +++ b/charts/incubator/radicale/Chart.yaml @@ -28,7 +28,7 @@ sources: - https://github.com/tomsquest/docker-radicale - https://hub.docker.com/r/tomsquest/docker-radicale type: application -version: 0.0.4 +version: 0.0.5 annotations: truecharts.org/catagories: | - radicale diff --git a/charts/incubator/radicale/values.yaml b/charts/incubator/radicale/values.yaml index 0c0f3db3d68..40d57d26fe2 100644 --- a/charts/incubator/radicale/values.yaml +++ b/charts/incubator/radicale/values.yaml @@ -56,9 +56,9 @@ env: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 5232 port: 10255 diff --git a/charts/incubator/technitium/Chart.yaml b/charts/incubator/technitium/Chart.yaml index 6fd51cd0f28..5c04aa593be 100644 --- a/charts/incubator/technitium/Chart.yaml +++ b/charts/incubator/technitium/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://technitium.com/ - https://hub.docker.com/r/technitium/dns-server type: application -version: 1.0.8 +version: 1.0.9 annotations: truecharts.org/catagories: | - networking diff --git a/charts/incubator/technitium/questions.yaml b/charts/incubator/technitium/questions.yaml index 2861105cb58..9e25e8c01af 100644 --- a/charts/incubator/technitium/questions.yaml +++ b/charts/incubator/technitium/questions.yaml @@ -254,9 +254,9 @@ questions: type: int default: 5380 - - variable: dns-udp - label: "DNS-UDP Service" - description: "DNS-UDP Service" + - variable: dns + label: "DNS Service" + description: "DNS Service" schema: additional_attrs: true type: dict @@ -309,15 +309,6 @@ questions: schema: type: int default: 53 - - - variable: dns-tcp - label: "DNS-TCP Service" - description: "DNS-TCP Service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: dns-tcp label: "DNS-TCP Service Port Configuration" schema: diff --git a/charts/incubator/technitium/values.yaml b/charts/incubator/technitium/values.yaml index 20b7da54fb2..3f07f86921e 100644 --- a/charts/incubator/technitium/values.yaml +++ b/charts/incubator/technitium/values.yaml @@ -33,16 +33,13 @@ service: main: port: 5380 targetPort: 5380 - dns-tcp: + dns: enabled: true ports: dns-tcp: enabled: true port: 53 targetPort: 53 - dns-udp: - enabled: true - ports: dns-udp: enabled: true protocol: UDP diff --git a/charts/stable/deluge/Chart.yaml b/charts/stable/deluge/Chart.yaml index 21e0583abba..1530df55114 100644 --- a/charts/stable/deluge/Chart.yaml +++ b/charts/stable/deluge/Chart.yaml @@ -21,7 +21,7 @@ name: deluge sources: - https://github.com/deluge-torrent/deluge type: application -version: 11.0.8 +version: 11.0.9 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/deluge/questions.yaml b/charts/stable/deluge/questions.yaml index 150751fcca7..cf8896480ad 100644 --- a/charts/stable/deluge/questions.yaml +++ b/charts/stable/deluge/questions.yaml @@ -197,14 +197,6 @@ questions: schema: type: int default: 51413 - - variable: torrent-udp - label: "UDP Torrent Service" - description: "UDP Torrent Service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: udp label: "UDP Service Port Configuration" schema: diff --git a/charts/stable/deluge/values.yaml b/charts/stable/deluge/values.yaml index 9168b444f04..da7a5313613 100644 --- a/charts/stable/deluge/values.yaml +++ b/charts/stable/deluge/values.yaml @@ -24,9 +24,6 @@ service: enabled: true port: 51413 targetPort: 51413 - torrent-udp: - enabled: true - ports: udp: enabled: true port: 51413 diff --git a/charts/stable/grafana/values.yaml b/charts/stable/grafana/values.yaml index 7c0dee67c8e..a35e5db5ed4 100644 --- a/charts/stable/grafana/values.yaml +++ b/charts/stable/grafana/values.yaml @@ -8,9 +8,9 @@ securityContext: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 3000 port: 10038 diff --git a/charts/stable/ipfs/Chart.yaml b/charts/stable/ipfs/Chart.yaml index 03dc6b95a7e..bbf42d76d8d 100644 --- a/charts/stable/ipfs/Chart.yaml +++ b/charts/stable/ipfs/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 kubeVersion: ">=1.16.0-0" name: ipfs -version: 3.0.10 +version: 3.0.11 appVersion: "0.13.1" description: IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas from previous systems such Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single bittorrent swarm, exchanging git objects. type: application diff --git a/charts/stable/ipfs/questions.yaml b/charts/stable/ipfs/questions.yaml index 79925cc147c..01e6a6b3537 100644 --- a/charts/stable/ipfs/questions.yaml +++ b/charts/stable/ipfs/questions.yaml @@ -171,8 +171,8 @@ questions: schema: type: int default: 5001 - - variable: peer-tcp - label: "Peer-TCP Service" + - variable: peer + label: "Peer Service" description: "The Peer-TCP service." schema: additional_attrs: true @@ -231,14 +231,6 @@ questions: schema: type: int default: 4001 - - variable: peer-udp - label: "Peer-UDP Service" - description: "The Peer-udp service." - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: peer-udp label: "Peer-UDP Service Port Configuration" schema: diff --git a/charts/stable/ipfs/values.yaml b/charts/stable/ipfs/values.yaml index 748ddc90cd3..8b1fb30dd0f 100644 --- a/charts/stable/ipfs/values.yaml +++ b/charts/stable/ipfs/values.yaml @@ -22,16 +22,13 @@ service: main: port: 10125 targetPort: 5001 - peer-tcp: + peer: enabled: true ports: peer-tcp: enabled: true targetPort: 4001 port: 4001 - peer-udp: - enabled: true - ports: peer-udp: protocol: UDP enabled: true diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml index c5daae5a807..5b55b55e84e 100644 --- a/charts/stable/jackett/Chart.yaml +++ b/charts/stable/jackett/Chart.yaml @@ -21,7 +21,7 @@ name: jackett sources: - https://github.com/Jackett/Jackett type: application -version: 11.0.19 +version: 11.0.20 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/jackett/values.yaml b/charts/stable/jackett/values.yaml index 2301fb5cbb6..8b18f1136f7 100644 --- a/charts/stable/jackett/values.yaml +++ b/charts/stable/jackett/values.yaml @@ -8,9 +8,9 @@ securityContext: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 9117 port: 9117 diff --git a/charts/stable/logitech-media-server/Chart.yaml b/charts/stable/logitech-media-server/Chart.yaml index e68e41b0ee1..82bab5ed08e 100644 --- a/charts/stable/logitech-media-server/Chart.yaml +++ b/charts/stable/logitech-media-server/Chart.yaml @@ -23,7 +23,7 @@ sources: - https://github.com/Logitech/slimserver - https://hub.docker.com/r/lmscommunity/logitechmediaserver type: application -version: 4.0.8 +version: 4.0.9 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/logitech-media-server/questions.yaml b/charts/stable/logitech-media-server/questions.yaml index ad4011d249f..a7fd087585e 100644 --- a/charts/stable/logitech-media-server/questions.yaml +++ b/charts/stable/logitech-media-server/questions.yaml @@ -176,7 +176,7 @@ questions: default: 10059 required: true - - variable: playertcp + - variable: player label: "Logitech Media Server Player TCP Communcation" description: "Logitech Media Server Player Service for TCP communication" schema: @@ -211,15 +211,6 @@ questions: type: int default: 3483 required: true - - - variable: playerudp - label: "Logitech Media Server Player Communcation" - description: "Logitech Media Server Player Service for UDP communication" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: slimprotoudp label: "Player to server UDP communication" schema: diff --git a/charts/stable/logitech-media-server/values.yaml b/charts/stable/logitech-media-server/values.yaml index 5a411c89aa6..c7be2211178 100644 --- a/charts/stable/logitech-media-server/values.yaml +++ b/charts/stable/logitech-media-server/values.yaml @@ -34,16 +34,13 @@ service: enabled: true targetPort: 9090 port: 10059 - playertcp: + player: enabled: true ports: slimprototcp: enabled: true targetPort: 3483 port: 3483 - playerudp: - enabled: true - ports: slimprotoudp: enabled: true targetPort: 3483 diff --git a/charts/stable/openhab/Chart.yaml b/charts/stable/openhab/Chart.yaml index d3255b76c2c..f722e2fda24 100644 --- a/charts/stable/openhab/Chart.yaml +++ b/charts/stable/openhab/Chart.yaml @@ -19,7 +19,7 @@ name: openhab sources: - https://hub.docker.com/r/openhab/openhab type: application -version: 2.0.9 +version: 2.0.10 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/openhab/values.yaml b/charts/stable/openhab/values.yaml index b05464aeb56..d65ab3c4c24 100644 --- a/charts/stable/openhab/values.yaml +++ b/charts/stable/openhab/values.yaml @@ -5,15 +5,15 @@ image: service: main: - protocol: HTTP ports: main: + protocol: HTTP port: 10169 https: - protocol: HTTPS enabled: true ports: https: + protocol: HTTPS enabled: true port: 10170 diff --git a/charts/stable/openspeedtest/Chart.yaml b/charts/stable/openspeedtest/Chart.yaml index 8881a7d6864..1da5844ca38 100644 --- a/charts/stable/openspeedtest/Chart.yaml +++ b/charts/stable/openspeedtest/Chart.yaml @@ -21,7 +21,7 @@ name: openspeedtest sources: - https://github.com/openspeedtest/Speed-Test type: application -version: 1.0.6 +version: 1.0.7 annotations: truecharts.org/catagories: | - utilities diff --git a/charts/stable/openspeedtest/values.yaml b/charts/stable/openspeedtest/values.yaml index 9a4e1e207ec..47cc4bf5628 100644 --- a/charts/stable/openspeedtest/values.yaml +++ b/charts/stable/openspeedtest/values.yaml @@ -13,8 +13,8 @@ podSecurityContext: service: main: - protocol: HTTP ports: main: + protocol: HTTP targetPort: 3000 port: 10256 diff --git a/charts/stable/pihole/Chart.yaml b/charts/stable/pihole/Chart.yaml index e55573a031b..85ce3c1387a 100644 --- a/charts/stable/pihole/Chart.yaml +++ b/charts/stable/pihole/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/pi-hole - https://github.com/pi-hole/docker-pi-hole type: application -version: 6.0.8 +version: 6.0.9 annotations: truecharts.org/catagories: | - networking diff --git a/charts/stable/pihole/questions.yaml b/charts/stable/pihole/questions.yaml index a1c0188be67..71c1be632eb 100644 --- a/charts/stable/pihole/questions.yaml +++ b/charts/stable/pihole/questions.yaml @@ -184,62 +184,6 @@ questions: additional_attrs: true type: dict attrs: -# Include{serviceSelector} - - variable: dns - label: "DNS Service Port Configuration" - 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: 53 - 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: 53 - - - variable: dns-tcp - label: "DNS-TCP Service" - description: "The Primary service on which the healthcheck runs, often the webUI" - schema: - additional_attrs: true - type: dict - attrs: # Include{serviceSelector} - variable: dns-tcp label: "DNS-TCP Service Port Configuration" @@ -288,6 +232,53 @@ questions: schema: type: int default: 53 + - variable: dns-udp + label: "DNS Service Port Configuration" + 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: 53 + 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: 53 - variable: serviceexpert group: "Networking and Services" diff --git a/charts/stable/pihole/values.yaml b/charts/stable/pihole/values.yaml index 771fe5d1387..032e2c0cfe9 100644 --- a/charts/stable/pihole/values.yaml +++ b/charts/stable/pihole/values.yaml @@ -22,17 +22,14 @@ service: main: port: 9089 targetPort: 80 - dns-tcp: + dns: enabled: true ports: dns-tcp: enabled: true port: 53 targetPort: 53 - dns: - enabled: true - ports: - dns: + dns-udp: enabled: true protocol: UDP port: 53 diff --git a/charts/stable/qbittorrent/Chart.yaml b/charts/stable/qbittorrent/Chart.yaml index 7c620d70842..b3280024bfd 100644 --- a/charts/stable/qbittorrent/Chart.yaml +++ b/charts/stable/qbittorrent/Chart.yaml @@ -20,7 +20,7 @@ name: qbittorrent sources: - https://github.com/qbittorrent/qBittorrent type: application -version: 11.0.9 +version: 11.0.10 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/qbittorrent/questions.yaml b/charts/stable/qbittorrent/questions.yaml index 3a95bf367da..cde25d60df6 100644 --- a/charts/stable/qbittorrent/questions.yaml +++ b/charts/stable/qbittorrent/questions.yaml @@ -138,8 +138,6 @@ questions: schema: type: int default: 8080 - - - variable: torrent label: "TCP Torrent Service" description: "Torrent service" @@ -148,7 +146,7 @@ questions: type: dict attrs: # Include{serviceSelector} - - variable: torrent + - variable: torrenttcp label: "TCP Service Port Configuration" schema: additional_attrs: true @@ -195,15 +193,6 @@ questions: schema: type: int default: 6881 - - - variable: torrentudp - label: "UDP Torrent Service" - description: "Torrent service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: torrentudp label: "UDP Service Port Configuration" schema: diff --git a/charts/stable/qbittorrent/templates/_configmap.tpl b/charts/stable/qbittorrent/templates/_configmap.tpl index b5d6f3cfd15..677b395f6f1 100644 --- a/charts/stable/qbittorrent/templates/_configmap.tpl +++ b/charts/stable/qbittorrent/templates/_configmap.tpl @@ -10,7 +10,7 @@ metadata: {{- include "tc.common.labels" . | nindent 4 }} data: {{- $bittorrentPort := "" -}} - {{- $bittorrentPort = .Values.service.torrent.ports.torrent.port -}} + {{- $bittorrentPort = .Values.service.torrent.ports.torrenttcp.port -}} {{- if $bittorrentPort }} 31-update-port: |- #!/bin/bash diff --git a/charts/stable/qbittorrent/values.yaml b/charts/stable/qbittorrent/values.yaml index 9e97e3b7b7f..f5277168f82 100644 --- a/charts/stable/qbittorrent/values.yaml +++ b/charts/stable/qbittorrent/values.yaml @@ -15,13 +15,10 @@ service: torrent: enabled: true ports: - torrent: + torrenttcp: enabled: true port: 6881 targetPort: 6881 - torrentudp: - enabled: true - ports: torrentudp: enabled: true port: 6881 diff --git a/charts/stable/resilio-sync/Chart.yaml b/charts/stable/resilio-sync/Chart.yaml index fd029cc5915..01575113015 100644 --- a/charts/stable/resilio-sync/Chart.yaml +++ b/charts/stable/resilio-sync/Chart.yaml @@ -21,7 +21,7 @@ maintainers: name: resilio-sync sources: - https://github.com/orgs/linuxserver/packages/container/package/resilio-sync -version: 6.0.8 +version: 6.0.9 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/resilio-sync/questions.yaml b/charts/stable/resilio-sync/questions.yaml index 062a6840e44..ba583bce140 100644 --- a/charts/stable/resilio-sync/questions.yaml +++ b/charts/stable/resilio-sync/questions.yaml @@ -140,66 +140,9 @@ questions: default: 8888 - - variable: bt-udp - label: "bt-udp Service" - description: "The bt-udp service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - - variable: bt-udp - label: "bt-udp Service Port Configuration" - 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: 55555 - 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: 55555 - - - - variable: bt-tcp - label: "bt-tcp Service" - description: "The bt-tcp service" + - variable: bt + label: "bt Service" + description: "The bt service" schema: additional_attrs: true type: dict @@ -252,6 +195,53 @@ questions: schema: type: int default: 55555 + - variable: bt-udp + label: "bt-udp Service Port Configuration" + 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: 55555 + 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: 55555 - variable: serviceexpert group: "Networking and Services" diff --git a/charts/stable/resilio-sync/values.yaml b/charts/stable/resilio-sync/values.yaml index 794a22d202f..e04259b7203 100644 --- a/charts/stable/resilio-sync/values.yaml +++ b/charts/stable/resilio-sync/values.yaml @@ -17,16 +17,13 @@ service: main: port: 8888 targetPort: 8888 - bt-tcp: + bt: enabled: true ports: bt-tcp: enabled: true port: 55555 targetPort: 55555 - bt-udp: - enabled: true - ports: bt-udp: enabled: true port: 55555 diff --git a/charts/stable/storj-node/Chart.yaml b/charts/stable/storj-node/Chart.yaml index 21c0429d393..a3fa50b80b4 100644 --- a/charts/stable/storj-node/Chart.yaml +++ b/charts/stable/storj-node/Chart.yaml @@ -20,7 +20,7 @@ sources: - https://github.com/storj/storj - https://docs.storj.io/node/ - https://hub.docker.com/r/storjlabs/storagenode -version: 2.0.16 +version: 2.0.17 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/storj-node/questions.yaml b/charts/stable/storj-node/questions.yaml index d375babb4d1..cb0890f7adb 100644 --- a/charts/stable/storj-node/questions.yaml +++ b/charts/stable/storj-node/questions.yaml @@ -187,9 +187,9 @@ questions: schema: type: int default: 14002 - - variable: coretcp - label: "Core TCP Service" - description: "Core TCP Service" + - variable: core + label: "Core Service" + description: "Core Service" schema: additional_attrs: true type: dict @@ -242,14 +242,6 @@ questions: schema: type: int default: 28967 - - variable: coreudp - label: "Core UDP Service" - description: "Core UDP Service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: coreudp label: "Core UDP Service Port Configuration" schema: diff --git a/charts/stable/storj-node/values.yaml b/charts/stable/storj-node/values.yaml index fff84848dad..2f9886215f5 100644 --- a/charts/stable/storj-node/values.yaml +++ b/charts/stable/storj-node/values.yaml @@ -26,7 +26,7 @@ service: main: port: 14002 targetPort: 14002 - coretcp: + core: enabled: true ports: coretcp: @@ -34,9 +34,6 @@ service: protocol: TCP port: 28967 targetPort: 28967 - coreudp: - enabled: true - ports: coreudp: enabled: true protocol: UDP diff --git a/charts/stable/syncthing/Chart.yaml b/charts/stable/syncthing/Chart.yaml index a58c1dcd6c5..54d410fbe5a 100644 --- a/charts/stable/syncthing/Chart.yaml +++ b/charts/stable/syncthing/Chart.yaml @@ -21,7 +21,7 @@ sources: - https://github.com/syncthing/syncthing - https://hub.docker.com/r/syncthing/syncthing type: application -version: 11.0.9 +version: 11.0.10 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/syncthing/questions.yaml b/charts/stable/syncthing/questions.yaml index 614a0262b75..43767c26474 100644 --- a/charts/stable/syncthing/questions.yaml +++ b/charts/stable/syncthing/questions.yaml @@ -196,14 +196,6 @@ questions: schema: type: int default: 22000 - - variable: listeners-udp - label: "Syncthing Listening Service" - description: "This service is used to process incoming connections directly to this Syncthing instance" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: udp label: "UDP Service Port Configuration" schema: diff --git a/charts/stable/syncthing/values.yaml b/charts/stable/syncthing/values.yaml index 2b022ef3ba2..83997a9fe90 100644 --- a/charts/stable/syncthing/values.yaml +++ b/charts/stable/syncthing/values.yaml @@ -16,9 +16,6 @@ service: enabled: true port: 22000 targetPort: 22000 - listeners-udp: - enabled: true - ports: udp: enabled: true port: 22000 diff --git a/charts/stable/transmission/Chart.yaml b/charts/stable/transmission/Chart.yaml index dd37c7b78a2..faface961ff 100644 --- a/charts/stable/transmission/Chart.yaml +++ b/charts/stable/transmission/Chart.yaml @@ -22,7 +22,7 @@ sources: - https://github.com/transmission/transmission - https://hub.docker.com/r/linuxserver/transmission type: application -version: 12.0.8 +version: 12.0.9 annotations: truecharts.org/catagories: | - download-tools diff --git a/charts/stable/transmission/questions.yaml b/charts/stable/transmission/questions.yaml index 5d78742a975..d3d84aefbbd 100644 --- a/charts/stable/transmission/questions.yaml +++ b/charts/stable/transmission/questions.yaml @@ -464,8 +464,6 @@ questions: schema: type: int default: 10109 - - - variable: torrent label: "TCP Torrent Service" description: "Torrent service" @@ -474,7 +472,7 @@ questions: type: dict attrs: # Include{serviceSelector} - - variable: torrent + - variable: torrenttcp label: "TCP Service Port Configuration" schema: additional_attrs: true @@ -521,15 +519,6 @@ questions: schema: type: int default: 51414 - - - variable: torrentudp - label: "UDP Torrent Service" - description: "Torrent service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: torrentudp label: "UDP Service Port Configuration" schema: diff --git a/charts/stable/transmission/values.yaml b/charts/stable/transmission/values.yaml index 0f3e9b55869..135b0185bdd 100644 --- a/charts/stable/transmission/values.yaml +++ b/charts/stable/transmission/values.yaml @@ -12,13 +12,10 @@ service: torrent: enabled: true ports: - torrent: + torrenttcp: enabled: true port: 51414 targetPort: 51414 - torrentudp: - enabled: true - ports: torrentudp: enabled: true port: 51414 @@ -56,7 +53,7 @@ env: # TRANSMISSION_PEER_ID_TTL_HOURS: 6 # TRANSMISSION_PEER_LIMIT_GLOBAL: 200 # TRANSMISSION_PEER_LIMIT_PER_TORRENT: 50 - TRANSMISSION_PEER_PORT: "{{ .Values.service.torrent.ports.torrent.targetPort }}" + TRANSMISSION_PEER_PORT: "{{ .Values.service.torrent.ports.torrenttcp.targetPort }}" # TRANSMISSION_PEER_PORT_RANDOM_HIGH: 65535 # TRANSMISSION_PEER_PORT_RANDOM_LOW: 49152 # TRANSMISSION_PEER_PORT_RANDOM_ON_START: false diff --git a/charts/stable/verysync/Chart.yaml b/charts/stable/verysync/Chart.yaml index 261407bd41f..7e74904f496 100644 --- a/charts/stable/verysync/Chart.yaml +++ b/charts/stable/verysync/Chart.yaml @@ -20,7 +20,7 @@ maintainers: name: verysync sources: - https://hub.docker.com/r/jonnyan404/verysync -version: 2.0.8 +version: 2.0.9 annotations: truecharts.org/catagories: | - media diff --git a/charts/stable/verysync/questions.yaml b/charts/stable/verysync/questions.yaml index ad30a2c73cf..611367c7c5a 100644 --- a/charts/stable/verysync/questions.yaml +++ b/charts/stable/verysync/questions.yaml @@ -138,11 +138,9 @@ questions: schema: type: int default: 10193 - - - - variable: bt-udp1 - label: "bt-udp1 Service" - description: "The bt-udp service" + - variable: bt + label: "bt Service" + description: "The bt service" schema: additional_attrs: true type: dict @@ -195,16 +193,6 @@ questions: schema: type: int default: 22037 - - - - variable: bt-udp2 - label: "bt-udp2 Service" - description: "The bt-udp service" - schema: - additional_attrs: true - type: dict - attrs: -# Include{serviceSelector} - variable: bt-udp2 label: "bt-udp2 Service Port Configuration" schema: @@ -253,7 +241,6 @@ questions: type: int default: 22027 - - variable: data label: "data Service" description: "The data service" diff --git a/charts/stable/verysync/values.yaml b/charts/stable/verysync/values.yaml index 3bd04489465..aa7cb6f4ab0 100644 --- a/charts/stable/verysync/values.yaml +++ b/charts/stable/verysync/values.yaml @@ -8,7 +8,7 @@ service: ports: main: port: 10193 - bt-udp1: + bt: enabled: true ports: bt-udp1: @@ -16,9 +16,6 @@ service: port: 22037 targetPort: 22037 protocol: UDP - bt-udp2: - enabled: true - ports: bt-udp2: enabled: true port: 22027