diff --git a/charts/develop/nextcloud/.helmignore b/charts/stable/nextcloud/.helmignore similarity index 100% rename from charts/develop/nextcloud/.helmignore rename to charts/stable/nextcloud/.helmignore diff --git a/charts/develop/nextcloud/CONFIG.md b/charts/stable/nextcloud/CONFIG.md similarity index 100% rename from charts/develop/nextcloud/CONFIG.md rename to charts/stable/nextcloud/CONFIG.md diff --git a/charts/develop/nextcloud/Chart.yaml b/charts/stable/nextcloud/Chart.yaml similarity index 100% rename from charts/develop/nextcloud/Chart.yaml rename to charts/stable/nextcloud/Chart.yaml diff --git a/charts/develop/nextcloud/README.md b/charts/stable/nextcloud/README.md similarity index 100% rename from charts/develop/nextcloud/README.md rename to charts/stable/nextcloud/README.md diff --git a/charts/develop/nextcloud/SCALE/item.yaml b/charts/stable/nextcloud/SCALE/item.yaml similarity index 100% rename from charts/develop/nextcloud/SCALE/item.yaml rename to charts/stable/nextcloud/SCALE/item.yaml diff --git a/charts/develop/nextcloud/SCALE/ix_values.yaml b/charts/stable/nextcloud/SCALE/ix_values.yaml similarity index 100% rename from charts/develop/nextcloud/SCALE/ix_values.yaml rename to charts/stable/nextcloud/SCALE/ix_values.yaml diff --git a/charts/develop/nextcloud/SCALE/questions.yaml b/charts/stable/nextcloud/SCALE/questions.yaml similarity index 99% rename from charts/develop/nextcloud/SCALE/questions.yaml rename to charts/stable/nextcloud/SCALE/questions.yaml index 8b7a305de6d..23c8aedf6e5 100644 --- a/charts/develop/nextcloud/SCALE/questions.yaml +++ b/charts/stable/nextcloud/SCALE/questions.yaml @@ -276,8 +276,7 @@ questions: label: "Enable the service" schema: type: boolean - default: true - hidden: true + default: false - variable: type label: "Service Type" description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer" diff --git a/charts/develop/nextcloud/templates/_configmap.tpl b/charts/stable/nextcloud/templates/_configmap.tpl similarity index 100% rename from charts/develop/nextcloud/templates/_configmap.tpl rename to charts/stable/nextcloud/templates/_configmap.tpl diff --git a/charts/develop/nextcloud/templates/_cronjob.tpl b/charts/stable/nextcloud/templates/_cronjob.tpl similarity index 100% rename from charts/develop/nextcloud/templates/_cronjob.tpl rename to charts/stable/nextcloud/templates/_cronjob.tpl diff --git a/charts/develop/nextcloud/templates/_secrets.tpl b/charts/stable/nextcloud/templates/_secrets.tpl similarity index 100% rename from charts/develop/nextcloud/templates/_secrets.tpl rename to charts/stable/nextcloud/templates/_secrets.tpl diff --git a/charts/develop/nextcloud/templates/common.yaml b/charts/stable/nextcloud/templates/common.yaml similarity index 100% rename from charts/develop/nextcloud/templates/common.yaml rename to charts/stable/nextcloud/templates/common.yaml diff --git a/charts/develop/nextcloud/values.yaml b/charts/stable/nextcloud/values.yaml similarity index 100% rename from charts/develop/nextcloud/values.yaml rename to charts/stable/nextcloud/values.yaml diff --git a/charts/stable/traefik/Chart.yaml b/charts/stable/traefik/Chart.yaml index 42fd826c872..97da7802cf4 100644 --- a/charts/stable/traefik/Chart.yaml +++ b/charts/stable/traefik/Chart.yaml @@ -26,4 +26,4 @@ sources: - https://traefik.io/ type: application upstream_version: v9.19.2 -version: 6.4.1 +version: 6.5.0 diff --git a/charts/stable/traefik/SCALE/questions.yaml b/charts/stable/traefik/SCALE/questions.yaml index fe39b424f9c..cd789217895 100644 --- a/charts/stable/traefik/SCALE/questions.yaml +++ b/charts/stable/traefik/SCALE/questions.yaml @@ -150,6 +150,82 @@ questions: schema: type: string default: "" + - variable: chain + label: "chain" + schema: + type: list + default: [] + items: + - variable: chainEntry + label: "" + schema: + type: dict + attrs: + - variable: middlewares + label: "Middlewares to Chain" + schema: + type: list + default: [] + items: + - variable: name + label: "Name" + schema: + type: string + required: true + default: "" + + - variable: redirectScheme + label: "redirectScheme" + schema: + type: list + default: [] + items: + - variable: redirectSchemeEntry + label: "" + schema: + type: dict + attrs: + - variable: scheme + label: "Scheme" + schema: + type: string + required: true + default: "https" + enum: + - value: "https" + description: "https" + - value: "http" + description: "http" + - variable: permanent + label: "Permanent" + schema: + type: boolean + required: true + default: false + + - variable: rateLimit + label: "rateLimit" + schema: + type: list + default: [] + items: + - variable: rateLimitEntry + label: "" + schema: + type: dict + attrs: + - variable: average + label: "Average" + schema: + type: int + required: true + default: 300 + - variable: burst + label: "Burst" + schema: + type: int + required: true + default: 200 - variable: hostNetwork group: "Networking and Services" diff --git a/charts/stable/traefik/templates/custom/middlewares/basic-middleware.yaml b/charts/stable/traefik/templates/custom/middlewares/basic-middleware.yaml index 73d39aded4e..2c163e9e480 100644 --- a/charts/stable/traefik/templates/custom/middlewares/basic-middleware.yaml +++ b/charts/stable/traefik/templates/custom/middlewares/basic-middleware.yaml @@ -1,3 +1,4 @@ +--- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: @@ -18,6 +19,17 @@ spec: average: 300 burst: 200 --- +# This ensures http is redirected to https even when the websecure port is set to 9443 +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: basic-redirectscheme + namespace: traefikmiddlewares +spec: + redirectScheme: + scheme: https + permanent: true +--- apiVersion: traefik.containo.us/v1alpha1 kind: Middleware metadata: diff --git a/charts/stable/traefik/templates/custom/middlewares/chain.yaml b/charts/stable/traefik/templates/custom/middlewares/chain.yaml new file mode 100644 index 00000000000..b6850029d3e --- /dev/null +++ b/charts/stable/traefik/templates/custom/middlewares/chain.yaml @@ -0,0 +1,16 @@ +{{ range $index, $middlewareData := .Values.middlewares.chain }} + +--- +# Declaring the user list +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: {{ $middlewareData.name }} + namespace: traefikmiddlewares +spec: + chain: + middlewares: + {{ range $index, $chainData := .Values.middlewares.chainmiddlewares }} + - name: {{ $chainData.name }} + {{ end }} +{{ end }} diff --git a/charts/stable/traefik/templates/custom/middlewares/ratelimit.yaml b/charts/stable/traefik/templates/custom/middlewares/ratelimit.yaml new file mode 100644 index 00000000000..b4bfa938e6e --- /dev/null +++ b/charts/stable/traefik/templates/custom/middlewares/ratelimit.yaml @@ -0,0 +1,14 @@ +{{ range $index, $middlewareData := .Values.middlewares.rateLimit }} + +--- +# Declaring the user list +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: {{ $middlewareData.name }} + namespace: traefikmiddlewares +spec: + rateLimit: + average: {{ $middlewareData.average }} + burst: {{ $middlewareData.burst }} +{{ end }} diff --git a/charts/stable/traefik/templates/custom/middlewares/redirectScheme.yaml b/charts/stable/traefik/templates/custom/middlewares/redirectScheme.yaml new file mode 100644 index 00000000000..070c8fc4a90 --- /dev/null +++ b/charts/stable/traefik/templates/custom/middlewares/redirectScheme.yaml @@ -0,0 +1,14 @@ +{{ range $index, $middlewareData := .Values.middlewares.redirectScheme }} + +--- +# Declaring the user list +apiVersion: traefik.containo.us/v1alpha1 +kind: Middleware +metadata: + name: {{ $middlewareData.name }} + namespace: traefikmiddlewares +spec: + redirectScheme: + scheme: {{ $middlewareData.scheme }} + permanent: {{ $middlewareData.permanent }} +{{ end }} diff --git a/charts/stable/traefik/values.yaml b/charts/stable/traefik/values.yaml index 74e6d4760b6..33d641df83c 100644 --- a/charts/stable/traefik/values.yaml +++ b/charts/stable/traefik/values.yaml @@ -424,3 +424,12 @@ middlewares: # - "X-CustomHeader" # authResponseHeadersRegex: "^X-" # trustForwardHeader: true + chain: [] + # middlewares: + # - name: compress + redirectScheme: [] + # scheme: https + # permanent: true + rateLimit: [] + # average: 300 + # burst: 200