diff --git a/.tools/tests/charts/common-test_spec.rb b/.tools/tests/charts/common-test_spec.rb index aa65c7d338e..857f3cd628f 100644 --- a/.tools/tests/charts/common-test_spec.rb +++ b/.tools/tests/charts/common-test_spec.rb @@ -371,36 +371,11 @@ class Test < ChartTest 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: { @@ -415,7 +390,6 @@ class Test < ChartTest } 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 @@ -497,7 +471,6 @@ class Test < ChartTest portal: { enabled: true, ingressPort: 888, - nodePortProtocol: "http", host: "test1.com" }, services: { @@ -641,11 +614,7 @@ class Test < ChartTest hosts: [ { host: 'hostname', - paths: [ - { - path: '/' - } - ] + path: '/' } ] } @@ -654,120 +623,10 @@ class Test < ChartTest chart.value values jq('.spec.rules[0].host', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:host] - jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:paths][0][:path] + jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:path] end - it 'ingress with hosts template is evaluated' do - expectedHostName = 'common-test.hostname' - values = { - ingress: { - test1: { - hosts: [ - { - hostTpl: '{{ .Release.Name }}.hostname', - paths: [ - { - path: '/' - } - ] - } - ] - } - } - } - chart.value values - jq('.spec.rules[0].host', resource('Ingress')).must_equal expectedHostName - jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:paths][0][:path] - end - - it 'ingress with hosts and tls' do - values = { - ingress: { - test1: { - enabled: true, - hosts: [ - { - host: 'hostname', - paths: [ - { - path: '/' - } - ] - } - ], - tls: [ - { - hosts: [ 'hostname' ], - secretName: 'hostname-secret-name' - } - ] - } - } - } - - chart.value values - jq('.spec.rules[0].host', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:host] - jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:paths][0][:path] - jq('.spec.tls[0].hosts[0]', resource('Ingress')).must_equal values[:ingress][:test1][:tls][0][:hosts][0] - jq('.spec.tls[0].secretName', resource('Ingress')).must_equal values[:ingress][:test1][:tls][0][:secretName] - end - - it 'ingress with tls template is evaluated' do - expectedHostName = 'common-test.hostname' - expectedSecretName = 'common-test-hostname-secret-name' - values = { - ingress: { - test1: { - enabled: true, - tls: [ - { - hostsTpl: [ '{{ .Release.Name }}.hostname' ], - secretNameTpl: '{{ .Release.Name }}-hostname-secret-name' - } - ] - } - } - } - - chart.value values - jq('.spec.tls[0].hosts[0]', resource('Ingress')).must_equal expectedHostName - jq('.spec.tls[0].secretName', resource('Ingress')).must_equal expectedSecretName - end - - it 'ingress with hosts and tls template is evaluated' do - expectedHostName = 'common-test.hostname' - expectedSecretName = 'common-test-hostname-secret-name' - values = { - ingress: { - test1: { - enabled: true, - hosts: [ - { - hostTpl: '{{ .Release.Name }}.hostname', - paths: [ - { - path: '/' - } - ] - } - ], - tls: [ - { - hostsTpl: [ '{{ .Release.Name }}.hostname' ], - secretNameTpl: '{{ .Release.Name }}-hostname-secret-name' - } - ] - } - } - } - - chart.value values - jq('.spec.rules[0].host', resource('Ingress')).must_equal expectedHostName - jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:paths][0][:path] - jq('.spec.tls[0].hosts[0]', resource('Ingress')).must_equal expectedHostName - jq('.spec.tls[0].secretName', resource('Ingress')).must_equal expectedSecretName - end it 'ingress with selfsigned certtype is evaluated' do expectedHostName = 'common-test.hostname' @@ -779,11 +638,7 @@ class Test < ChartTest hosts: [ { host: 'hostname', - paths: [ - { - path: '/' - } - ] + path: '/' } ], certType: "selfsigned" @@ -793,7 +648,7 @@ class Test < ChartTest chart.value values jq('.spec.rules[0].host', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:host] - jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:paths][0][:path] + jq('.spec.rules[0].http.paths[0].path', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:path] jq('.spec.tls[0].hosts[0]', resource('Ingress')).must_equal values[:ingress][:test1][:hosts][0][:host] jq('.spec.tls[0].secretName', resource('Ingress')).must_equal nil end @@ -1088,7 +943,7 @@ class Test < ChartTest end it 'HTTP-ingressRoute is evaluated ' do - expectedHostString = 'Host(`hostname`)' + expectedHostString = 'Host(`hostname`) && PathPrefix(`/`)' values = { ingress: { test1: { @@ -1112,7 +967,7 @@ class Test < ChartTest end it 'HTTP-ingressRoute with selfsigned cert is evaluated is evaluated ' do - expectedHostString = 'Host(`hostname`)' + expectedHostString = 'Host(`hostname`) && PathPrefix(`/`)' values = { ingress: { test1: { @@ -1139,7 +994,7 @@ class Test < ChartTest end it 'HTTP-ingressRoute+selfsigned+forwardAuth is evaluated is evaluated ' do - expectedHostString = 'Host(`hostname`)' + expectedHostString = 'Host(`hostname`) && PathPrefix(`/`)' expectedName = 'common-test-test1-auth-forward' values = { ingress: { @@ -1168,8 +1023,35 @@ class Test < ChartTest jq('.metadata.name', resource('Middleware')).must_equal expectedName jq('.spec.routes[0].middlewares[1].name', resource('IngressRoute')).must_equal expectedName end - end + describe 'externalServices' do + it 'no externalService endpoints present by default' do + assert_nil(resource('Endpoints')) + end + + it 'Create externalService endpoint' do + values = { + externalServices: [ + { + enabled: true, + serviceTarget: "192.168.10.20", + servicePort: 9443, + certType: "selfsigned", + entrypoint: "websecure", + type: "HTTP", + host: 'hostname', + path: '/' + } + ] + } + + chart.value values + refute_nil(resource('Endpoints')) + jq('.subsets[0].addresses[0].ip', resource('Endpoints')).must_equal values[:externalServices][0][:serviceTarget] + jq('.subsets[0].ports[0].port', resource('Endpoints')).must_equal values[:externalServices][0][:servicePort] + jq('.metadata.name', resource('Endpoints')).must_equal "common-test-external-0" + end end end +end 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 182dc71e1d1..84ade1a3ae7 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 ab2a639f4b0..e8bc137a2dc 100644 --- a/charts/bazarr/2.0.0/questions.yaml +++ b/charts/bazarr/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -471,21 +465,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -511,29 +490,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 a357c5312ce..9c3df98b7fe 100644 --- a/charts/calibre-web/2.0.0/questions.yaml +++ b/charts/calibre-web/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -166,13 +160,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -413,21 +407,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -453,29 +432,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 80b341eec06..7a1d93e8958 100644 --- a/charts/collabora-online/2.0.0/questions.yaml +++ b/charts/collabora-online/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -43,14 +45,6 @@ questions: 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 @@ -194,13 +188,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -322,21 +316,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -362,29 +341,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 88c89949a86..d29ee3e1562 100644 --- a/charts/deluge/2.0.0/questions.yaml +++ b/charts/deluge/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -541,21 +535,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -581,29 +560,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: @@ -662,13 +625,6 @@ questions: # editable: false # default: 80 # type: int - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -713,13 +669,6 @@ questions: # editable: false # default: 80 # type: int - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: 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 182dc71e1d1..84ade1a3ae7 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 628989e86c2..a75131bef72 100644 --- a/charts/emby/2.0.0/questions.yaml +++ b/charts/emby/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -425,21 +419,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -465,29 +444,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 bfacf8efed3..efff326bc35 100644 --- a/charts/esphome/2.0.0/questions.yaml +++ b/charts/esphome/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,15 +44,6 @@ questions: 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 @@ -167,13 +160,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -355,21 +348,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -395,29 +373,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 6d66d823aa7..9d743ddc10a 100644 --- a/charts/freshrss/2.0.0/questions.yaml +++ b/charts/freshrss/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -358,21 +352,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -398,29 +377,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 a8fc8221be2..d48795774af 100644 --- a/charts/gaps/2.0.0/questions.yaml +++ b/charts/gaps/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -359,21 +353,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -399,29 +378,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 ad5ddcd2d92..258725a4a29 100644 --- a/charts/grocy/2.0.0/questions.yaml +++ b/charts/grocy/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -359,21 +353,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -399,29 +378,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 9a4c4c79714..6132179f136 100644 --- a/charts/handbrake/2.0.0/questions.yaml +++ b/charts/handbrake/2.0.0/questions.yaml @@ -14,6 +14,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -247,13 +249,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -706,21 +708,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -746,29 +733,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 3d8c4a7bd52..a43f53345a9 100644 --- a/charts/heimdall/2.0.0/questions.yaml +++ b/charts/heimdall/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -359,21 +353,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -399,29 +378,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 903a328adba..4c2d4313ca5 100644 --- a/charts/home-assistant/2.0.0/questions.yaml +++ b/charts/home-assistant/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,15 +44,6 @@ questions: 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 @@ -320,13 +313,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -446,21 +439,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -486,29 +464,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 69a37c1caa3..d038e251a4b 100644 --- a/charts/jackett/2.0.0/questions.yaml +++ b/charts/jackett/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -166,13 +160,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -358,21 +352,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -398,29 +377,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: diff --git a/charts/jackett/2.0.0/test_values.yaml b/charts/jackett/2.0.0/test_values.yaml index a344de55b45..0522575c204 100644 --- a/charts/jackett/2.0.0/test_values.yaml +++ b/charts/jackett/2.0.0/test_values.yaml @@ -46,6 +46,18 @@ persistence: ## TrueCharts Values +ingress: + main: + enabled: true + # Used when including ingress using {{ include "common.ingress" . }} + type: "HTTP" + entrypoint: "websecure" + certType: "" + annotations: {} + hosts: + - host: chart-example.local + path: / + appVolumeMounts: config: enabled: true 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 182dc71e1d1..84ade1a3ae7 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 1b7d3184396..aa03f2381dd 100644 --- a/charts/jellyfin/2.0.0/questions.yaml +++ b/charts/jellyfin/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -425,21 +419,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -465,29 +444,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 c39cd45156d..547ff2f17bb 100644 --- a/charts/kms/2.0.0/questions.yaml +++ b/charts/kms/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -295,21 +289,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: 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 182dc71e1d1..84ade1a3ae7 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 2b1560614cd..2c22c77ae49 100644 --- a/charts/lazylibrarian/2.0.0/questions.yaml +++ b/charts/lazylibrarian/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -471,21 +465,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -511,29 +490,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 8fb1d69e0e9..b063bbfecb5 100644 --- a/charts/lidarr/2.0.0/questions.yaml +++ b/charts/lidarr/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -471,21 +465,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -511,29 +490,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 5d5a6b697fe..1263684176c 100644 --- a/charts/lychee/2.0.0/questions.yaml +++ b/charts/lychee/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -470,21 +464,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -510,29 +489,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 3fc962fbe60..180b6421e98 100644 --- a/charts/navidrome/2.0.0/questions.yaml +++ b/charts/navidrome/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -416,21 +410,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -456,29 +435,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 6fd826ebf5d..ec7342ac533 100644 --- a/charts/node-red/2.0.0/questions.yaml +++ b/charts/node-red/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -360,21 +354,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -400,29 +379,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 6e21bee4ee5..cf93270528a 100644 --- a/charts/nzbget/2.0.0/questions.yaml +++ b/charts/nzbget/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -414,21 +408,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -454,29 +433,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 fae5e36eb28..b83930a0774 100644 --- a/charts/nzbhydra/2.0.0/questions.yaml +++ b/charts/nzbhydra/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -414,21 +408,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -454,29 +433,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 fe763bed93a..1a54394385d 100644 --- a/charts/ombi/2.0.0/questions.yaml +++ b/charts/ombi/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -359,21 +353,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -399,29 +378,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 21df001f01d..c23220832fe 100644 --- a/charts/organizr/2.0.0/questions.yaml +++ b/charts/organizr/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -416,21 +410,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -456,29 +435,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 d931c71a559..626c732d5f3 100644 --- a/charts/qbittorrent/2.0.0/questions.yaml +++ b/charts/qbittorrent/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -541,21 +535,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -581,29 +560,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: @@ -662,13 +625,6 @@ questions: # editable: false # default: 80 # type: int - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -713,13 +669,6 @@ questions: # editable: false # default: 80 # type: int - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: 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 182dc71e1d1..84ade1a3ae7 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 cf3206eefdb..cb94e937129 100644 --- a/charts/radarr/2.0.0/questions.yaml +++ b/charts/radarr/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -471,21 +465,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -511,29 +490,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 77e363870ef..98339d128e0 100644 --- a/charts/readarr/2.0.0/questions.yaml +++ b/charts/readarr/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -470,21 +464,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -510,29 +489,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 b273baefeba..963f2335630 100644 --- a/charts/sabnzbd/2.0.0/questions.yaml +++ b/charts/sabnzbd/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -168,13 +162,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -415,21 +409,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -455,29 +434,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 02af1b4823f..5fe786cb54c 100644 --- a/charts/sonarr/2.0.0/questions.yaml +++ b/charts/sonarr/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -168,13 +162,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -472,21 +466,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -512,29 +491,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 75383317e40..c17e0dc5844 100644 --- a/charts/tautulli/2.0.0/questions.yaml +++ b/charts/tautulli/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -168,13 +162,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -360,21 +354,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -400,29 +379,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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/docs/externalservices.md b/charts/traefik/2.0.0/docs/externalservices.md new file mode 100644 index 00000000000..136171fa1ce --- /dev/null +++ b/charts/traefik/2.0.0/docs/externalservices.md @@ -0,0 +1,11 @@ +# External Service + +Some users may want to use Traefik for things that are not part of a TrueNAS SCALE App. For these users we support "External Services". + +"External Services" are an advanced configuration option that lets you forward Traefik from Ingress to a service outside of the Container network. For example: A TrueNAS Host system. This allows you to, for example, use the same SSL certificates for both services inside and outside the TrueNAS SCALE App ecosystem. + +##### Configuration + +External Services require both the IP Adress and Port of the service you want to forward. These will internally create a special 'service' that recieves traffic on the same ports (internally) and forwards it to the external service. + +Additionally it creates an ingress which forwards traffic to the special forwarding service. diff --git a/charts/traefik/2.0.0/docs/used-ports.md b/charts/traefik/2.0.0/docs/used-ports.md new file mode 100644 index 00000000000..bd8473c4da5 --- /dev/null +++ b/charts/traefik/2.0.0/docs/used-ports.md @@ -0,0 +1,36 @@ +# Used Ports + +Traefik forwards traffic for a lot of applications and we don't want to require from users to edit its configuration. + +This means that by default Traefik will claim a lot of ports from the node. Please be aware: these ports can NOT be used by other applications as NodePorts. Under "Advanced" we offer options to disable exposing these ports, freeing them for other applications, or altering the port numbers. + +###### Used Port List + + +- **web:** 80 + +- **websecure:** 443 + +- **plex:** 32400 + +- **kms:** 1688 + +- **dns-tcp:** 53 + +- **dns-udp:** 53/UDP + +- **stun-tcp:** 3478 + +- **stun-udp:** 3478/UDP + +- **torrent-tcp:** 51413 + +- **torrent-udp:** 51413/UDP + +- **radius:** 1812 + +- **radius-acc:** 1813 + +- **ldaps:** 636 + +- **unificom:** 8080 diff --git a/charts/traefik/2.0.0/ix_values.yaml b/charts/traefik/2.0.0/ix_values.yaml index 26f6ebac0e6..87cc99a7046 100644 --- a/charts/traefik/2.0.0/ix_values.yaml +++ b/charts/traefik/2.0.0/ix_values.yaml @@ -216,177 +216,6 @@ envFrom: [] # - secretRef: # name: secret-name -# Configure ports -ports: - # The name of this one can't be changed as it is used for the readiness and - # liveness probes, but you can adjust its config to your liking - traefik: - port: 9000 - # Use hostPort if set. - # hostPort: 9000 - # - # Use hostIP if set. If not set, Kubernetes will default to 0.0.0.0, which - # means it's listening on all your interfaces and all your IPs. You may want - # to set this value if you need traefik to listen on specific interface - # only. - # hostIP: 192.168.100.10 - - # Defines whether the port is exposed if service.type is LoadBalancer or - # NodePort. - # - # You SHOULD NOT expose the traefik port on production deployments. - # If you want to access it from outside of your cluster, - # use `kubectl port-forward` or create a secure ingress - expose: false - # The exposed port for this service - exposedPort: 9000 - # The port protocol (TCP/UDP) - protocol: TCP - web: - port: 8000 - # hostPort: 8000 - expose: true - exposedPort: 80 - # The port protocol (TCP/UDP) - protocol: TCP - # Use nodeport if set. This is useful if you have configured Traefik in a - # LoadBalancer - # nodePort: 32080 - # Port Redirections - # Added in 2.2, you can make permanent redirects via entrypoints. - # https://docs.traefik.io/routing/entrypoints/#redirection - redirectTo: websecure - websecure: - port: 8443 - # hostPort: 8443 - expose: true - exposedPort: 443 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - plex: - port: 32400 - # hostPort: 8443 - expose: true - exposedPort: 32400 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - kms: - port: 51688 - # hostPort: 8443 - expose: true - exposedPort: 1688 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - dns-tcp: - port: 5353 - # hostPort: 8443 - expose: true - exposedPort: 53 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - dns-udp: - port: 5353 - # hostPort: 8443 - expose: true - exposedPort: 53 - # The port protocol (TCP/UDP) - protocol: UDP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - stun-tcp: - port: 3478 - # hostPort: 8443 - expose: true - exposedPort: 3478 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - stun-udp: - port: 3478 - # hostPort: 8443 - expose: true - exposedPort: 3478 - # The port protocol (TCP/UDP) - protocol: UDP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - torrent-tcp: - port: 51413 - # hostPort: 8443 - expose: true - exposedPort: 51413 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - torrent-udp: - port: 51413 - # hostPort: 8443 - expose: true - exposedPort: 51413 - # The port protocol (TCP/UDP) - protocol: UDP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - radius: - port: 51812 - # hostPort: 8443 - expose: true - exposedPort: 1812 - # The port protocol (TCP/UDP) - protocol: UDP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - radius-acc: - port: 51813 - # hostPort: 8443 - expose: true - exposedPort: 1813 - # The port protocol (TCP/UDP) - protocol: UDP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - ldaps: - port: 50636 - # hostPort: 8443 - expose: true - exposedPort: 636 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - unificom: - port: 8080 - # hostPort: 8443 - expose: true - exposedPort: 8080 - # The port protocol (TCP/UDP) - protocol: TCP - # nodePort: 32443 - # Set TLS at the entrypoint - # https://doc.traefik.io/traefik/routing/entrypoints/#tls - # TLS Options are created as TLSOption CRDs # https://doc.traefik.io/traefik/https/tls/#tls-options # Example: diff --git a/charts/traefik/2.0.0/questions.yaml b/charts/traefik/2.0.0/questions.yaml index 5157cca5c37..337c3595710 100644 --- a/charts/traefik/2.0.0/questions.yaml +++ b/charts/traefik/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -73,6 +75,8 @@ questions: type: string default: "002" + + ## TrueCharts Specific - variable: appVolumeMounts @@ -233,14 +237,6 @@ questions: editable: false type: string default: "api@internal" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - variable: serviceKind label: "Service Kind to proxy to" schema: @@ -273,29 +269,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: @@ -321,6 +301,668 @@ questions: type: string default: "" + - variable: ports + label: "(Advanced) Traefik Entrypoints" + group: "Advanced" + schema: + type: dict + attrs: + - variable: traefik + label: "traefik internal" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 9000 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + default: 9000 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + default: "TCP" + + - variable: web + label: "web" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 80 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 80 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: redirectEnable + label: "Enable Redirect" + schema: + type: boolean + default: true + show_subquestions_if: true + subquestions: + - variable: redirectTo + label: "Target Entrypoint" + description: "Select the Target Entrypoint to redirect to" + schema: + type: string + required: true + default: "websecure" + - variable: websecure + label: "websecure" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 8443 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 443 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: plex + label: "plex" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 32400 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: false + default: 32400 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: kms + label: "kms" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 51688 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 1688 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: dns-tcp + label: "dns-tcp" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 5353 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 53 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: dns-udp + label: "dns-udp" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 5353 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 53 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "UDP" + hidden: true + - variable: stun-tcp + label: "stun-tcp" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 3478 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 3478 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: stun-udp + label: "stun-udp" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 3478 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 3478 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "UDP" + hidden: true + - variable: torrent-tcp + label: "torrent-tcp" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 51413 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 51413 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + - variable: torrent-udp + label: "torrent-udp" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 51413 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 51413 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "UDP" + hidden: true + - variable: radius + label: "radius" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 51812 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 1812 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "UDP" + hidden: true + - variable: radius-acc + label: "radius-acc" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 51813 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 1813 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "UDP" + hidden: true + - variable: ldaps + label: "ldaps" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + default: 50636 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: false + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 636 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + hidden: true + default: "TCP" + - variable: unificom + label: "unificom" + schema: + type: dict + attrs: + - variable: port + label: "Internal Port" + description: "(advanced) Port inside the container network" + schema: + type: int + required: true + hidden: true + hide: true + default: 8080 + - variable: expose + label: "Expose to Outside" + description: "Port to the outside of all(!) nodes" + schema: + type: boolean + default: true + - variable: exposedPort + label: "Outside Port" + description: "Port to the outside of all(!) nodes" + schema: + type: int + show_if: [["exposedPort", "=", true]] + required: true + default: 8080 + - variable: protocol + label: "Protocol" + description: "TCP or UDP reverse proxying?" + schema: + type: string + required: true + default: "TCP" + hidden: true + + - variable: externalServices + label: "(Advanced) Add External Services" + group: "Advanced" + schema: + type: list + default: [] + items: + - variable: externalService + label: "External Service" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable Web Reverse Proxy" + schema: + type: boolean + hidden: true + editable: false + default: true + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: serviceTarget + label: "IP Adress of the external service" + schema: + hidden: false + editable: true + required: true + type: string + default: "192.168.0.0" + - variable: servicePort + label: "External Service Port" + description: "The port on the external service you want to proxy" + schema: + hidden: false + required: true + editable: true + type: int + default: 80 + - variable: serviceType + label: "Connection Type" + description: "Connection Type between Traefik and the external service" + schema: + hidden: false + editable: true + required: true + default: "HTTP" + type: string + enum: + - value: "HTTP" + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - variable: serviceKind + label: "Service Kind to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: host + label: "Domain Name" + required: true + schema: + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: false + default: "/" + - variable: certType + label: "Select Certificate Type" + schema: + type: string + default: "selfsigned" + enum: + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + type: string + default: "" - variable: warning label: "This App binds to the same ports as TrueNAS SCALE UI: 80 and 443" diff --git a/charts/traefik/2.0.0/templates/custom/appingress.yaml b/charts/traefik/2.0.0/templates/custom/common.yaml similarity index 100% rename from charts/traefik/2.0.0/templates/custom/appingress.yaml rename to charts/traefik/2.0.0/templates/custom/common.yaml diff --git a/charts/traefik/2.0.0/test_values.yaml b/charts/traefik/2.0.0/test_values.yaml index e47c311159e..738fe1e3452 100644 --- a/charts/traefik/2.0.0/test_values.yaml +++ b/charts/traefik/2.0.0/test_values.yaml @@ -184,7 +184,6 @@ globalArguments: ## Use curly braces to pass values: `helm install --set="additionalArguments={--providers.kubernetesingress.ingressclass=traefik-internal,--log.level=DEBUG}"` additionalArguments: # - "--providers.kubernetesingress.ingressclass=traefik-internal" - - "--providers.kubernetesIngress.ingressClass=traefik-cert-manager" # - "--log.level=DEBUG" # - "--metrics.prometheus" - "--entrypoints.websecure.http.tls" @@ -540,3 +539,21 @@ ingress: - path: / # Ignored if not kubeVersion >= 1.14-0 pathType: Prefix + +externalServices: + - enabled: true + name: "test" + type: "HTTP" + entrypoint: "websecure" + certType: "selfsigned" + serviceTarget: "192.168.10.20" + servicePort: 9443 + serviceKind: "" + annotations: {} + labels: {} + hosts: + - host: radarr.staging.schouten-lebbing.nl + paths: + - path: / + # Ignored if not kubeVersion >= 1.14-0 + pathType: Prefix 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 182dc71e1d1..84ade1a3ae7 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 f45cb19ece0..1da9f47f736 100644 --- a/charts/transmission/2.0.0/questions.yaml +++ b/charts/transmission/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -168,13 +162,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -542,21 +536,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -582,29 +561,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: @@ -663,13 +626,6 @@ questions: # editable: false # default: 80 # type: int - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -714,13 +670,6 @@ questions: # editable: false # default: 80 # type: int - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: 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 182dc71e1d1..84ade1a3ae7 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 203f8095360..a547082a413 100644 --- a/charts/truecommand/2.0.0/questions.yaml +++ b/charts/truecommand/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -168,13 +162,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -360,21 +354,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -400,29 +379,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 fb5d5f92936..2ab8ee0cb21 100644 --- a/charts/tvheadend/2.0.0/questions.yaml +++ b/charts/tvheadend/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -147,13 +141,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -455,21 +449,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -495,29 +474,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 bf89793b6cd..6a72a7243d9 100644 --- a/charts/unifi/2.0.0/questions.yaml +++ b/charts/unifi/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,14 +44,6 @@ questions: 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 @@ -167,13 +161,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -485,21 +479,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -525,29 +504,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: 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 182dc71e1d1..84ade1a3ae7 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 2c75d5a3abd..5eb0905529c 100644 --- a/charts/zwavejs2mqtt/2.0.0/questions.yaml +++ b/charts/zwavejs2mqtt/2.0.0/questions.yaml @@ -13,6 +13,8 @@ groups: description: "Specify resources to be allocated to workload" - name: "Reverse Proxy Configuration" description: "Reverse Proxy configuration" + - name: "Advanced" + description: "Advanced Configuration" - name: "WARNING" description: "WARNING" @@ -42,15 +44,6 @@ questions: 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 @@ -147,13 +140,13 @@ questions: label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: @@ -438,21 +431,6 @@ questions: editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # default: 80 - # type: int - # default: - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -478,29 +456,13 @@ questions: required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: diff --git a/docs/development/ingress.md b/docs/development/ingress.md index 6bcc43a74a9..e940961a6e1 100644 --- a/docs/development/ingress.md +++ b/docs/development/ingress.md @@ -70,20 +70,6 @@ We try to maintain as much of a standardised questions.yaml format as possible, editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # type: int - # default: 80 - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -109,29 +95,13 @@ We try to maintain as much of a standardised questions.yaml format as possible, required: true schema: type: string - - variable: paths - label: "paths" + - variable: path + label: "path" schema: - type: list - default: [] - items: - - variable: path - label: "Path" - schema: - type: dict - attrs: - - variable: path - label: "path" - schema: - type: string - required: true - default: "/" - - variable: pathType - label: "pathType" - schema: - type: string - required: true - default: "prefix" + type: string + required: true + hidden: true + default: "/" - variable: certType label: "Select Certificate Type" schema: @@ -189,20 +159,6 @@ We try to maintain as much of a standardised questions.yaml format as possible, editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # type: int - # default: 80 - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -244,20 +200,6 @@ We try to maintain as much of a standardised questions.yaml format as possible, editable: false type: string default: "" - # - variable: servicePort - # label: "Service Port to proxy to" - # schema: - # hidden: true - # editable: false - # type: int - # default: 80 - - variable: serviceKind - label: "Service Kind to proxy to" - schema: - hidden: true - editable: false - type: string - default: "" - variable: entrypoint label: "Select Entrypoint" schema: @@ -268,3 +210,157 @@ We try to maintain as much of a standardised questions.yaml format as possible, - value: "torrent-udp" description: "Torrent-UDP: port 51413" ``` + +### Other Ingress options + +There are a few other options that are rarely (if ever) used. + +##### servicePort + +``` + - variable: servicePort + label: "Service Port to proxy to" + schema: + hidden: true + editable: false + type: int + default: 80 +``` + + +##### serviceKind + +``` + - variable: serviceKind + label: "Service Kind to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" +``` + + +### External Services + +The externalServices option, is actually mostly an Ingress "under the hood" which just creates a very small (minimal) service. + +``` + - variable: externalServices + label: "(Advanced) Add External Services" + group: "Advanced" + schema: + type: list + default: [] + items: + - variable: externalService + label: "External Service" + schema: + type: dict + attrs: + - variable: enabled + label: "Enable Web Reverse Proxy" + schema: + type: boolean + hidden: true + editable: false + default: true + - variable: type + label: "Reverse Proxy Type" + schema: + type: string + default: "HTTP" + hidden: true + editable: false + required: true + - variable: serviceName + label: "Service name to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: serviceTarget + label: "IP Adress of the external service" + schema: + hidden: false + editable: true + required: true + type: string + default: "192.168.0.0" + - variable: servicePort + label: "External Service Port" + description: "The port on the external service you want to proxy" + schema: + hidden: false + required: true + editable: true + type: int + default: 80 + - variable: serviceType + label: "Connection Type" + description: "Connection Type between Traefik and the external service" + schema: + hidden: false + editable: true + required: true + default: "HTTP" + type: string + enum: + - value: "HTTP" + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" + - variable: serviceKind + label: "Service Kind to proxy to" + schema: + hidden: true + editable: false + type: string + default: "" + - variable: entrypoint + label: "Select Entrypoint" + schema: + type: string + default: "websecure" + required: true + enum: + - value: "websecure" + description: "Websecure: HTTPS/TLS port 443" + - variable: host + label: "Domain Name" + required: true + schema: + type: string + - variable: path + label: "path" + schema: + type: string + required: true + hidden: false + default: "/" + - variable: certType + label: "Select Certificate Type" + schema: + type: string + default: "selfsigned" + enum: + - value: "" + description: "No Encryption/TLS/Certificates" + - value: "selfsigned" + description: "Self-Signed Certificate" + - value: "ixcert" + description: "TrueNAS SCALE Certificate" + - variable: certificate + label: "Select TrueNAS SCALE Certificate" + schema: + type: int + show_if: [["certType", "=", "ixcert"]] + $ref: + - "definitions/certificate" + - variable: authForwardURL + label: "Forward Authentication URL" + schema: + type: string + default: "" +``` diff --git a/docs/development/portal.md b/docs/development/portal.md index f44bbdfa820..cf8d8b0e92f 100644 --- a/docs/development/portal.md +++ b/docs/development/portal.md @@ -4,9 +4,9 @@ After installation almost every app should have a "portal" button. This button i ##### 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". +Every questions.yaml file should contain the following snippets to enable the portal button. Please be aware to change `"http"` to `"https"` in services.main.port.protocol 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. +Also please be aware that the portal only(!) points towards the main service, main service port and main ingress. ``` portals: @@ -17,7 +17,7 @@ portals: - "$kubernetes-resource_configmap_portal_host" ports: - "$kubernetes-resource_configmap_portal_port" - path: "/" + path: "/" questions: @@ -36,14 +36,6 @@ questions: 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" ``` diff --git a/docs/development/services.md b/docs/development/services.md index c18599c1ddb..43c1fbd2ff6 100644 --- a/docs/development/services.md +++ b/docs/development/services.md @@ -64,13 +64,13 @@ Please keep in mind that every App is different, some just have one service (whi label: "Port Type" schema: type: string - default: "TCP" - hidden: true + default: "HTTP" + hidden: false enum: - - value: TCP - description: "TCP" - - value: "UDP" - description: "UDP" + - value: HTTP + description: "HTTP" + - value: "HTTPS" + description: "HTTPS" - variable: port label: "container port" schema: diff --git a/library/common-test/charts/common-2.0.0.tgz b/library/common-test/charts/common-2.0.0.tgz index 182dc71e1d1..84ade1a3ae7 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/_ingress.tpl b/library/common/templates/_ingress.tpl index fe5cb322fec..846043750d7 100644 --- a/library/common/templates/_ingress.tpl +++ b/library/common/templates/_ingress.tpl @@ -1,21 +1,3 @@ -{{/* -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. -*/}} - {{/* Renders the Ingress objects required by the chart by returning a concatinated list of the main Ingress and any additionalIngresses. @@ -27,34 +9,35 @@ of the main Ingress and any additionalIngresses. {{- print ("---") | nindent 0 -}} {{- $ingressValues := $ingress -}} - {{/* set defaults */}} - {{- if or (not $ingressValues.nameSuffix) ( ne $name "main" ) -}} + {{/* set defaults */}} + {{- if and (not $ingressValues.nameSuffix) ( ne $name "main" ) -}} {{- $_ := set $ingressValues "nameSuffix" $name -}} {{ end -}} + {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}} {{- if not $ingressValues.type -}} {{- $_ := set $ingressValues "type" "HTTP" -}} - {{ end -}} - {{- if not $ingressValues.certType -}} + {{ end -}} + {{- if not $ingressValues.certType -}} {{- $_ := set $ingressValues "certType" "" -}} - {{ end -}} + {{ end -}} {{- if or ( eq $ingressValues.type "TCP" ) ( eq $ingressValues.type "UDP" ) ( eq $ingressValues.type "HTTP-IR" ) -}} - {{- include "common.classes.ingressRoute" $ -}} - {{- else -}} - {{- include "common.classes.ingress" $ -}} - {{ end -}} + {{- include "common.classes.ingressRoute" $ -}} + {{- else -}} + {{- include "common.classes.ingress" $ -}} + {{ end -}} - {{- if $ingressValues.authForwardURL -}} - {{- print ("---") | nindent 0 -}} - {{- include "common.classes.ingress.authForward" $ }} - {{ end -}} + {{- if $ingressValues.authForwardURL -}} + {{- print ("---") | nindent 0 -}} + {{- include "common.classes.ingress.authForward" $ }} + {{ end -}} - {{- if eq $ingressValues.certType "ixcert" -}} - {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} - {{- print ("---") | nindent 0 -}} - {{- include "common.resources.cert.secret" $ }} - {{ end -}} + {{- if eq $ingressValues.certType "ixcert" -}} + {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} + {{- print ("---") | nindent 0 -}} + {{- include "common.resources.cert.secret" $ }} + {{ end -}} {{- end }} {{- end }} @@ -65,39 +48,85 @@ of the main Ingress and any additionalIngresses. {{- print ("---") | nindent 0 -}} {{- $ingressValues := $additionalIngress -}} - {{/* set defaults */}} - {{- $name := ( $index | quote ) -}} + {{/* set defaults */}} + {{- $name := $index -}} {{- if $ingressValues.name -}} {{- $name := $ingressValues.name -}} {{- end }} - {{- if or (not $ingressValues.nameSuffix) ( ne $name "main" ) -}} + {{- if or (not $ingressValues.nameSuffix) ( ne ( $name | quote ) "main" ) -}} {{- $_ := set $ingressValues "nameSuffix" $name -}} {{ end -}} {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}} {{- if not $ingressValues.type -}} {{- $_ := set $ingressValues "type" "HTTP" -}} - {{ end -}} - {{- if not $ingressValues.certType -}} + {{ end -}} + {{- if not $ingressValues.certType -}} {{- $_ := set $ingressValues "certType" "" -}} - {{ end -}} + {{ end -}} {{- if or ( eq $ingressValues.type "TCP" ) ( eq $ingressValues.type "UDP" ) ( eq $ingressValues.type "HTTP-IR" ) -}} - {{- include "common.classes.ingressRoute" $ -}} - {{- else -}} - {{- include "common.classes.ingress" $ -}} - {{ end -}} + {{- include "common.classes.ingressRoute" $ -}} + {{- else -}} + {{- include "common.classes.ingress" $ -}} + {{ end -}} - {{- if $ingressValues.authForwardURL -}} - {{- print ("---") | nindent 0 -}} - {{- include "common.classes.ingress.authForward" $ }} - {{ end -}} + {{- if $ingressValues.authForwardURL -}} + {{- print ("---") | nindent 0 -}} + {{- include "common.classes.ingress.authForward" $ }} + {{ end -}} - {{- if eq $ingressValues.certType "ixcert" -}} - {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} - {{- print ("---") | nindent 0 -}} - {{- include "common.resources.cert.secret" $ }} - {{ end -}} + {{- if eq $ingressValues.certType "ixcert" -}} + {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} + {{- print ("---") | nindent 0 -}} + {{- include "common.resources.cert.secret" $ }} + {{ end -}} + {{- end }} + {{- end }} + + {{- /* Generate externalService ingresses as required */ -}} + {{- range $index, $externalService := .Values.externalServices }} + {{- if $externalService.enabled -}} + {{- print ("---") | nindent 0 -}} + {{- $ingressValues := $externalService -}} + + {{/* set defaults */}} + {{- $name := $index -}} + {{- if $ingressValues.name -}} + {{- $name := $ingressValues.name -}} + {{- end }} + {{- $name = printf "%v-%v" "external" $name -}} + + {{- if or (not $ingressValues.nameSuffix) -}} + {{- $_ := set $ingressValues "nameSuffix" $name -}} + {{ end -}} + {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}} + {{- if not $ingressValues.type -}} + {{- $_ := set $ingressValues "type" "HTTP" -}} + {{ end -}} + {{- if not $ingressValues.certType -}} + {{- $_ := set $ingressValues "certType" "" -}} + {{ end -}} + + {{- if or ( eq $ingressValues.type "TCP" ) ( eq $ingressValues.type "UDP" ) ( eq $ingressValues.type "HTTP-IR" ) -}} + {{- include "common.classes.ingressRoute" $ -}} + {{- else -}} + {{- include "common.classes.ingress" $ -}} + {{ end -}} + + {{- print ("---") | nindent 0 -}} + {{- include "common.classes.externalService" $ }} + + {{- if $ingressValues.authForwardURL -}} + {{- print ("---") | nindent 0 -}} + {{- include "common.classes.ingress.authForward" $ }} + {{ end -}} + + {{- if eq $ingressValues.certType "ixcert" -}} + {{- $_ := set $ "ObjectValues" (dict "certHolder" $ingressValues) -}} + {{- print ("---") | nindent 0 -}} + {{- include "common.resources.cert.secret" $ }} + {{ end -}} {{- end }} {{- end }} diff --git a/library/common/templates/_services.tpl b/library/common/templates/_services.tpl index 7d564c42f38..9e72e9d04f5 100644 --- a/library/common/templates/_services.tpl +++ b/library/common/templates/_services.tpl @@ -4,14 +4,15 @@ of the main Service and any additionalServices. */}} {{- define "common.services" -}} {{- if .Values.services -}} - {{- /* Add dict of primary services */ -}} + {{- /* Add dict of primary services */ -}} {{- range $name, $service := .Values.services }} {{- if or ( $service.enabled ) ( eq $name "main" ) -}} {{- print ("---") | nindent 0 -}} {{- print ("\n") | nindent 0 -}} {{- $serviceValues := $service -}} - {{- /* Dont add name suffix for primary service named "main" */ -}} - {{- if or (not $serviceValues.nameSuffix) ( ne $name "main" ) -}} + + {{- /* Dont add name suffix for primary service named "main" */ -}} + {{- if and (not $serviceValues.nameSuffix) ( ne $name "main" ) -}} {{- $_ := set $serviceValues "nameSuffix" $name -}} {{ end -}} {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}} @@ -28,12 +29,13 @@ of the main Service and any additionalServices. {{- print ("---") | nindent 0 -}} {{- $serviceValues := $extraService -}} - {{- $name := ( $index | quote ) -}} + {{- $name := $index -}} {{- if $serviceValues.name -}} {{- $name := $serviceValues.name -}} {{- end }} - {{- if or (not $serviceValues.nameSuffix) ( ne $name "main" ) -}} + {{- /* Dont add name suffix for primary service named "main" */ -}} + {{- if and (not $serviceValues.nameSuffix) ( ne ( $name | quote ) "main" ) -}} {{- $_ := set $serviceValues "nameSuffix" $name -}} {{ end -}} {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}} diff --git a/library/common/templates/classes/_service.tpl b/library/common/templates/classes/_service.tpl index 3f2f5f65179..87a1a7178a2 100644 --- a/library/common/templates/classes/_service.tpl +++ b/library/common/templates/classes/_service.tpl @@ -27,11 +27,21 @@ within the common library. {{- $values = . -}} {{- end -}} {{ end -}} + {{- $serviceName := include "common.names.fullname" . -}} + + {{- if hasKey $values "nameSuffix" -}} {{- $serviceName = printf "%v-%v" $serviceName $values.nameSuffix -}} {{ end -}} {{- $svcType := $values.type | default "" -}} + +{{- $portProtocol := $values.port.type -}} +{{- if or ( eq $values.type "HTTP" ) ( eq $values.type "HTTPS" ) ( eq $values.type "TCP" ) -}} +{{- $portProtocol = "TCP" -}} +{{- else if eq $values.type "UDP" }} +{{- $portProtocol = "UDP" -}} +{{- end }} apiVersion: v1 kind: Service metadata: @@ -41,8 +51,11 @@ metadata: {{- if $values.labels }} {{ toYaml $values.labels | nindent 4 }} {{- end }} - {{- with $values.annotations }} annotations: + {{- if eq $svcType "HTTPS" }} + traefik.ingress.kubernetes.io/service.serversscheme: https + {{- end }} + {{- with $values.annotations }} {{ toYaml . | nindent 4 }} {{- end }} spec: diff --git a/library/common/templates/classes/_service_ports.tpl b/library/common/templates/classes/_service_ports.tpl index 9ecbb09f405..859c3ff5199 100644 --- a/library/common/templates/classes/_service_ports.tpl +++ b/library/common/templates/classes/_service_ports.tpl @@ -29,9 +29,15 @@ Render all the ports and additionalPorts for a Service object. {{- if $ports -}} ports: {{- range $_ := $ports }} + {{- $protocol := "" -}} + {{- if or ( eq .protocol "HTTP" ) ( eq .protocol "HTTPS" ) }} + {{- $protocol = "TCP" -}} + {{- else }} + {{- $protocol = .protocol | default "TCP" -}} + {{- end }} - port: {{ .port }} targetPort: {{ .targetPort | default .name | default "http" }} - protocol: {{ .protocol | default "TCP" }} + protocol: {{ $protocol | default "TCP" }} name: {{ .name | default "http" }} {{- if (and (eq $.svcType "NodePort") (not (empty .nodePort))) }} nodePort: {{ .nodePort }} diff --git a/library/common/templates/classes/ingress/_externalService.tpl b/library/common/templates/classes/ingress/_externalService.tpl new file mode 100644 index 00000000000..a2aedaf5f00 --- /dev/null +++ b/library/common/templates/classes/ingress/_externalService.tpl @@ -0,0 +1,63 @@ +{{- define "common.classes.externalService" -}} +{{- $serviceName := include "common.names.fullname" . -}} +{{- $values := .Values -}} +{{- $svcPort := 80 }} +{{- $ingressService := $.Values }} +{{- if hasKey . "ObjectValues" -}} + {{- with .ObjectValues.ingress -}} + {{- $values = . -}} + {{- end -}} +{{ end -}} + +{{- if hasKey $values "nameSuffix" -}} + {{- $serviceName = printf "%v-%v" $serviceName $values.nameSuffix -}} +{{ end -}} + +{{- $svcName := $values.serviceName | default $serviceName -}} + +{{- if $values.servicePort }} + {{- $svcPort = $values.servicePort -}} +{{- end }} + +apiVersion: v1 +kind: Service +metadata: + name: {{ $svcName }} + labels: + {{- include "common.labels" . | nindent 4 }} + annotations: + {{- if eq ( $values.serviceType | default "" ) "HTTPS" }} + traefik.ingress.kubernetes.io/service.serversscheme: https + {{- end }} + {{- with $values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + ports: +{{- if eq $values.type "UDP"}} + - protocol: UDP + port: {{ $values.servicePort }} + targetPort: {{ $values.servicePort }} +{{- else }} + - protocol: TCP + port: {{ $values.servicePort }} + targetPort: {{ $values.servicePort }} +{{- end }} +--- +apiVersion: v1 +kind: Endpoints +metadata: + name: {{ $svcName }} + labels: + {{- include "common.labels" . | nindent 4 }} + annotations: + {{- with $values.annotations }} + {{- toYaml . | nindent 4 }} + {{- end }} +subsets: + - addresses: + - ip: {{ $values.serviceTarget }} + ports: + - port: {{ $values.servicePort }} + +{{- end }} diff --git a/library/common/templates/classes/ingress/_ingress.tpl b/library/common/templates/classes/ingress/_ingress.tpl index 98826e96d8c..e25d9e11089 100644 --- a/library/common/templates/classes/ingress/_ingress.tpl +++ b/library/common/templates/classes/ingress/_ingress.tpl @@ -5,8 +5,9 @@ within the common library. {{- define "common.classes.ingress" -}} {{- $ingressName := include "common.names.fullname" . -}} {{- $values := .Values -}} -{{- $svcPort := 80 }} -{{- $ingressService := $.Values }} +{{- $svcPort := 80 -}} +{{- $portProtocol := "" -}} +{{- $ingressService := $.Values -}} {{- if hasKey . "ObjectValues" -}} {{- with .ObjectValues.ingress -}} {{- $values = . -}} @@ -16,11 +17,13 @@ within the common library. {{- if hasKey $values "nameSuffix" -}} {{- $ingressName = printf "%v-%v" $ingressName $values.nameSuffix -}} {{- if and ( $.Values.services ) ( not $values.servicePort ) }} - {{- $ingressService := index $.Values.services $values.nameSuffix }} - {{- $svcPort = $ingressService.port.port }} + {{- $ingressService := index $.Values.services ( $values.nameSuffix | quote ) }} + {{- $svcPort = $ingressService.port.port -}} + {{- $portProtocol = $ingressService.port.protocol | default "" }} {{ end -}} {{- else if and ( $.Values.services ) ( not $values.servicePort ) }} - {{- $svcPort = $.Values.services.main.port.port }} + {{- $svcPort = $.Values.services.main.port.port -}} + {{- $portProtocol = $.Values.services.main.port.protocol | default "" -}} {{ end -}} {{- $svcName := $values.serviceName | default $ingressName -}} @@ -29,6 +32,10 @@ within the common library. {{- $svcPort = $values.servicePort -}} {{- end }} +{{- if $values.serviceType }} + {{- $portProtocol = $values.serviceType -}} +{{- end }} + apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }} kind: Ingress metadata: @@ -36,6 +43,9 @@ metadata: labels: {{- include "common.labels" . | nindent 4 }} annotations: + {{- if eq $portProtocol "HTTPS" }} + traefik.ingress.kubernetes.io/service.serversscheme: https + {{- end }} traefik.ingress.kubernetes.io/router.entrypoints: {{ $values.entrypoint }} traefik.ingress.kubernetes.io/router.middlewares: traefik-middlewares-chain-public@kubernetescrd{{ if $values.authForwardURL }},{{ $ingressName }}-auth-forward{{ end }} {{- with $values.annotations }} @@ -47,51 +57,45 @@ spec: ingressClassName: {{ $values.ingressClassName }} {{- end }} {{- end }} - {{- if or ( eq $values.certType "selfsigned") (eq $values.certType "ixcert") ( $values.tls ) }} + {{- if or ( eq $values.certType "selfsigned") (eq $values.certType "ixcert") }} tls: - {{- if $values.tls }} - {{- range $values.tls }} - hosts: - {{- if and ( not .hosts ) ( not .hostsTpl ) }} + {{- if $values.host}} + - {{ $values.host | quote }} + {{- else }} {{- range $values.hosts }} - {{ .host | quote }} {{- end }} - {{- end }} - {{- range .hosts }} - - {{ . | quote }} {{- end }} - {{- range .hostsTpl }} - - {{ tpl . $ | quote }} - {{- end }} - {{- if .secretNameTpl }} - secretName: {{ tpl .secretNameTpl $ | quote}} - {{- else if eq $values.certType "ixcert" }} - secretName: {{ $ingressName }} - {{- else if .secretName }} - secretName: {{ .secretName }} + {{- if eq $values.certType "ixcert" }} + secretName: {{ $ingressName }} {{- end }} - {{- end }} - {{- else }} - - hosts: - {{- range $values.hosts }} - - {{ .host | quote }} - {{- end }} - {{- if eq $values.certType "ixcert" }} - secretName: {{ $ingressName }} - {{- end }} - {{- end }} {{- end }} rules: - {{- range $values.hosts }} - {{- if .hostTpl }} - - host: {{ tpl .hostTpl $ | quote }} - {{- else }} - - host: {{ .host | quote }} - {{- end }} + {{- if $values.host }} + - host: {{ $values.host | quote }} http: paths: - {{- range .paths }} - - path: {{ .path }} + - path: {{ $values.path | default "/" }} + {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }} + pathType: Prefix + {{- end }} + backend: + {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }} + service: + name: {{ $svcName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $svcName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- range $values.hosts }} + - host: {{ .host | quote }} + http: + paths: + - path: {{ .path | default "/" }} {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }} pathType: Prefix {{- end }} @@ -105,6 +109,5 @@ spec: serviceName: {{ $svcName }} servicePort: {{ $svcPort }} {{- end }} - {{- end }} {{- end }} {{- end }} diff --git a/library/common/templates/classes/ingress/_ingressRoute.tpl b/library/common/templates/classes/ingress/_ingressRoute.tpl index 4a06e15aedd..643a6d2e37b 100644 --- a/library/common/templates/classes/ingress/_ingressRoute.tpl +++ b/library/common/templates/classes/ingress/_ingressRoute.tpl @@ -6,6 +6,7 @@ within the common library. {{- $ingressName := include "common.names.fullname" . -}} {{- $values := .Values -}} {{- $svcPort := 80 }} +{{- $portProtocol := "" }} {{- $ingressService := $.Values }} {{- if hasKey . "ObjectValues" -}} {{- with .ObjectValues.ingress -}} @@ -16,17 +17,23 @@ within the common library. {{- if hasKey $values "nameSuffix" -}} {{- $ingressName = printf "%v-%v" $ingressName $values.nameSuffix -}} {{- if and ( $.Values.services ) ( not $values.servicePort ) }} - {{- $ingressService := index $.Values.services $values.nameSuffix }} + {{- $ingressService := index $.Values.services ( $values.nameSuffix | quote) }} {{- $svcPort = $ingressService.port.port }} + {{- $portProtocol = $ingressService.port.protocol | default "" }} {{ end -}} {{- else if and ( $.Values.services ) ( not $values.servicePort ) }} {{- $svcPort = $.Values.services.main.port.port }} + {{- $portProtocol = $.Values.services.main.port.protocol | default "" }} {{ end -}} {{- $svcName := $values.serviceName | default $ingressName -}} {{- if $values.servicePort }} - {{- $svcPort = $values.servicePort -}} + {{- $svcPort = $values.servicePort }} +{{- end }} + +{{- if $values.serviceType }} + {{- $portProtocol = $values.serviceType }} {{- end }} apiVersion: traefik.containo.us/v1alpha1 @@ -63,7 +70,7 @@ spec: terminationDelay: 400 {{- else }} - kind: Rule - match: Host(`{{ (index $values.hosts 0).host }}`) + match: Host(`{{ (index $values.hosts 0).host }}`) && PathPrefix(`{{ (index $values.hosts 0).path | default "/" }}`) services: - name: {{ $svcName }} {{- if $values.serviceKind }} @@ -87,35 +94,8 @@ spec: {{- range $values.hosts }} - {{ .host | quote }} {{- end }} - - {{- if $values.tls }} - {{- range $values.tls }} - - {{- if .hosts }} - - main: {{ index .hosts 0 }} - {{- range .hosts }} - sans: - {{- range .hosts }} - - {{ . | quote }} - {{- end }} - {{- end }} - {{- end }} - - {{- if .hosts }} - - main: {{ index .hostsTpl 0 }} - {{- range .hosts }} - sans: - {{- range .hostsTpl }} - - {{ tpl . $ | quote }} - {{- end }} - {{- end }} - {{- end }} - - {{- end }} - {{- end }} - - {{- if eq $values.certType "ixcert" }} - secretName: {{ $ingressName }} + {{- if eq $values.certType "ixcert" }} + secretName: {{ $ingressName }} {{- end }} passthrough: false diff --git a/library/common/templates/lib/controller/_ports.tpl b/library/common/templates/lib/controller/_ports.tpl index decbda49b7d..528b233d991 100644 --- a/library/common/templates/lib/controller/_ports.tpl +++ b/library/common/templates/lib/controller/_ports.tpl @@ -25,9 +25,9 @@ Ports included by the controller. {{/* append the ports for each appAdditionalService - TrueCharts */}} {{- if $.Values.services -}} {{- range $name, $_ := $.Values.services }} - {{- if or ( .enabled ) ( eq $name "main" ) -}} - {{- if eq $name "main" -}} - {{- $_ := set .port "name" (default "http" .port.name) -}} + {{- if or ( .enabled ) ( eq $name "main" ) -}} + {{- if eq $name "main" -}} + {{- $_ := set .port "name" (default "http" .port.name) -}} {{- else if kindIs "string" $name -}} {{- $_ := set .port "name" (default .port.name | default $name) -}} {{- else -}} @@ -59,12 +59,18 @@ Ports included by the controller. {{- if $ports -}} ports: {{- range $_ := $ports }} +{{- $protocol := "" -}} +{{- if or ( eq .protocol "HTTP" ) ( eq .protocol "HTTPS" ) }} + {{- $protocol = "TCP" -}} +{{- else }} + {{- $protocol = .protocol | default "TCP" -}} +{{- end }} - name: {{ required "The port's 'name' is not defined" .name }} {{- if and .targetPort (kindIs "string" .targetPort) }} {{- fail (printf "Our charts do not support named ports for targetPort. (port name %s, targetPort %s)" .name .targetPort) }} {{- end }} containerPort: {{ .targetPort | default .port }} - protocol: {{ .protocol | default "TCP" }} + protocol: {{ $protocol | default "TCP" }} {{- end -}} {{- end -}} {{- end -}} diff --git a/library/common/templates/lib/resources/_portal_config.tpl b/library/common/templates/lib/resources/_portal_config.tpl index 2ac8b4b1b75..05006b9acdf 100644 --- a/library/common/templates/lib/resources/_portal_config.tpl +++ b/library/common/templates/lib/resources/_portal_config.tpl @@ -5,16 +5,17 @@ {{- $host := "$node_ip" }} {{- $port := 443 }} {{- $protocol := "https" }} +{{- $portProtocol := "" }} {{- if hasKey .Values "ingress" }} {{- if hasKey .Values.ingress "main" -}} + {{- if .Values.ingress.main.host }} + {{- $host = .Values.ingress.main.host }} + {{- else }} {{- range .Values.ingress.main.hosts }} - {{- if .hostTpl }} - {{- $host = ( tpl .hostTpl $ | quote ) }} - {{- else }} {{- $host = ( .host | quote ) }} - {{- end }} {{- end }} + {{- end }} {{- end }} {{- end }} @@ -24,12 +25,15 @@ {{- 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 }} + {{- if or ( eq .Values.services.main.port.protocol "HTTP" ) ( eq .Values.services.main.port.protocol "HTTPS" ) }} + {{- $portProtocol = .Values.services.main.port.protocol }} + {{- end }} {{- end }} {{- end }} {{- end }} -{{- if and (.Values.portal.nodePortProtocol ) ( eq $host "$node_ip" ) }} - {{- $protocol = .Values.portal.nodePortProtocol }} +{{- if and ( $portProtocol ) ( eq $host "$node_ip" ) }} + {{- $protocol = $portProtocol }} {{- else if and ( ne $host "$node_ip" ) }} {{- if .Values.ingress.main.certType }} {{- if eq .Values.ingress.main.certType "" }} diff --git a/library/common/values.yaml b/library/common/values.yaml index 08efbf2ab71..9ade85abae9 100644 --- a/library/common/values.yaml +++ b/library/common/values.yaml @@ -193,21 +193,7 @@ additionalServices: [] # labels: {} # hosts: # - host: chart-example.local -# ## Or a tpl that is evaluated -# # hostTpl: '{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.{{ .Values.ingress.domainname }}' -# paths: -# - path: / -# # Ignored if not kubeVersion >= 1.14-0 -# pathType: Prefix -# tls: [] -# # - secretName: chart-example-tls -# ## Or if you need a dynamic secretname -# # - secretNameTpl: '{{ include "common.names.fullname" . }}-ingress' -# # hosts: -# # - chart-example.local -# ## Or a tpl that is evaluated -# # hostsTpl: -# # - '{{ include "common.names.fullname" . }}.{{ .Release.Namespace }}.{{ .Values.ingress.domainname }}' +# path: / # additionalIngresses: [] # - enabled: false # nameSuffix: "api"