chore(deps): update ghcr.io/juanfont/headscale docker tag to v0.23.0 (#…

…679) * chore(deps): update ghcr.io/juanfont/headscale docker tag to v0.23.0 * chore: Update chart metadata * chore(headscale): Update config for v0.23.0 --------- Co-authored-by: gabe565-renovate[bot] <156644344+gabe565-renovate[bot]@users.noreply.github.com> Co-authored-by: chart-bot <160046936+charts-bot[bot]@users.noreply.github.com> Co-authored-by: Gabe Cook <[email protected]>
gabe565 · Oct 31, 2024 · 9d60f07 · 9d60f07
1 parent 536c9c1
commit 9d60f07
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 37 deletions.
diff --git a/charts/headscale/Chart.yaml b/charts/headscale/Chart.yaml
@@ -4,9 +4,9 @@ description: An open source, self-hosted implementation of the Tailscale control
 home: https://charts.gabe565.com/charts/headscale/
 icon: https://raw.githubusercontent.com/juanfont/headscale/56a7b1e/docs/logo/headscale3-dots.svg
 type: application
-version: 0.13.1
+version: 0.14.0
 # renovate datasource=docker depName=ghcr.io/juanfont/headscale
-appVersion: 0.22.3
+appVersion: v0.23.0
 kubeVersion: ">=1.22.0-0"
 keywords:
   - headscale
@@ -25,8 +25,23 @@ sources:
   - https://github.com/juanfont/headscale
 annotations:
   artifacthub.io/changes: |-
-    - kind: fixed
-      description: Allow args to be overridden
+    - kind: changed
+      description: BREAKING - Update ghcr.io/juanfont/headscale docker tag to v0.23.0
+      links:
+        - name: Headscale v0.23.0 Release Notes
+          url: artifacthub.io/changes
+    - kind: changed
+      description: env.HEADSCALE_DNS_CONFIG_BASE_DOMAIN changed to env.HEADSCALE_DNS_BASE_DOMAIN
+    - kind: changed
+      description: env.HEADSCALE_IP_PREFIXES has been split into env.HEADSCALE_PREFIXES_V4 and env.HEADSCALE_PREFIXES_V6
+    - kind: changed
+      description: env.HEADSCALE_DNS_CONFIG_NAMESERVERS changed to env.HEADSCALE_DNS_NAMESERVERS_GLOBAL
+    - kind: changed
+      description: env.HEADSCALE_DNS_CONFIG_MAGIC_DNS changed to env.HEADSCALE_DNS_MAGIC_DNS
+    - kind: changed
+      description: Generated database envs have been updated
+    - kind: changed
+      description: Moved default values to values.yaml so they show in generated documentation
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/juanfont/headscale

diff --git a/charts/headscale/README.md b/charts/headscale/README.md
@@ -2,16 +2,16 @@
 
 <img src="https://raw.githubusercontent.com/juanfont/headscale/56a7b1e/docs/logo/headscale3-dots.svg" align="right" width="92" alt="headscale logo">
 
-![Version: 0.13.1](https://img.shields.io/badge/Version-0.13.1-informational?style=flat)
+![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: 0.22.3](https://img.shields.io/badge/AppVersion-0.22.3-informational?style=flat)
+![AppVersion: v0.23.0](https://img.shields.io/badge/AppVersion-v0.23.0-informational?style=flat)
 
 An open source, self-hosted implementation of the Tailscale control server.
 
 **Homepage:** <https://charts.gabe565.com/charts/headscale/>
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised
-[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=headscale&version=0.13.1)**
+[here](https://github.com/gabe565/charts/issues/new?assignees=gabe565&labels=bug&template=bug_report.yaml&name=headscale&version=0.14.0)**
 
 ## Source Code
 
@@ -145,14 +145,18 @@ Once deployed, the UI will be available at `/web`.
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| args | list | `["headscale","serve"]` | Container args |
+| args | list | `["serve"]` | Container args |
 | configMaps.acl.data.policy | string | `nil` | ACL policy JSON [[ref]](https://tailscale.com/kb/1018/acls/) |
 | configMaps.acl.enabled | bool | `false` | Enables ACL policy |
 | env | object | See [values.yaml](./values.yaml) | Environment variables. [[ref]](https://github.com/juanfont/headscale/blob/main/config-example.yaml) |
-| env.HEADSCALE_DNS_CONFIG_BASE_DOMAIN | string | `"example.com"` | Defines the base domain to create the hostnames for MagicDNS. `base_domain` must be a FQDNs, without the trailing dot. The FQDN of the hosts will be `hostname.user.base_domain` (e.g., _myhost.myuser.example.com_). |
+| env.HEADSCALE_DNS_BASE_DOMAIN | string | `"example.com"` | Defines the base domain to create the hostnames for MagicDNS. This domain _must_ be different from the server_url domain. |
+| env.HEADSCALE_DNS_MAGIC_DNS | string | `"true"` | Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/). |
+| env.HEADSCALE_DNS_NAMESERVERS_GLOBAL | string | `"1.1.1.1 1.0.0.1"` | List of DNS servers to expose to clients. |
+| env.HEADSCALE_PREFIXES_V4 | string | `"100.64.0.0/10"` | Node IPv4 prefixes |
+| env.HEADSCALE_PREFIXES_V6 | string | `"fd7a:115c:a1e0::/48"` | Node IPv6 prefixes |
 | image.pullPolicy | string | `"IfNotPresent"` | image pull policy |
 | image.repository | string | `"ghcr.io/juanfont/headscale"` | image repository |
-| image.tag | string | `"0.22.3"` | image tag |
+| image.tag | string | `"v0.23.0"` | image tag |
 | ingress.main | object | See [values.yaml](./values.yaml) | Enable and configure ingress settings for the chart under this key. |
 | persistence.config | object | See [values.yaml](./values.yaml) | Configure persistence settings for the chart under this key. |
 | postgresql | object | See [values.yaml](./values.yaml) | Enable and configure postgresql database subchart under this key.    For more options see [postgresql chart documentation](https://github.com/bitnami/charts/tree/main/bitnami/postgresql) |

diff --git a/charts/headscale/templates/common.yaml b/charts/headscale/templates/common.yaml
@@ -49,38 +49,27 @@ env:
   HEADSCALE_NOISE: "{}"
   HEADSCALE_NOISE_PRIVATE_KEY_PATH: "{{ .Values.persistence.config.mountPath }}/noise_private.key"
 
-  HEADSCALE_IP_PREFIXES: "fd7a:115c:a1e0::/48 100.64.0.0/10"
-
-  HEADSCALE_DERP_URLS: "https://controlplane.tailscale.com/derpmap/default"
-  HEADSCALE_DERP_AUTO_UPDATE_ENABLED: "true"
-  HEADSCALE_DERP_UPDATE_FREQUENCY: "24h"
-
-  HEADSCALE_EPHEMERAL_NODE_INACTIVITY_TIMEOUT: "30m"
-
-  HEADSCALE_DNS_CONFIG_NAMESERVERS: "1.1.1.1 1.0.0.1"
-  HEADSCALE_DNS_CONFIG_MAGIC_DNS: "true"
-
   {{- with .Values.postgresql }}
   {{- if .enabled }}
-  HEADSCALE_DB_TYPE: postgres
-  HEADSCALE_DB_HOST: {{ $.Release.Name }}-postgresql
-  HEADSCALE_DB_PORT: "5432"
-  HEADSCALE_DB_SSL: "false"
-  HEADSCALE_DB_NAME: {{ .auth.database }}
-  HEADSCALE_DB_USER: {{ default "postgres" .auth.username }}
-  HEADSCALE_DB_PASS:
+  HEADSCALE_DATABASE_TYPE: postgres
+  HEADSCALE_DATABASE_POSTGRES_HOST: {{ $.Release.Name }}-postgresql
+  HEADSCALE_DATABASE_POSTGRES_PORT: "5432"
+  HEADSCALE_DATABASE_POSTGRES_SSL: "false"
+  HEADSCALE_DATABASE_POSTGRES_NAME: {{ .auth.database }}
+  HEADSCALE_DATABASE_POSTGRES_USER: {{ default "postgres" .auth.username }}
+  HEADSCALE_DATABASE_POSTGRES_PASS:
     secretKeyRef:
       name: {{ $.Release.Name }}-postgresql
       key: {{ if not .auth.password }}postgres-{{ end }}password
   {{- else }}
-  HEADSCALE_DB_TYPE: "sqlite3"
-  HEADSCALE_DB_PATH: "{{ $.Values.persistence.config.mountPath }}/db.sqlite"
+  HEADSCALE_DATABASE_TYPE: "sqlite3"
+  HEADSCALE_DATABASE_SQLITE_PATH: "{{ $.Values.persistence.config.mountPath }}/db.sqlite"
   {{- end }}
   {{- end }}
 
 {{- with .Values.configMaps.acl }}
 {{- if .enabled }}
-  HEADSCALE_ACL_POLICY_PATH: /acl/{{ keys .data | first }}
+  HEADSCALE_POLICY_PATH: /acl/{{ keys .data | first }}
 
 persistence:
   acl:

diff --git a/charts/headscale/values.yaml b/charts/headscale/values.yaml
@@ -11,23 +11,38 @@ image:
   # -- image pull policy
   pullPolicy: IfNotPresent
   # -- image tag
-  tag: 0.22.3
+  tag: v0.23.0
 
 # -- Container args
-args: ["headscale", "serve"]
+args: ["serve"]
 
 # -- Environment variables. [[ref]](https://github.com/juanfont/headscale/blob/main/config-example.yaml)
 # @default -- See [values.yaml](./values.yaml)
 env:
   # -- Defines the base domain to create the hostnames for MagicDNS.
-  # `base_domain` must be a FQDNs, without the trailing dot.
-  # The FQDN of the hosts will be
-  # `hostname.user.base_domain` (e.g., _myhost.myuser.example.com_).
-  HEADSCALE_DNS_CONFIG_BASE_DOMAIN: example.com
+  # This domain _must_ be different from the server_url domain.
+  HEADSCALE_DNS_BASE_DOMAIN: "example.com"
+
   # HEADSCALE_OIDC_ISSUER: ""
   # HEADSCALE_OIDC_CLIENT_ID: ""
   # HEADSCALE_OIDC_CLIENT_SECRET: ""
 
+  # -- Node IPv4 prefixes
+  HEADSCALE_PREFIXES_V4: "100.64.0.0/10"
+  # -- Node IPv6 prefixes
+  HEADSCALE_PREFIXES_V6: "fd7a:115c:a1e0::/48"
+
+  # -- List of DNS servers to expose to clients.
+  HEADSCALE_DNS_NAMESERVERS_GLOBAL: "1.1.1.1 1.0.0.1"
+  # -- Whether to use [MagicDNS](https://tailscale.com/kb/1081/magicdns/).
+  HEADSCALE_DNS_MAGIC_DNS: "true"
+
+  HEADSCALE_DERP_URLS: "https://controlplane.tailscale.com/derpmap/default"
+  HEADSCALE_DERP_AUTO_UPDATE_ENABLED: "true"
+  HEADSCALE_DERP_UPDATE_FREQUENCY: "24h"
+
+  HEADSCALE_EPHEMERAL_NODE_INACTIVITY_TIMEOUT: "30m"
+
 service:
   # -- Configures service settings for the chart.
   # @default -- See [values.yaml](./values.yaml)