From 3e0ffec07cf873e7d47c225f9fbcdb9910ddc468 Mon Sep 17 00:00:00 2001 From: htiryaki-oe24 <67585539+htiryaki-oe24@users.noreply.github.com> Date: Mon, 23 Feb 2026 22:55:40 +0100 Subject: [PATCH] Fixes minor chart issues #629 (#630) --- deploy/helm/Chart.yaml | 2 +- deploy/helm/README.md | 6 +++++- deploy/helm/templates/_service.tpl | 2 +- deploy/helm/templates/deployment.yaml | 3 +++ deploy/helm/templates/ingress.yaml | 2 +- deploy/helm/templates/statefulset.yaml | 3 +++ deploy/helm/values.yaml | 11 +++++++++++ 7 files changed, 25 insertions(+), 4 deletions(-) diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index 609566e..882a2a4 100644 --- a/deploy/helm/Chart.yaml +++ b/deploy/helm/Chart.yaml @@ -16,7 +16,7 @@ annotations: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.2 +version: 0.7.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/deploy/helm/README.md b/deploy/helm/README.md index 4cfcd27..58cccc7 100644 --- a/deploy/helm/README.md +++ b/deploy/helm/README.md @@ -1,6 +1,6 @@ # wg-portal -![Version: 0.7.2](https://img.shields.io/badge/Version-0.7.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2](https://img.shields.io/badge/AppVersion-v2-informational?style=flat-square) +![Version: 0.7.3](https://img.shields.io/badge/Version-0.7.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2](https://img.shields.io/badge/AppVersion-v2-informational?style=flat-square) WireGuard Configuration Portal with LDAP, OAuth, OIDC authentication @@ -41,6 +41,7 @@ The [Values](#values) section lists the parameters that can be configured during | config.web | tpl/object | `{}` | [Web configuration](https://wgportal.org/latest/documentation/configuration/overview/#web) options.
`listening_address` will be set automatically from `service.web.port`. `external_url` is required to enable ingress and certificate resources. | | revisionHistoryLimit | string | `10` | The number of old ReplicaSets to retain to allow rollback. | | workloadType | string | `"Deployment"` | Workload type - `Deployment` or `StatefulSet` | +| replicas | int | `1` | The replicas for the workload. | | strategy | object | `{"type":"RollingUpdate"}` | Update strategy for the workload Valid values are: `RollingUpdate` or `Recreate` for Deployment, `RollingUpdate` or `OnDelete` for StatefulSet | | image.repository | string | `"ghcr.io/h44z/wg-portal"` | Image repository | | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy | @@ -74,12 +75,15 @@ The [Values](#values) section lists the parameters that can be configured during | service.web.type | string | `"ClusterIP"` | Web service type | | service.web.port | int | `8888` | Web service port Used for the web interface listener | | service.web.appProtocol | string | `"http"` | Web service appProtocol. Will be auto set to `https` if certificate is enabled. | +| service.web.extraSelectorLabels | object | `{}` | Extra labels to append to the selector labels. | | service.wireguard.annotations | object | `{}` | Annotations for the WireGuard service | | service.wireguard.type | string | `"LoadBalancer"` | Wireguard service type | | service.wireguard.ports | list | `[51820]` | Wireguard service ports. Exposes the WireGuard ports for created interfaces. Lowerest port is selected as start port for the first interface. Increment next port by 1 for each additional interface. | +| service.wireguard.extraSelectorLabels | object | `{}` | Extra labels to append to the selector labels. | | service.metrics.port | int | `8787` | | | ingress.enabled | bool | `false` | Specifies whether an ingress resource should be created | | ingress.className | string | `""` | Ingress class name | +| ingress.pathType | string | `"ImplementationSpecific"` | Ingress pathType value. Valid values are `ImplementationSpecific`, `Exact` or `Prefix`. | | ingress.annotations | object | `{}` | Ingress annotations | | ingress.tls | bool | `false` | Ingress TLS configuration. Enable certificate resource or add ingress annotation to create required secret | | certificate.enabled | bool | `false` | Specifies whether a certificate resource should be created. If enabled, certificate will be used for the web. | diff --git a/deploy/helm/templates/_service.tpl b/deploy/helm/templates/_service.tpl index 7e6cdb6..3aaf12e 100644 --- a/deploy/helm/templates/_service.tpl +++ b/deploy/helm/templates/_service.tpl @@ -49,7 +49,7 @@ spec: {{- with .scope.type }} type: {{ . }} {{- end }} - selector: {{- include "wg-portal.selectorLabels" .context | nindent 4 }} + selector: {{- include "wg-portal.util.merge" (list .context .scope.extraSelectorLabels "wg-portal.selectorLabels") | nindent 4 }} {{- end -}} {{/* diff --git a/deploy/helm/templates/deployment.yaml b/deploy/helm/templates/deployment.yaml index 8d2db04..b3eb17c 100644 --- a/deploy/helm/templates/deployment.yaml +++ b/deploy/helm/templates/deployment.yaml @@ -8,6 +8,9 @@ spec: {{- with .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ . }} {{- end }} + {{- with .Values.replicas }} + replicas: {{ . }} + {{- end }} {{- with .Values.strategy }} strategy: {{- toYaml . | nindent 4 }} {{- end }} diff --git a/deploy/helm/templates/ingress.yaml b/deploy/helm/templates/ingress.yaml index be0370e..4022824 100644 --- a/deploy/helm/templates/ingress.yaml +++ b/deploy/helm/templates/ingress.yaml @@ -15,7 +15,7 @@ spec: http: paths: - path: {{ default "/" (urlParse (tpl .Values.config.web.external_url .)).path }} - pathType: {{ default "ImplementationSpecific" .pathType }} + pathType: {{ default "ImplementationSpecific" .Values.ingress.pathType }} backend: service: name: {{ include "wg-portal.fullname" . }} diff --git a/deploy/helm/templates/statefulset.yaml b/deploy/helm/templates/statefulset.yaml index e25870e..33aa6b3 100644 --- a/deploy/helm/templates/statefulset.yaml +++ b/deploy/helm/templates/statefulset.yaml @@ -8,6 +8,9 @@ spec: {{- with .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ . }} {{- end }} + {{- with .Values.replicas }} + replicas: {{ . }} + {{- end }} {{- with .Values.strategy }} updateStrategy: {{- toYaml . | nindent 4 }} {{- end }} diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml index bb103e6..76a137a 100644 --- a/deploy/helm/values.yaml +++ b/deploy/helm/values.yaml @@ -35,6 +35,9 @@ config: revisionHistoryLimit: "" # -- Workload type - `Deployment` or `StatefulSet` workloadType: Deployment +# -- The replicas for the workload. +# @default -- `1` +replicas: 1 # -- Update strategy for the workload # Valid values are: # `RollingUpdate` or `Recreate` for Deployment, @@ -124,6 +127,8 @@ service: port: 8888 # -- Web service appProtocol. Will be auto set to `https` if certificate is enabled. appProtocol: http + # -- Extra labels to append to the selector labels. + extraSelectorLabels: {} wireguard: # -- Annotations for the WireGuard service annotations: {} @@ -135,6 +140,8 @@ service: # Increment next port by 1 for each additional interface. ports: - 51820 + # -- Extra labels to append to the selector labels. + extraSelectorLabels: {} metrics: port: 8787 @@ -143,6 +150,10 @@ ingress: enabled: false # -- Ingress class name className: "" + # -- Ingress pathType value. + # Valid values are `ImplementationSpecific`, `Exact` or `Prefix`. + # @default -- `"ImplementationSpecific"` + pathType: "ImplementationSpecific" # -- Ingress annotations annotations: {} # -- Ingress TLS configuration.