Dynamicly determine portal settings (#253)

* Setup dynamic portal config map.

- Includes tests

* Add portal docs

* Update charts/calibre-web/2.0.0/questions.yaml

Co-authored-by: Troy Prelog <35702532+tprelog@users.noreply.github.com>

* Fix feedback from @stavros-k

* Update charts/jackett/2.0.0/test_values.yaml

* Update charts/jackett/2.0.0/test_values.yaml

* Update charts/zwavejs2mqtt/2.0.0/questions.yaml

Co-authored-by: Troy Prelog <35702532+tprelog@users.noreply.github.com>

* Update charts/home-assistant/2.0.0/questions.yaml

Co-authored-by: Troy Prelog <35702532+tprelog@users.noreply.github.com>

* Update charts/esphome/2.0.0/questions.yaml

Co-authored-by: Troy Prelog <35702532+tprelog@users.noreply.github.com>

* Update charts/handbrake/2.0.0/questions.yaml

Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>

Co-authored-by: Troy Prelog <35702532+tprelog@users.noreply.github.com>
Co-authored-by: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
This commit is contained in:
Kjeld Schouten-Lebbing
2021-03-11 17:41:17 +01:00
committed by kjeld Schouten-Lebbing
parent 34762190a3
commit 3eeaea10af
82 changed files with 1392 additions and 227 deletions
+229
View File
@@ -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 = {
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+28 -5
View File
@@ -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"
+29 -4
View File
@@ -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"
Binary file not shown.
+31 -6
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+28 -6
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+28 -4
View File
@@ -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"
+2
View File
@@ -8,8 +8,10 @@ image:
strategy:
type: Recreate
services:
main:
enabled: true
port:
port: 9117
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+31 -6
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+29 -5
View File
@@ -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"
Binary file not shown.
+1 -2
View File
@@ -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"
Binary file not shown.
+31 -6
View File
@@ -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"
Binary file not shown.
+29 -4
View File
@@ -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"
Binary file not shown.
+30 -5
View File
@@ -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"
Binary file not shown.
+31 -6
View File
@@ -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"
Binary file not shown.
+30 -5
View File
@@ -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"
+74
View File
@@ -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"
```
Binary file not shown.
+1
View File
@@ -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 -}}
-37
View File
@@ -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 }}
+1 -1
View File
@@ -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 }}
@@ -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.
*/}}
@@ -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 -}}
+3 -3
View File
@@ -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