From 45d72e3810d963efb3b2478d9191bb0ff2557ff6 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Fri, 12 Apr 2024 10:16:16 +0200
Subject: [PATCH] fix(headscale): correct image registry

---
 headscale/.gitignore                |  1 +
 headscale/Chart.yaml                |  2 +-
 headscale/templates/deployment.yaml |  4 +++-
 headscale/templates/jobs.yaml       | 16 +++++++++++++++-
 headscale/values.yaml               |  2 +-
 5 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 headscale/.gitignore

diff --git a/headscale/.gitignore b/headscale/.gitignore
new file mode 100644
index 0000000..dea9083
--- /dev/null
+++ b/headscale/.gitignore
@@ -0,0 +1 @@
+values_test.yaml
diff --git a/headscale/Chart.yaml b/headscale/Chart.yaml
index 60f131b..c5f1e79 100644
--- a/headscale/Chart.yaml
+++ b/headscale/Chart.yaml
@@ -3,7 +3,7 @@ name: headscale
 description: An open source, self-hosted implementation of the Tailscale control server.
 icon: https://raw.githubusercontent.com/juanfont/headscale/56a7b1e34952c3e0306a134b2be9b4277f5d8d6e/docs/logo/headscale3-dots.svg
 type: application
-version: 0.3.0
+version: 0.3.1
 # renovate: image=docker.io/headscale/headscale
 appVersion: "0.22.3"
 maintainers:
diff --git a/headscale/templates/deployment.yaml b/headscale/templates/deployment.yaml
index cbe8321..981420f 100644
--- a/headscale/templates/deployment.yaml
+++ b/headscale/templates/deployment.yaml
@@ -35,7 +35,9 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- with .Values.image }}
+          image: "{{ .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
             - "headscale"
diff --git a/headscale/templates/jobs.yaml b/headscale/templates/jobs.yaml
index 2f249a4..92d46de 100644
--- a/headscale/templates/jobs.yaml
+++ b/headscale/templates/jobs.yaml
@@ -17,6 +17,9 @@ metadata:
   labels:
     app.kubernetes.io/component: keys-job
     {{- include "headscale.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
@@ -25,6 +28,9 @@ metadata:
   labels:
     app.kubernetes.io/component: keys-job
     {{- include "headscale.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 rules:
   - apiGroups:
       - ""
@@ -44,6 +50,9 @@ metadata:
   labels:
     app.kubernetes.io/component: keys-job
     {{- include "headscale.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
@@ -59,6 +68,9 @@ metadata:
   name: {{ $name }}
   labels:
     {{- include "headscale.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 spec:
   template:
     spec:
@@ -90,7 +102,9 @@ spec:
             name: secrets
             readOnly: true
        - name: generate-key
-         image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+         {{- with .Values.image }}
+         image: "{{ .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
+         {{- end }}
          imagePullPolicy: {{ .Values.image.pullPolicy }}
          command:
           - sh 
diff --git a/headscale/values.yaml b/headscale/values.yaml
index 08806e1..d272bf1 100644
--- a/headscale/values.yaml
+++ b/headscale/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   registry: ghcr.io
-  repository: joanfont/headscale
+  repository: juanfont/headscale
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""