Helm chart improvements

Author: blafry

kubernetes/helm/templates/_helpers.tpl

@@ -1,7 +1,7 @@
 {{- define "name-client" -}}
-{{ printf "%s-client-%s" $.Chart.Name $.Release.Name | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{ printf "%s-client" $.Chart.Name | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{- define "name-server" -}}
-{{ printf "%s-server-%s" $.Chart.Name $.Release.Name | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{ printf "%s-server" $.Chart.Name | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}

kubernetes/helm/templates/client-config.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "name-client" . }}-nginx
+  namespace: {{ $.Release.Namespace }}
 data:
   nginx.conf: |
     worker_processes  auto;
@@ -24,6 +25,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "name-client" . }}-env
+  namespace: {{ $.Release.Namespace }}
 stringData:
   INVITE_TOKEN: {{ quote .Values.peering.psk }}
 

kubernetes/helm/templates/client-deployment.yaml

@@ -21,6 +21,10 @@ spec:
       labels:
         application: {{ template "name-client" . }}
     spec:
+      {{- if .Values.docker.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.docker.imagePullSecrets | nindent 8 }}
+      {{- end }}
       shareProcessNamespace: true
       {{- if .Values.client.priorityClassName }}
       priorityClassName: {{ .Values.client.priorityClassName }}

kubernetes/helm/templates/server-config.yaml

@@ -4,6 +4,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "name-server" . }}-nginx
+  namespace: {{ $.Release.Namespace }}
 data:
   nginx.conf: |
     worker_processes  auto;
@@ -24,6 +25,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ template "name-server" . }}-env
+  namespace: {{ $.Release.Namespace }}
 stringData:
   INVITE_TOKEN: {{ .Values.peering.psk | quote }}
 

kubernetes/helm/templates/server-deployment.yaml

@@ -22,6 +22,10 @@ spec:
       labels:
         application: {{ template "name-server" . }}
     spec:
+      {{- if .Values.docker.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml .Values.docker.imagePullSecrets | nindent 8 }}
+      {{- end }}
       shareProcessNamespace: true
       {{- if .Values.server.priorityClassName }}
       priorityClassName: {{ .Values.server.priorityClassName }}

kubernetes/helm/templates/server-svc.yaml

@@ -7,6 +7,10 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     application: {{ template "name-server" . }}
+  {{- if .Values.server.service.annotations }}
+  annotations:
+    {{- toYaml .Values.server.service.annotations | nindent 4 }}
+  {{- end }}
 spec:
   ports:
   - name: data

kubernetes/helm/values.yaml

@@ -43,6 +43,7 @@ server:
   name: server
 
   service:
+    annotations: null
     type: LoadBalancer
 
   priorityClassName: ""
@@ -91,6 +92,7 @@ docker:
   wgVersion: latest # GHA
   nginxImage: glothriel/wormhole-nginx
   nginxVersion: latest # GHA
+  pullSecrets: null
 
 peering:
   psk: defaultPeeringKeyPleaseChangeMe