From fbee12c66320b0f39482ae73830721747889f96e Mon Sep 17 00:00:00 2001 From: Marc Portabella Date: Wed, 11 Jun 2025 00:48:01 +0200 Subject: [PATCH 1/2] chore: chart updates --- charts/netbird/Chart.yaml | 4 +- charts/netbird/README.md | 23 +++++--- .../nginx-ingress/authentik/values.yaml | 10 +--- .../templates/dashboard-deployment.yaml | 8 +++ .../templates/management-deployment.yaml | 7 ++- .../netbird/templates/relay-deployment.yaml | 8 +++ .../netbird/templates/signal-deployment.yaml | 8 +++ charts/netbird/values.yaml | 59 +++++++++++++++---- 8 files changed, 96 insertions(+), 31 deletions(-) diff --git a/charts/netbird/Chart.yaml b/charts/netbird/Chart.yaml index f61183f..636ad87 100644 --- a/charts/netbird/Chart.yaml +++ b/charts/netbird/Chart.yaml @@ -3,6 +3,6 @@ apiVersion: v2 name: netbird description: NetBird VPN management platform type: application -version: 1.6.1 -appVersion: "0.36.5" +version: 1.8.0 +appVersion: "0.46.0" icon: https://images.crunchbase.com/image/upload/c_pad,h_256,w_256,f_auto,q_auto:eco,dpr_1/kuu5tm1wt09ztp6ctlag diff --git a/charts/netbird/README.md b/charts/netbird/README.md index 08443aa..4384573 100644 --- a/charts/netbird/README.md +++ b/charts/netbird/README.md @@ -1,7 +1,7 @@ # netbird Forked from [TOT MICRO's Helm Repository](https://github.com/totmicro/helms). -![Version: 1.6.1](https://img.shields.io/badge/Version-1.6.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.36.5](https://img.shields.io/badge/AppVersion-0.36.5-informational?style=flat-square) +![Version: 1.8.0](https://img.shields.io/badge/Version-1.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.45.1-informational?style=flat-square) # NetBird Helm Chart @@ -42,8 +42,12 @@ This will remove all the resources associated with the release. The following table lists the configurable parameters of the NetBird Helm chart and their default values. +## Values + | Key | Type | Default | Description | |-----|------|---------|-------------| +| dashboard.volumeMounts | list | `[]` | | +| dashboard.volumes | list | `[]` | | | dashboard.affinity | object | `{}` | | | dashboard.containerPort | int | `80` | | | dashboard.enabled | bool | `true` | | @@ -52,7 +56,7 @@ The following table lists the configurable parameters of the NetBird Helm chart | dashboard.envRaw | list | `[]` | | | dashboard.image.pullPolicy | string | `"IfNotPresent"` | | | dashboard.image.repository | string | `"netbirdio/dashboard"` | | -| dashboard.image.tag | string | `"v2.9.0"` | | +| dashboard.image.tag | string | `"v2.13.1"` | | | dashboard.imagePullSecrets | list | `[]` | | | dashboard.ingress.annotations | object | `{}` | | | dashboard.ingress.className | string | `""` | | @@ -86,11 +90,12 @@ The following table lists the configurable parameters of the NetBird Helm chart | extraManifests | object | `{}` | | | fullnameOverride | string | `""` | | | global.namespace | string | `""` | | +| management.volumeMounts | list | `[]` | | +| management.volumes | list | `[]` | | | management.affinity | object | `{}` | | | management.configmap | string | `""` | | | management.containerPort | int | `80` | | | management.deploymentAnnotations | object | `{}` | | -| management.dnsDomain | string | `"netbird.selfhosted"` | | | management.enabled | bool | `true` | | | management.env | object | `{}` | | | management.envFromSecret | object | `{}` | | @@ -125,15 +130,15 @@ The following table lists the configurable parameters of the NetBird Helm chart | management.nodeSelector | object | `{}` | | | management.persistentVolume.accessModes[0] | string | `"ReadWriteOnce"` | | | management.persistentVolume.enabled | bool | `true` | | -| management.persistentVolume.size | string | `"10Mi"` | | -| management.persistentVolume.storageClass | string | `null` | | | management.persistentVolume.existingPVName | string | `""` | | +| management.persistentVolume.size | string | `"10Mi"` | | +| management.persistentVolume.storageClass | string | `nil` | | | management.podAnnotations | object | `{}` | | | management.podCommand.args[0] | string | `"--port=80"` | | | management.podCommand.args[1] | string | `"--log-file=console"` | | | management.podCommand.args[2] | string | `"--log-level=info"` | | | management.podCommand.args[3] | string | `"--disable-anonymous-metrics=false"` | | -| management.podCommand.args[4] | string | `"--single-account-mode-domain=netbird.example.com"` | | +| management.podCommand.args[4] | string | `"--single-account-mode-domain=netbird.selfhosted"` | | | management.podCommand.args[5] | string | `"--dns-domain=netbird.selfhosted"` | | | management.podSecurityContext | object | `{}` | | | management.readinessProbe.failureThreshold | int | `3` | | @@ -167,7 +172,10 @@ The following table lists the configurable parameters of the NetBird Helm chart | metrics.serviceMonitor.scrapeTimeout | string | `""` | | | metrics.serviceMonitor.selector | object | `{}` | | | nameOverride | string | `""` | | +| relay.volumeMounts | list | `[]` | | +| relay.volumes | list | `[]` | | | relay.affinity | object | `{}` | | +| relay.containerPort | int | `33080` | | | relay.deploymentAnnotations | object | `{}` | | | relay.enabled | bool | `true` | | | relay.env | object | `{}` | | @@ -188,7 +196,6 @@ The following table lists the configurable parameters of the NetBird Helm chart | relay.livenessProbe.periodSeconds | int | `5` | | | relay.livenessProbe.tcpSocket.port | string | `"http"` | | | relay.logLevel | string | `"info"` | | -| relay.metrics.containerPort | int | `33080` | | | relay.metrics.enabled | bool | `false` | | | relay.metrics.port | int | `9090` | | | relay.nodeSelector | object | `{}` | | @@ -207,6 +214,8 @@ The following table lists the configurable parameters of the NetBird Helm chart | relay.serviceAccount.create | bool | `true` | | | relay.serviceAccount.name | string | `""` | | | relay.tolerations | list | `[]` | | +| signal.volumeMounts | list | `[]` | | +| signal.volumes | list | `[]` | | | signal.affinity | object | `{}` | | | signal.containerPort | int | `80` | | | signal.deploymentAnnotations | object | `{}` | | diff --git a/charts/netbird/examples/nginx-ingress/authentik/values.yaml b/charts/netbird/examples/nginx-ingress/authentik/values.yaml index 0278b0a..eb529d1 100644 --- a/charts/netbird/examples/nginx-ingress/authentik/values.yaml +++ b/charts/netbird/examples/nginx-ingress/authentik/values.yaml @@ -91,6 +91,7 @@ management: "AuthorizationEndpoint": "https://idp.example.com/application/o/authorize/", "Scope": "openid profile email offline_access api", "UseIDToken": false, + "DisablePromptLogin": true, "RedirectURLs": ["http://localhost:53000"] } }, @@ -104,9 +105,6 @@ management: } } - image: - tag: 0.32.0 - ingress: enabled: true className: public @@ -156,8 +154,6 @@ management: IDP_SERVICE_ACCOUNT_PASSWORD: netbird/idpServiceAccountPassword useBackwardsGrpcService: true signal: - image: - tag: 0.32.0 ingress: enabled: true className: public @@ -178,8 +174,6 @@ signal: - netbird.example.com relay: - image: - tag: 0.32.0 ingress: enabled: true className: public @@ -219,8 +213,6 @@ dashboard: - secretName: netbird-dashboard-tls hosts: - netbird-dashboard.example.com - image: - tag: v2.9.0 env: # Endpoints NETBIRD_MGMT_API_ENDPOINT: https://netbird.example.com:443 diff --git a/charts/netbird/templates/dashboard-deployment.yaml b/charts/netbird/templates/dashboard-deployment.yaml index e7b22e0..ad878fb 100644 --- a/charts/netbird/templates/dashboard-deployment.yaml +++ b/charts/netbird/templates/dashboard-deployment.yaml @@ -81,6 +81,14 @@ spec: {{- end }} resources: {{- toYaml .Values.dashboard.resources | nindent 12 }} + {{- if .Values.dashboard.volumeMounts }} + volumeMounts: + {{- .Values.dashboard.volumeMounts | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.dashboard.volumes }} + volumes: + {{- .Values.dashboard.volumes | toYaml | nindent 8 }} + {{- end }} {{- with .Values.dashboard.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/netbird/templates/management-deployment.yaml b/charts/netbird/templates/management-deployment.yaml index 889111f..ff1950e 100644 --- a/charts/netbird/templates/management-deployment.yaml +++ b/charts/netbird/templates/management-deployment.yaml @@ -96,6 +96,9 @@ spec: name: config - mountPath: /var/lib/netbird name: management + {{- if .Values.management.volumeMounts }} + {{- .Values.management.volumeMounts | toYaml | nindent 12 }} + {{- end }} {{- with .Values.management.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} @@ -119,5 +122,7 @@ spec: {{- else }} emptyDir: {} {{- end }} + {{- if .Values.management.volumes }} + {{- .Values.management.volumes | toYaml | nindent 8 }} + {{- end }} {{- end -}} - diff --git a/charts/netbird/templates/relay-deployment.yaml b/charts/netbird/templates/relay-deployment.yaml index d9e7adf..46fc17c 100644 --- a/charts/netbird/templates/relay-deployment.yaml +++ b/charts/netbird/templates/relay-deployment.yaml @@ -74,6 +74,14 @@ spec: key: {{ (split "/" $val)._1 }} {{- end }} {{- end }} + {{- if .Values.relay.volumeMounts }} + volumeMounts: + {{- .Values.relay.volumeMounts | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.relay.volumes }} + volumes: + {{- .Values.relay.volumes | toYaml | nindent 8 }} + {{- end }} {{- with .Values.relay.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/netbird/templates/signal-deployment.yaml b/charts/netbird/templates/signal-deployment.yaml index 06272e7..fa7ec27 100644 --- a/charts/netbird/templates/signal-deployment.yaml +++ b/charts/netbird/templates/signal-deployment.yaml @@ -62,6 +62,14 @@ spec: {{- end }} resources: {{- toYaml .Values.signal.resources | nindent 12 }} + {{- if .Values.signal.volumeMounts }} + volumeMounts: + {{- .Values.signal.volumeMounts | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.signal.volumes }} + volumes: + {{- .Values.signal.volumes | toYaml | nindent 8 }} + {{- end }} {{- with .Values.signal.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/netbird/values.yaml b/charts/netbird/values.yaml index bb10035..0b80737 100644 --- a/charts/netbird/values.yaml +++ b/charts/netbird/values.yaml @@ -28,7 +28,7 @@ management: - --log-file=console - --log-level=info - --disable-anonymous-metrics=false - - --single-account-mode-domain=netbird.example.com + - --single-account-mode-domain=netbird.selfhosted - --dns-domain=netbird.selfhosted configmap: |- # Placeholder for ConfigMap data @@ -262,10 +262,6 @@ management: ## existingPVName: "" - ## @param management.dnsDomain DNS domain for the management component. - ## - dnsDomain: netbird.selfhosted - ## @param management.livenessProbe for the management component. ## livenessProbe: @@ -286,6 +282,16 @@ management: tcpSocket: port: http + ## @param management.volumeMounts Volume mounts for the management pod. + volumeMounts: [] + # - name: tmp + # mountPath: /tmp + + ## @param management.volumes volumes for the management pod. + volumes: [] + # - name: tmp + # emptyDir: {} + ## @section NetBird Signal signal: @@ -424,7 +430,7 @@ signal: ## affinity: {} - ## @param management.livenessProbe for the signal component. + ## @param signal.livenessProbe for the signal component. ## livenessProbe: @@ -433,7 +439,7 @@ signal: tcpSocket: port: grpc - ## @param dashboard.readinessProbe for the signal component. + ## @param signal.readinessProbe for the signal component. ## readinessProbe: initialDelaySeconds: 5 @@ -441,6 +447,16 @@ signal: tcpSocket: port: grpc + ## @param signal.volumeMounts Volume mounts for the signal pod. + volumeMounts: [] + # - name: tmp + # mountPath: /tmp + + ## @param signal.volumes volumes for the signal pod. + volumes: [] + # - name: tmp + # emptyDir: {} + ## @section NetBird Relay Parameters relay: @@ -599,7 +615,7 @@ relay: ## affinity: {} - ## @param management.livenessProbe for the relay component. + ## @param relay.livenessProbe for the relay component. ## livenessProbe: initialDelaySeconds: 5 @@ -607,7 +623,7 @@ relay: tcpSocket: port: http - ## @param dashboard.readinessProbe for the relay component. + ## @param relay.readinessProbe for the relay component. ## readinessProbe: initialDelaySeconds: 5 @@ -615,6 +631,16 @@ relay: tcpSocket: port: http + ## @param relay.volumeMounts Volume mounts for the relay pod. + volumeMounts: [] + # - name: tmp + # mountPath: /tmp + + ## @param relay.volumes volumes for the relay pod. + volumes: [] + # - name: tmp + # emptyDir: {} + dashboard: ## @param dashboard.enabled Enable or disable the NetBird dashboard component. ## @@ -637,7 +663,7 @@ dashboard: pullPolicy: IfNotPresent ## @param image.tag image tag (immutable tags are recommended) - tag: "v2.9.0" + tag: "v2.13.1" ## @param imagePullSecrets image pull secrets imagePullSecrets: [] @@ -753,7 +779,7 @@ dashboard: lifecycle: {} # Define lifecycle hooks (preStop, postStart) if needed. - ## @param dashboard.livenessProbe for the management component. + ## @param dashboard.livenessProbe for the dashboard component. ## livenessProbe: periodSeconds: 5 @@ -761,7 +787,7 @@ dashboard: path: / port: http - ## @param dashboard.readinessProbe for the management component. + ## @param dashboard.readinessProbe for the dashboard component. ## readinessProbe: initialDelaySeconds: 5 @@ -770,6 +796,15 @@ dashboard: path: / port: http + ## @param dashboard.volumeMounts Volume mounts for the dashboard pod. + volumeMounts: [] + # - name: tmp + # mountPath: /tmp + + ## @param dashboard.volumes volumes for the dashboard pod. + volumes: [] + # - name: tmp + # emptyDir: {} ## @section NetBird Extra Manifests to be included in the chart extraManifests: {} From 1b9ac71648fde8480fef2e1417825771386ebed7 Mon Sep 17 00:00:00 2001 From: Marc Portabella Date: Mon, 16 Jun 2025 17:37:19 +0200 Subject: [PATCH 2/2] chore: fix README versions --- charts/netbird/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/netbird/README.md b/charts/netbird/README.md index 4384573..5ff5c89 100644 --- a/charts/netbird/README.md +++ b/charts/netbird/README.md @@ -1,7 +1,7 @@ # netbird Forked from [TOT MICRO's Helm Repository](https://github.com/totmicro/helms). -![Version: 1.8.0](https://img.shields.io/badge/Version-1.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.45.1-informational?style=flat-square) +![Version: 1.8.0](https://img.shields.io/badge/Version-1.8.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.46.0](https://img.shields.io/badge/AppVersion-0.46.0-informational?style=flat-square) # NetBird Helm Chart