chore(apps): combine some ports

stavros-k · Jul 8, 2022 · 6c3a74a · 6c3a74a
1 parent 3411cea
commit 6c3a74a
Show file tree

Hide file tree

Showing 36 changed files with 68 additions and 271 deletions.
diff --git 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
@@ -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
@@ -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,37 +49,28 @@ 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:
         enabled: true
         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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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/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