openvpn: fix https backend

stenic · Nov 17, 2020 · 77f8205 · 77f8205
1 parent 033416e
commit 77f8205
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/charts/openvpn-as/Chart.yaml b/charts/openvpn-as/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: openvpn-as
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.2
+version: 0.1.3
 appVersion: version-2.8.6-916f8e7d-ubuntu18
 maintainers:
   - email: [email protected]

diff --git a/charts/openvpn-as/templates/ingress.admin.yaml b/charts/openvpn-as/templates/ingress.admin.yaml
@@ -11,10 +11,11 @@ metadata:
   name: {{ $fullName }}-admin
   labels:
     {{- include "openvpn-as.labels" . | nindent 4 }}
-  {{- with .Values.ingress.admin.annotations }}
   annotations:
+    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+    {{- with .Values.ingress.admin.annotations }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- end }}
 spec:
   {{- if .Values.ingress.admin.tls.enabled }}
   tls:
@@ -30,4 +31,6 @@ spec:
             backend:
               serviceName: {{ $fullName }}-admin
               servicePort: {{ .Values.openvpn.ports.admin }}
+            port:
+              number: 80
   {{- end }}
diff --git a/charts/openvpn-as/templates/ingress.gui.yaml b/charts/openvpn-as/templates/ingress.gui.yaml
@@ -11,10 +11,11 @@ metadata:
   name: {{ $fullName }}-gui
   labels:
     {{- include "openvpn-as.labels" . | nindent 4 }}
-  {{- with .Values.ingress.gui.annotations }}
   annotations:
+    nginx.ingress.kubernetes.io/backend-protocol: HTTPS
+    {{- with .Values.ingress.admin.annotations }}
     {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- end }}
 spec:
   {{- if .Values.ingress.gui.tls.enabled }}
   tls: