diff --git a/.tools/tests/charts/common-test_spec.rb b/.tools/tests/charts/common-test_spec.rb index e6ed81f8658..aa65c7d338e 100644 --- a/.tools/tests/charts/common-test_spec.rb +++ b/.tools/tests/charts/common-test_spec.rb @@ -303,6 +303,235 @@ class Test < ChartTest end end + describe 'Dynamic Portal creation' do + defaultProtocol = "https" + defaultHost = "$node_ip" + defaultPort = "443" + testNodePort = "666" + testIngressPort = "888" + it 'No portal (=configmap) is created by default' do + assert_nil(resource('ConfigMap')) + end + + it 'portal is created when added' do + values = { + portal: { + enabled: true + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal defaultProtocol + jq('.data.host', resource('ConfigMap')).must_equal defaultHost + jq('.data.port', resource('ConfigMap')).must_equal defaultPort + end + + it 'portal port can be based on NodePort' do + values = { + portal: { + enabled: true + }, + services: { + main: { + type: "NodePort", + port: { + port: 8080, + nodePort: 666 + } + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal defaultProtocol + jq('.data.host', resource('ConfigMap')).must_equal defaultHost + jq('.data.port', resource('ConfigMap')).must_equal testNodePort + end + + it 'NodePort portal port can not be overrulled' do + values = { + portal: { + enabled: true, + ingressPort: 888 + }, + services: { + main: { + type: "NodePort", + port: { + port: 8080, + nodePort: 666 + } + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal defaultProtocol + jq('.data.host', resource('ConfigMap')).must_equal defaultHost + jq('.data.port', resource('ConfigMap')).must_equal testNodePort + end + + it 'portal protocol can be overrulled' do + values = { + portal: { + enabled: true, + ingressPort: 888, + nodePortProtocol: "http" + }, + services: { + main: { + type: "NodePort", + port: { + port: 8080, + nodePort: 666 + } + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal values[:portal][:nodePortProtocol] + jq('.data.host', resource('ConfigMap')).must_equal defaultHost + jq('.data.port', resource('ConfigMap')).must_equal testNodePort + end + + it 'portal NodePort host can be overrulled' do + values = { + portal: { + enabled: true, + ingressPort: 888, + nodePortProtocol: "http", + host: "test.com" + }, + services: { + main: { + type: "NodePort", + port: { + port: 8080, + nodePort: 666 + } + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal values[:portal][:nodePortProtocol] + jq('.data.host', resource('ConfigMap')).must_equal values[:portal][:host] + jq('.data.port', resource('ConfigMap')).must_equal testNodePort + end + + it 'portal can be based on Ingress' do + values = { + portal: { + enabled: true + }, + services: { + main: { + port: { + port: 8080 + } + } + }, + ingress: { + main: { + enabled: true, + hosts: [ + { + host: 'test.com', + paths: [ + { + path: '/' + } + ] + } + ] + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal defaultProtocol + jq('.data.host', resource('ConfigMap')).must_equal values[:ingress][:main][:hosts][0][:host] + jq('.data.port', resource('ConfigMap')).must_equal defaultPort + end + + it 'Ingress portal overrules NodePort portal' do + values = { + portal: { + enabled: true + }, + services: { + main: { + type: "NodePort", + port: { + port: 8080, + nodePort: 666 + } + } + }, + ingress: { + main: { + enabled: true, + hosts: [ + { + host: 'test.com', + paths: [ + { + path: '/' + } + ] + } + ] + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal defaultProtocol + jq('.data.host', resource('ConfigMap')).must_equal values[:ingress][:main][:hosts][0][:host] + jq('.data.port', resource('ConfigMap')).must_equal defaultPort + end + + it 'portal ingress, only port can be overrrulled' do + values = { + portal: { + enabled: true, + ingressPort: 888, + nodePortProtocol: "http", + host: "test1.com" + }, + services: { + main: { + port: { + port: 8080 + } + } + }, + ingress: { + main: { + enabled: true, + hosts: [ + { + host: 'test2.com', + paths: [ + { + path: '/' + } + ] + } + ] + } + } + } + chart.value values + refute_nil(resource('ConfigMap')) + jq('.data.protocol', resource('ConfigMap')).must_equal defaultProtocol + jq('.data.host', resource('ConfigMap')).must_equal values[:ingress][:main][:hosts][0][:host] + jq('.data.port', resource('ConfigMap')).must_equal testIngressPort + end + + end + describe 'ingress' do it 'should be disabled when (additional)ingress enabled = false' do values = { diff --git a/charts/bazarr/2.0.0/charts/common-2.0.0.tgz b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/bazarr/2.0.0/charts/common-2.0.0.tgz and b/charts/bazarr/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/bazarr/2.0.0/questions.yaml b/charts/bazarr/2.0.0/questions.yaml index ecadd318484..ab2a639f4b0 100644 --- a/charts/bazarr/2.0.0/questions.yaml +++ b/charts/bazarr/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-bazarrService.port" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz and b/charts/calibre-web/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/calibre-web/2.0.0/questions.yaml b/charts/calibre-web/2.0.0/questions.yaml index 26cf4248ea0..a357c5312ce 100644 --- a/charts/calibre-web/2.0.0/questions.yaml +++ b/charts/calibre-web/2.0.0/questions.yaml @@ -19,15 +19,38 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +153,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz and b/charts/collabora-online/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/collabora-online/2.0.0/questions.yaml b/charts/collabora-online/2.0.0/questions.yaml index 6c3fd22c09a..80b341eec06 100644 --- a/charts/collabora-online/2.0.0/questions.yaml +++ b/charts/collabora-online/2.0.0/questions.yaml @@ -19,15 +19,40 @@ groups: portals: web_portal: protocols: - - "https" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" path: "/loleaflet/dist/admin/admin.html" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -156,7 +181,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/deluge/2.0.0/charts/common-2.0.0.tgz b/charts/deluge/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/deluge/2.0.0/charts/common-2.0.0.tgz and b/charts/deluge/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/deluge/2.0.0/questions.yaml b/charts/deluge/2.0.0/questions.yaml index fa94d1d87ab..88c89949a86 100644 --- a/charts/deluge/2.0.0/questions.yaml +++ b/charts/deluge/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -192,7 +217,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -255,7 +280,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/emby/2.0.0/charts/common-2.0.0.tgz b/charts/emby/2.0.0/charts/common-2.0.0.tgz index 380564a1c52..182dc71e1d1 100644 Binary files a/charts/emby/2.0.0/charts/common-2.0.0.tgz and b/charts/emby/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/emby/2.0.0/questions.yaml b/charts/emby/2.0.0/questions.yaml index c7e9cf6d270..628989e86c2 100644 --- a/charts/emby/2.0.0/questions.yaml +++ b/charts/emby/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/esphome/2.0.0/charts/common-2.0.0.tgz b/charts/esphome/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/esphome/2.0.0/charts/common-2.0.0.tgz and b/charts/esphome/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/esphome/2.0.0/questions.yaml b/charts/esphome/2.0.0/questions.yaml index 27a43eba7d3..bfacf8efed3 100644 --- a/charts/esphome/2.0.0/questions.yaml +++ b/charts/esphome/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "http" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/freshrss/2.0.0/charts/common-2.0.0.tgz b/charts/freshrss/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/freshrss/2.0.0/charts/common-2.0.0.tgz and b/charts/freshrss/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/freshrss/2.0.0/questions.yaml b/charts/freshrss/2.0.0/questions.yaml index b093d748178..6d66d823aa7 100644 --- a/charts/freshrss/2.0.0/questions.yaml +++ b/charts/freshrss/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/gaps/2.0.0/charts/common-2.0.0.tgz b/charts/gaps/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/gaps/2.0.0/charts/common-2.0.0.tgz and b/charts/gaps/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/gaps/2.0.0/questions.yaml b/charts/gaps/2.0.0/questions.yaml index 93981e8aca2..a8fc8221be2 100644 --- a/charts/gaps/2.0.0/questions.yaml +++ b/charts/gaps/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/grocy/2.0.0/charts/common-2.0.0.tgz b/charts/grocy/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/grocy/2.0.0/charts/common-2.0.0.tgz and b/charts/grocy/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/grocy/2.0.0/questions.yaml b/charts/grocy/2.0.0/questions.yaml index c35dc185247..ad5ddcd2d92 100644 --- a/charts/grocy/2.0.0/questions.yaml +++ b/charts/grocy/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/handbrake/2.0.0/charts/common-2.0.0.tgz b/charts/handbrake/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/handbrake/2.0.0/charts/common-2.0.0.tgz and b/charts/handbrake/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/handbrake/2.0.0/questions.yaml b/charts/handbrake/2.0.0/questions.yaml index e80633ec7dc..9a4c4c79714 100644 --- a/charts/handbrake/2.0.0/questions.yaml +++ b/charts/handbrake/2.0.0/questions.yaml @@ -20,15 +20,37 @@ groups: portals: web_portal: protocols: - - "http" # if SECURE_CONNECTION is set, this should be https, or not.. container will redirect all http to https anyway + - "$kubernetes-resource_configmap_main-portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_main-portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_main-portal_port" # UI questions: - # Update Policy + - 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "http" - variable: strategyType group: "Container Image" label: "Update Strategy" @@ -212,7 +234,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -275,7 +297,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/heimdall/2.0.0/charts/common-2.0.0.tgz b/charts/heimdall/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/heimdall/2.0.0/charts/common-2.0.0.tgz and b/charts/heimdall/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/heimdall/2.0.0/questions.yaml b/charts/heimdall/2.0.0/questions.yaml index 6f6686e8ad2..3d8c4a7bd52 100644 --- a/charts/heimdall/2.0.0/questions.yaml +++ b/charts/heimdall/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-heimdallService.port" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz b/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz and b/charts/home-assistant/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/home-assistant/2.0.0/questions.yaml b/charts/home-assistant/2.0.0/questions.yaml index fb9d85eea3c..903a328adba 100644 --- a/charts/home-assistant/2.0.0/questions.yaml +++ b/charts/home-assistant/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "http" + + # Update Policy - variable: strategyType group: "Container Image" @@ -282,7 +307,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/jackett/2.0.0/charts/common-2.0.0.tgz b/charts/jackett/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/jackett/2.0.0/charts/common-2.0.0.tgz and b/charts/jackett/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/jackett/2.0.0/questions.yaml b/charts/jackett/2.0.0/questions.yaml index 8b08e1a3e61..69a37c1caa3 100644 --- a/charts/jackett/2.0.0/questions.yaml +++ b/charts/jackett/2.0.0/questions.yaml @@ -19,14 +19,38 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.port" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +153,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/jackett/2.0.0/test_values.yaml b/charts/jackett/2.0.0/test_values.yaml index d84e6eb1819..fbc9b31d7e1 100644 --- a/charts/jackett/2.0.0/test_values.yaml +++ b/charts/jackett/2.0.0/test_values.yaml @@ -8,8 +8,10 @@ image: strategy: type: Recreate + services: main: + enabled: true port: port: 9117 diff --git a/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz b/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz and b/charts/jellyfin/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/jellyfin/2.0.0/questions.yaml b/charts/jellyfin/2.0.0/questions.yaml index d262e3a90b2..1b7d3184396 100644 --- a/charts/jellyfin/2.0.0/questions.yaml +++ b/charts/jellyfin/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/kms/2.0.0/charts/common-2.0.0.tgz b/charts/kms/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/kms/2.0.0/charts/common-2.0.0.tgz and b/charts/kms/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/kms/2.0.0/questions.yaml b/charts/kms/2.0.0/questions.yaml index b1c37a16a93..c39cd45156d 100644 --- a/charts/kms/2.0.0/questions.yaml +++ b/charts/kms/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz b/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz and b/charts/lazylibrarian/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/lazylibrarian/2.0.0/questions.yaml b/charts/lazylibrarian/2.0.0/questions.yaml index 4508285375f..2b1560614cd 100644 --- a/charts/lazylibrarian/2.0.0/questions.yaml +++ b/charts/lazylibrarian/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-lazylibrarianService.port" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/lidarr/2.0.0/charts/common-2.0.0.tgz b/charts/lidarr/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/lidarr/2.0.0/charts/common-2.0.0.tgz and b/charts/lidarr/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/lidarr/2.0.0/questions.yaml b/charts/lidarr/2.0.0/questions.yaml index 8d8a11693b0..8fb1d69e0e9 100644 --- a/charts/lidarr/2.0.0/questions.yaml +++ b/charts/lidarr/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-lidarrService.port" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/lychee/2.0.0/charts/common-2.0.0.tgz b/charts/lychee/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/lychee/2.0.0/charts/common-2.0.0.tgz and b/charts/lychee/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/lychee/2.0.0/questions.yaml b/charts/lychee/2.0.0/questions.yaml index 08044c43820..5d5a6b697fe 100644 --- a/charts/lychee/2.0.0/questions.yaml +++ b/charts/lychee/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/navidrome/2.0.0/charts/common-2.0.0.tgz b/charts/navidrome/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/navidrome/2.0.0/charts/common-2.0.0.tgz and b/charts/navidrome/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/navidrome/2.0.0/questions.yaml b/charts/navidrome/2.0.0/questions.yaml index df0b926f0b4..3fc962fbe60 100644 --- a/charts/navidrome/2.0.0/questions.yaml +++ b/charts/navidrome/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/node-red/2.0.0/charts/common-2.0.0.tgz b/charts/node-red/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/node-red/2.0.0/charts/common-2.0.0.tgz and b/charts/node-red/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/node-red/2.0.0/questions.yaml b/charts/node-red/2.0.0/questions.yaml index 4c0198c5362..6fd826ebf5d 100644 --- a/charts/node-red/2.0.0/questions.yaml +++ b/charts/node-red/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/nzbget/2.0.0/charts/common-2.0.0.tgz b/charts/nzbget/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/nzbget/2.0.0/charts/common-2.0.0.tgz and b/charts/nzbget/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/nzbget/2.0.0/questions.yaml b/charts/nzbget/2.0.0/questions.yaml index ab8a0a24ce0..6e21bee4ee5 100644 --- a/charts/nzbget/2.0.0/questions.yaml +++ b/charts/nzbget/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz b/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz and b/charts/nzbhydra/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/nzbhydra/2.0.0/questions.yaml b/charts/nzbhydra/2.0.0/questions.yaml index f9a8d73a98f..fae5e36eb28 100644 --- a/charts/nzbhydra/2.0.0/questions.yaml +++ b/charts/nzbhydra/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/ombi/2.0.0/charts/common-2.0.0.tgz b/charts/ombi/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/ombi/2.0.0/charts/common-2.0.0.tgz and b/charts/ombi/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/ombi/2.0.0/questions.yaml b/charts/ombi/2.0.0/questions.yaml index 8a5d10af463..fe763bed93a 100644 --- a/charts/ombi/2.0.0/questions.yaml +++ b/charts/ombi/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-ombiService.port" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/organizr/2.0.0/charts/common-2.0.0.tgz b/charts/organizr/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/organizr/2.0.0/charts/common-2.0.0.tgz and b/charts/organizr/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/organizr/2.0.0/questions.yaml b/charts/organizr/2.0.0/questions.yaml index 1f252fe08df..21df001f01d 100644 --- a/charts/organizr/2.0.0/questions.yaml +++ b/charts/organizr/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-organizrService.port" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz b/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz and b/charts/qbittorrent/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/qbittorrent/2.0.0/questions.yaml b/charts/qbittorrent/2.0.0/questions.yaml index 61caa9f36c3..d931c71a559 100644 --- a/charts/qbittorrent/2.0.0/questions.yaml +++ b/charts/qbittorrent/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -192,7 +217,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -255,7 +280,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/radarr/2.0.0/charts/common-2.0.0.tgz b/charts/radarr/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/radarr/2.0.0/charts/common-2.0.0.tgz and b/charts/radarr/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/radarr/2.0.0/questions.yaml b/charts/radarr/2.0.0/questions.yaml index 7fd232f852f..cf3206eefdb 100644 --- a/charts/radarr/2.0.0/questions.yaml +++ b/charts/radarr/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-radarrService.port" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/readarr/2.0.0/charts/common-2.0.0.tgz b/charts/readarr/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/readarr/2.0.0/charts/common-2.0.0.tgz and b/charts/readarr/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/readarr/2.0.0/questions.yaml b/charts/readarr/2.0.0/questions.yaml index c3a1051bb9d..77e363870ef 100644 --- a/charts/readarr/2.0.0/questions.yaml +++ b/charts/readarr/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz b/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz and b/charts/sabnzbd/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/sabnzbd/2.0.0/questions.yaml b/charts/sabnzbd/2.0.0/questions.yaml index 0e5403fc5a6..b273baefeba 100644 --- a/charts/sabnzbd/2.0.0/questions.yaml +++ b/charts/sabnzbd/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -131,7 +155,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/sonarr/2.0.0/charts/common-2.0.0.tgz b/charts/sonarr/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/sonarr/2.0.0/charts/common-2.0.0.tgz and b/charts/sonarr/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/sonarr/2.0.0/questions.yaml b/charts/sonarr/2.0.0/questions.yaml index 2174ef48e80..02af1b4823f 100644 --- a/charts/sonarr/2.0.0/questions.yaml +++ b/charts/sonarr/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-sonarrService.port" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -131,7 +155,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/tautulli/2.0.0/charts/common-2.0.0.tgz b/charts/tautulli/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/tautulli/2.0.0/charts/common-2.0.0.tgz and b/charts/tautulli/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/tautulli/2.0.0/questions.yaml b/charts/tautulli/2.0.0/questions.yaml index 1d4a69b89d6..75383317e40 100644 --- a/charts/tautulli/2.0.0/questions.yaml +++ b/charts/tautulli/2.0.0/questions.yaml @@ -19,15 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-tautulliService.port" - path: "/web" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -131,7 +155,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/traefik/2.0.0/charts/common-2.0.0.tgz b/charts/traefik/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/traefik/2.0.0/charts/common-2.0.0.tgz and b/charts/traefik/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/traefik/2.0.0/questions.yaml b/charts/traefik/2.0.0/questions.yaml index 95bc115e385..5157cca5c37 100644 --- a/charts/traefik/2.0.0/questions.yaml +++ b/charts/traefik/2.0.0/questions.yaml @@ -21,12 +21,11 @@ portals: protocols: - "https" host: - - "$variable-appReverse Proxy.webui.host" + - "$variable-ingress.hosts[0].host" ports: - "443" questions: - # Update Policy - variable: strategyType group: "Container Image" diff --git a/charts/transmission/2.0.0/charts/common-2.0.0.tgz b/charts/transmission/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/transmission/2.0.0/charts/common-2.0.0.tgz and b/charts/transmission/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/transmission/2.0.0/questions.yaml b/charts/transmission/2.0.0/questions.yaml index 3d046cc8759..f45cb19ece0 100644 --- a/charts/transmission/2.0.0/questions.yaml +++ b/charts/transmission/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +155,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -193,7 +218,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -256,7 +281,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/truecommand/2.0.0/charts/common-2.0.0.tgz b/charts/truecommand/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/truecommand/2.0.0/charts/common-2.0.0.tgz and b/charts/truecommand/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/truecommand/2.0.0/questions.yaml b/charts/truecommand/2.0.0/questions.yaml index faa1c56f41e..203f8095360 100644 --- a/charts/truecommand/2.0.0/questions.yaml +++ b/charts/truecommand/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-truecommandService.port" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -130,7 +155,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz b/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz and b/charts/tvheadend/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/tvheadend/2.0.0/questions.yaml b/charts/tvheadend/2.0.0/questions.yaml index 581edfd9b35..fb5d5f92936 100644 --- a/charts/tvheadend/2.0.0/questions.yaml +++ b/charts/tvheadend/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -109,7 +134,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -171,7 +196,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/unifi/2.0.0/charts/common-2.0.0.tgz b/charts/unifi/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/unifi/2.0.0/charts/common-2.0.0.tgz and b/charts/unifi/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/unifi/2.0.0/questions.yaml b/charts/unifi/2.0.0/questions.yaml index 7ae469eaa0f..bf89793b6cd 100644 --- a/charts/unifi/2.0.0/questions.yaml +++ b/charts/unifi/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "https" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + + # Update Policy - variable: strategyType group: "Container Image" @@ -129,7 +154,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -192,7 +217,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -255,7 +280,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz b/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz index 07f84ccf14b..182dc71e1d1 100644 Binary files a/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz and b/charts/zwavejs2mqtt/2.0.0/charts/common-2.0.0.tgz differ diff --git a/charts/zwavejs2mqtt/2.0.0/questions.yaml b/charts/zwavejs2mqtt/2.0.0/questions.yaml index 07e98341efd..2c75d5a3abd 100644 --- a/charts/zwavejs2mqtt/2.0.0/questions.yaml +++ b/charts/zwavejs2mqtt/2.0.0/questions.yaml @@ -19,14 +19,39 @@ groups: portals: web_portal: protocols: - - "http" + - "$kubernetes-resource_configmap_portal_protocol" host: - - "$node_ip" + - "$kubernetes-resource_configmap_portal_host" ports: - - "$variable-service.port.nodePort" + - "$kubernetes-resource_configmap_portal_port" 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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "http" + + # Update Policy - variable: strategyType group: "Container Image" @@ -109,7 +134,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" @@ -172,7 +197,7 @@ questions: type: string default: "ClusterIP" enum: - - value: "nodePort" + - value: "NodePort" description: "NodePort" - value: "ClusterIP" description: "ClusterIP" diff --git a/docs/development/portal.md b/docs/development/portal.md new file mode 100644 index 00000000000..f44bbdfa820 --- /dev/null +++ b/docs/development/portal.md @@ -0,0 +1,74 @@ +# Portal Button + +After installation almost every app should have a "portal" button. This button is an easy and streamlined way of entering the Applications after installation. However, one should be aware that it does not magically follow changes inside the application (for example: from http to https). + +##### questions.yaml example + +Every questions.yaml file should contain the following snippets to enable the portal button. Please be aware to change `"https"` to `"http"` if your application uses http instead of https when running using "NodePort". + +Also please be aware that the portal only(!) points towards the main service and main ingress. + +``` +portals: + web_portal: + protocols: + - "$kubernetes-resource_configmap_portal_protocol" + host: + - "$kubernetes-resource_configmap_portal_host" + ports: + - "$kubernetes-resource_configmap_portal_port" + path: "/" + +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 + - variable: nodePortProtocol + label: "Protocol when using NodePort" + description: "Enter the protocol to use when using nodeport" + schema: + hidden: true + editable: false + type: string + default: "https" + +``` + +There are also some additional (advanced) options availale, these can be added below the above required portion as required: + +**ingressPort:** +``` + - variable: ingressPort + label: "Port when ingress is not using 443" + description: "Advanced setting, please enter a different port to use if Ingress uses something other than port 443" + schema: + hidden: true + editable: false + type: int + default: 8443 +``` + +**host:** +``` + - variable: host + label: "override Host when using NodePort" + description: "Overrides the host setting when using NodePort. Example usecase would be loadbalanced NodePorts." + schema: + hidden: true + editable: false + type: string + default: "test.com" +``` diff --git a/library/common-test/charts/common-2.0.0.tgz b/library/common-test/charts/common-2.0.0.tgz index a4a492aafb3..182dc71e1d1 100644 Binary files a/library/common-test/charts/common-2.0.0.tgz and b/library/common-test/charts/common-2.0.0.tgz differ diff --git a/library/common/templates/_all.tpl b/library/common/templates/_all.tpl index 9f3c0b3bfb0..d444582c15c 100644 --- a/library/common/templates/_all.tpl +++ b/library/common/templates/_all.tpl @@ -40,5 +40,6 @@ Main entrypoint for the common library chart. It will render all underlying temp {{- end -}} {{ include "common.services" . | nindent 0 }} {{ include "common.ingress" . | nindent 0 }} + {{ include "common.resources.portal" . | nindent 0 }} {{ include "common.storage.permissions" . | nindent 0 }} {{- end -}} diff --git a/library/common/templates/_service.tpl b/library/common/templates/_service.tpl deleted file mode 100644 index 7190d60c3d3..00000000000 --- a/library/common/templates/_service.tpl +++ /dev/null @@ -1,37 +0,0 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -`SPDX-License-Identifier: Apache-2.0` - -This file is considered to be modified by the TrueCharts Project. -*/}} - -{{- define "common.service" -}} - {{- if .Values.service.enabled -}} - {{- /* Generate primary service */ -}} - {{- include "common.classes.service" . }} - - {{- /* Generate additional services as required */ -}} - {{- range $index, $extraService := .Values.service.additionalServices }} - {{- if $extraService.enabled -}} - {{- print ("---") | nindent 0 -}} - {{- $serviceValues := $extraService -}} - {{- if not $serviceValues.nameSuffix -}} - {{- $_ := set $serviceValues "nameSuffix" $index -}} - {{ end -}} - {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}} - {{- include "common.classes.service" $ -}} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/library/common/templates/_services.tpl b/library/common/templates/_services.tpl index fec8530ebe3..7d564c42f38 100644 --- a/library/common/templates/_services.tpl +++ b/library/common/templates/_services.tpl @@ -16,7 +16,7 @@ of the main Service and any additionalServices. {{ end -}} {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}} {{- include "common.classes.service" $ -}} - {{- end }} + {{- end }} {{- end }} {{- end }} diff --git a/library/common/templates/classes/ingress/_ingress.tpl b/library/common/templates/classes/ingress/_ingress.tpl index 5ea5fd03b47..98826e96d8c 100644 --- a/library/common/templates/classes/ingress/_ingress.tpl +++ b/library/common/templates/classes/ingress/_ingress.tpl @@ -1,21 +1,4 @@ {{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. - -`SPDX-License-Identifier: Apache-2.0` - -This file is considered to be modified by the TrueCharts Project. -*/}} -{{/* This template serves as a blueprint for all Ingress objects that are created within the common library. */}} diff --git a/library/common/templates/lib/resources/_portal_config.tpl b/library/common/templates/lib/resources/_portal_config.tpl new file mode 100644 index 00000000000..2ac8b4b1b75 --- /dev/null +++ b/library/common/templates/lib/resources/_portal_config.tpl @@ -0,0 +1,59 @@ +{{- define "common.resources.portal" -}} + +{{- if .Values.portal }} +{{- if .Values.portal.enabled }} +{{- $host := "$node_ip" }} +{{- $port := 443 }} +{{- $protocol := "https" }} + +{{- if hasKey .Values "ingress" }} + {{- if hasKey .Values.ingress "main" -}} + {{- range .Values.ingress.main.hosts }} + {{- if .hostTpl }} + {{- $host = ( tpl .hostTpl $ | quote ) }} + {{- else }} + {{- $host = ( .host | quote ) }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} + +{{- if and ( .Values.portal.ingressPort ) ( ne $host "$node_ip" ) }} + {{- $port = .Values.portal.ingressPort }} +{{- else if and ( eq $host "$node_ip" ) ( hasKey .Values "services" ) }} + {{- if hasKey .Values.services "main" }} + {{- if and (hasKey .Values.services.main.port "nodePort" ) ( eq .Values.services.main.type "NodePort" ) }} + {{- $port = .Values.services.main.port.nodePort }} + {{- end }} + {{- end }} +{{- end }} + +{{- if and (.Values.portal.nodePortProtocol ) ( eq $host "$node_ip" ) }} + {{- $protocol = .Values.portal.nodePortProtocol }} +{{- else if and ( ne $host "$node_ip" ) }} + {{- if .Values.ingress.main.certType }} + {{- if eq .Values.ingress.main.certType "" }} + {{- $protocol = "http" }} + {{- end }} + {{- end }} +{{- end }} + +{{- if and ( .Values.portal.host ) ( eq $host "$node_ip" ) }} + {{- $host = .Values.portal.host }} +{{- end }} + +--- + +apiVersion: v1 +kind: ConfigMap +metadata: + name: portal + labels: {{ include "common.labels" . | nindent 4 }} +data: + protocol: {{ $protocol }} + host: {{ $host }} + port: {{ $port | quote }} + +{{- end }} +{{- end }} +{{- end -}} diff --git a/library/common/values.yaml b/library/common/values.yaml index db281a18d4c..08efbf2ab71 100644 --- a/library/common/values.yaml +++ b/library/common/values.yaml @@ -100,7 +100,7 @@ probes: ## The spec field contains the values for the default livenessProbe. ## If you selected custom: true, this field holds the definition of the livenessProbe. spec: - initialDelaySeconds: 30 + initialDelaySeconds: 0 periodSeconds: 10 timeoutSeconds: 10 failureThreshold: 5 @@ -112,7 +112,7 @@ probes: ## The spec field contains the values for the default readinessProbe. ## If you selected custom: true, this field holds the definition of the readinessProbe. spec: - initialDelaySeconds: 30 + initialDelaySeconds: 0 periodSeconds: 10 timeoutSeconds: 10 failureThreshold: 5 @@ -124,7 +124,7 @@ probes: ## The spec field contains the values for the default startupProbe. ## If you selected custom: true, this field holds the definition of the startupProbe. spec: - initialDelaySeconds: 5 + initialDelaySeconds: 0 timeoutSeconds: 10 ## This means it has a maximum of 5*30=150 seconds to start up before it fails periodSeconds: 10