helm chart fixes

halkeye · Mar 31, 2020 · a526a2e · a526a2e
1 parent 8f36a04
commit a526a2e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/deploy/helm/wg-access-server/templates/configmap.yaml b/deploy/helm/wg-access-server/templates/configmap.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "wg-access-server.fullname" . }}
+  labels:
+    {{- include "wg-access-server.labels" . | nindent 4 }}
+data:
+  config.yaml: |-
+{{- if .Values.config.wireguard }}
+{{ toYaml .Values.config.wireguard | indent 4 }}
+{{- end }}
diff --git a/deploy/helm/wg-access-server/templates/ingress.yaml b/deploy/helm/wg-access-server/templates/ingress.yaml
@@ -23,7 +23,7 @@ spec:
 {{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+    - host: {{ . | quote }}
       http:
         paths:
           - path: /

diff --git a/deploy/helm/wg-access-server/templates/service.yaml b/deploy/helm/wg-access-server/templates/service.yaml
@@ -9,7 +9,7 @@ spec:
   type: ClusterIP
   ports:
     - port: 80
-      targetPort: http
+      targetPort: 8000
       protocol: TCP
       name: http
   selector:
@@ -25,9 +25,12 @@ metadata:
     {{- include "wg-access-server.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.wireguard.service.type }}
+{{- if .Values.wireguard.service.loadBalancerIP }}
+  loadBalancerIP: {{ .Values.wireguard.service.loadBalancerIP }}
+{{- end }}
   ports:
     - port: 51820
-      targetPort: wireguard
+      targetPort: 51820
       protocol: UDP
       name: wireguard
   selector: