From 378ae2693efb7234fa1995c690f046282a3a49a0 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 13 Dec 2021 20:32:46 +0200
Subject: [PATCH] fix(apps): remove `portals` and `ingress` when `main` service
 is disabled (#1529)

---
 charts/stable/amcrest2mqtt/questions.yaml     | 24 +----------
 charts/stable/amcrest2mqtt/values.yaml        |  3 ++
 charts/stable/ddclient/questions.yaml         | 43 +------------------
 charts/stable/duckdns/questions.yaml          | 43 +------------------
 charts/stable/leaf2mqtt/questions.yaml        | 25 +----------
 charts/stable/leaf2mqtt/values.yaml           |  3 ++
 .../stable/protonmail-bridge/questions.yaml   | 43 +------------------
 charts/stable/rsnapshot/questions.yaml        | 43 +------------------
 charts/stable/unpackerr/questions.yaml        | 21 +--------
 charts/stable/webgrabplus/questions.yaml      | 43 +------------------
 10 files changed, 14 insertions(+), 277 deletions(-)

diff --git a/charts/stable/amcrest2mqtt/questions.yaml b/charts/stable/amcrest2mqtt/questions.yaml
index 27f296af2fe..d4b4a2f7e91 100644
--- a/charts/stable/amcrest2mqtt/questions.yaml
+++ b/charts/stable/amcrest2mqtt/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
   - variable: controller
     group: "Controller"
diff --git a/charts/stable/amcrest2mqtt/values.yaml b/charts/stable/amcrest2mqtt/values.yaml
index f45a4a6f3b0..a9bbcc37de1 100644
--- a/charts/stable/amcrest2mqtt/values.yaml
+++ b/charts/stable/amcrest2mqtt/values.yaml
@@ -9,6 +9,9 @@ image:
 service:
   main:
     enabled: false
+    ports:
+      main:
+        enabled: false
 
 probes:
   liveness:
diff --git a/charts/stable/ddclient/questions.yaml b/charts/stable/ddclient/questions.yaml
index b96c2214299..90ba807f808 100644
--- a/charts/stable/ddclient/questions.yaml
+++ b/charts/stable/ddclient/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
 
   - variable: controller
@@ -169,25 +147,6 @@ questions:
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
-  - variable: ingress
-    label: ""
-    group: "Ingress"
-    schema:
-      type: dict
-      attrs:
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            type: dict
-            attrs:
-# Include{ingressDefault}
-
-# Include{ingressTLS}
-
-# Include{ingressTraefik}
-
-# Include{ingressExpert}
-
 # Include{ingressList}
 
   - variable: advancedSecurity
diff --git a/charts/stable/duckdns/questions.yaml b/charts/stable/duckdns/questions.yaml
index c4dccb1661f..fd482dd3cb3 100644
--- a/charts/stable/duckdns/questions.yaml
+++ b/charts/stable/duckdns/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
 
   - variable: controller
@@ -185,25 +163,6 @@ questions:
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
-  - variable: ingress
-    label: ""
-    group: "Ingress"
-    schema:
-      type: dict
-      attrs:
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            type: dict
-            attrs:
-# Include{ingressDefault}
-
-# Include{ingressTLS}
-
-# Include{ingressTraefik}
-
-# Include{ingressExpert}
-
 # Include{ingressList}
 
   - variable: advancedSecurity
diff --git a/charts/stable/leaf2mqtt/questions.yaml b/charts/stable/leaf2mqtt/questions.yaml
index 4a07703bb95..2b9d05ddc0e 100644
--- a/charts/stable/leaf2mqtt/questions.yaml
+++ b/charts/stable/leaf2mqtt/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
   - variable: controller
     group: "Controller"
@@ -156,7 +134,6 @@ questions:
 
 # Include{containerConfig}
 
-
   - variable: serviceexpert
     group: "Networking and Services"
     label: "Show Expert Config"
diff --git a/charts/stable/leaf2mqtt/values.yaml b/charts/stable/leaf2mqtt/values.yaml
index 1c8e9fb5db3..1b19e12c9ee 100644
--- a/charts/stable/leaf2mqtt/values.yaml
+++ b/charts/stable/leaf2mqtt/values.yaml
@@ -9,6 +9,9 @@ image:
 service:
   main:
     enabled: false
+    ports:
+      main:
+        enabled: false
 
 securityContext:
   readOnlyRootFilesystem: false
diff --git a/charts/stable/protonmail-bridge/questions.yaml b/charts/stable/protonmail-bridge/questions.yaml
index 41d33a28c9e..b2f90c2c5b7 100644
--- a/charts/stable/protonmail-bridge/questions.yaml
+++ b/charts/stable/protonmail-bridge/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
   - variable: controller
     group: "Controller"
@@ -242,25 +220,6 @@ questions:
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
-  - variable: ingress
-    label: ""
-    group: "Ingress"
-    schema:
-      type: dict
-      attrs:
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            type: dict
-            attrs:
-# Include{ingressDefault}
-
-# Include{ingressTLS}
-
-# Include{ingressTraefik}
-
-# Include{ingressExpert}
-
 # Include{ingressList}
 
   - variable: advancedSecurity
diff --git a/charts/stable/rsnapshot/questions.yaml b/charts/stable/rsnapshot/questions.yaml
index b96c2214299..90ba807f808 100644
--- a/charts/stable/rsnapshot/questions.yaml
+++ b/charts/stable/rsnapshot/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
 
   - variable: controller
@@ -169,25 +147,6 @@ questions:
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
-  - variable: ingress
-    label: ""
-    group: "Ingress"
-    schema:
-      type: dict
-      attrs:
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            type: dict
-            attrs:
-# Include{ingressDefault}
-
-# Include{ingressTLS}
-
-# Include{ingressTraefik}
-
-# Include{ingressExpert}
-
 # Include{ingressList}
 
   - variable: advancedSecurity
diff --git a/charts/stable/unpackerr/questions.yaml b/charts/stable/unpackerr/questions.yaml
index 29322b5c057..133e0fee079 100644
--- a/charts/stable/unpackerr/questions.yaml
+++ b/charts/stable/unpackerr/questions.yaml
@@ -1,5 +1,5 @@
 # Include{groups}
-
+portals: {}
 questions:
 # Include{global}
   - variable: controller
@@ -145,25 +145,6 @@ questions:
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
-  - variable: ingress
-    label: ""
-    group: "Ingress"
-    schema:
-      type: dict
-      attrs:
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            type: dict
-            attrs:
-# Include{ingressDefault}
-
-# Include{ingressTLS}
-
-# Include{ingressTraefik}
-
-# Include{ingressExpert}
-
 # Include{ingressList}
 
   - variable: advancedSecurity
diff --git a/charts/stable/webgrabplus/questions.yaml b/charts/stable/webgrabplus/questions.yaml
index 6c5c50d93fc..582723865f4 100644
--- a/charts/stable/webgrabplus/questions.yaml
+++ b/charts/stable/webgrabplus/questions.yaml
@@ -1,28 +1,6 @@
 # Include{groups}
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
+portals: {}
 questions:
-  - variable: portal
-    group: "Container Image"
-    label: "Configure Portal Button"
-    schema:
-      type: dict
-      hidden: true
-      attrs:
-        - variable: enabled
-          label: "Enable"
-          description: "enable the portal button"
-          schema:
-            hidden: true
-            editable: false
-            type: boolean
-            default: true
 # Include{global}
 
   - variable: controller
@@ -225,25 +203,6 @@ questions:
 # Include{persistenceAdvanced}
 # Include{persistenceList}
 
-  - variable: ingress
-    label: ""
-    group: "Ingress"
-    schema:
-      type: dict
-      attrs:
-        - variable: main
-          label: "Main Ingress"
-          schema:
-            type: dict
-            attrs:
-# Include{ingressDefault}
-
-# Include{ingressTLS}
-
-# Include{ingressTraefik}
-
-# Include{ingressExpert}
-
 # Include{ingressList}
 
   - variable: advancedSecurity