diff --git a/charts/enterprise/traefik/Chart.yaml b/charts/enterprise/traefik/Chart.yaml index cbe5d0a84dd..54c989342ff 100644 --- a/charts/enterprise/traefik/Chart.yaml +++ b/charts/enterprise/traefik/Chart.yaml @@ -1,7 +1,7 @@ kubeVersion: ">=1.24.0-0" apiVersion: v2 name: traefik -version: 23.0.8 +version: 24.0.0 appVersion: 2.10.5 description: Traefik is a flexible reverse proxy and Ingress Provider. home: https://truecharts.org/charts/enterprise/traefik diff --git a/charts/enterprise/traefik/ci/ci-values.yaml b/charts/enterprise/traefik/ci/ci-values.yaml new file mode 100644 index 00000000000..43cdf423f25 --- /dev/null +++ b/charts/enterprise/traefik/ci/ci-values.yaml @@ -0,0 +1,11 @@ + +# -- Options for the main traefik service, where the entrypoints traffic comes from +# from. +service: + tcp: + ports: + web: + port: 9080 + websecure: + port: 9443 + diff --git a/charts/enterprise/traefik/docs/how-to.md b/charts/enterprise/traefik/docs/how-to.md index 5cf83b61d79..4e2bdea26e9 100644 --- a/charts/enterprise/traefik/docs/how-to.md +++ b/charts/enterprise/traefik/docs/how-to.md @@ -50,11 +50,8 @@ find the Traefik app in the list of apps, and click **Install** The setup of Traefik is relatively straight-forward. Most of the settings remain unchanged from default, except for these two: - **Application Name**: Enter a name for your app. You may use simply _traefik_ for this field. -- **Networking and Services**: Under TCP Services, find and change: - - **web Entrypoint Configuration** > **Entrypoints port:** - Change port `9080` to port `80` - - **websecure Entrypoint Configuration** > **Entrypoints port:** - Change port `9443` to port `443` +- At the bottom, check the warning checkbox. + Continue to section 12, and select **Next**. Traefik will now be installed. After installation you can access the Traefik dashboard using your host IP address followed by `:9000`, or by simply clicking "Web Portal" on the application's entry under **Apps** > **Installed Applications**. diff --git a/charts/enterprise/traefik/questions.yaml b/charts/enterprise/traefik/questions.yaml index 17a6dae57dd..0032d07d5f9 100644 --- a/charts/enterprise/traefik/questions.yaml +++ b/charts/enterprise/traefik/questions.yaml @@ -247,7 +247,7 @@ questions: label: "Entrypoints Port" schema: type: int - default: 9080 + default: 80 required: true - variable: advanced label: Show Advanced Settings @@ -277,7 +277,7 @@ questions: label: "Entrypoints Port" schema: type: int - default: 9443 + default: 443 required: true - variable: advanced label: Show Advanced Settings @@ -415,3 +415,18 @@ questions: # Include{netshoot} # Include{vpn} # Include{documentation} + + - variable: warning + group: Documentation + label: 'WARNING: If installed, be sure to move the TrueNAS GUI to another port (not 80 or 443).' + description: 'See:
https://truecharts.org/charts/enterprise/traefik/how-to for more info.' + schema: + additional_attrs: true + type: dict + attrs: + - variable: warningconfim + label: I am aware that I will brick my system, if I did not follow the instructions. + schema: + type: boolean + default: false + required: true diff --git a/charts/enterprise/traefik/values.yaml b/charts/enterprise/traefik/values.yaml index 402e0e37081..6e3f6d7ac72 100644 --- a/charts/enterprise/traefik/values.yaml +++ b/charts/enterprise/traefik/values.yaml @@ -180,7 +180,7 @@ service: ports: web: enabled: true - port: 9080 + port: 80 protocol: http redirectTo: websecure # Options: Empty, 0 (ingore), or positive int @@ -201,7 +201,7 @@ service: insecureMode: false websecure: enabled: true - port: 9443 + port: 443 protocol: https # -- Configure (Forwarded Headers)[https://doc.traefik.io/traefik/routing/entrypoints/#forwarded-headers] Support forwardedHeaders: