beeport: migrate to virtual server

Author: darkobas2

charts/beeport-ui/templates/ingress.yaml

@@ -55,7 +55,9 @@ spec:
 {{- end }}
 
 {{- with .Values.ingress }}
+  {{- if ne .enabled false }}
   {{- template "onechart.ingress" (dict "root" $ "ingress" .) }}
+  {{- end }}
 {{- end }}
 
 {{- range .Values.ingresses }}

charts/beeport-ui/templates/service.yaml

@@ -25,7 +25,7 @@ spec:
   selector:
     {{- include "helm-chart.selectorLabels" . | nindent 4 }}
 
-{{- if .Values.externalService }}
+{{- if and .Values.externalService (not .Values.virtualserver.enabled) }}
 ---
 apiVersion: v1
 kind: Service
@@ -36,7 +36,7 @@ metadata:
     {{- include "helm-chart.labels" . | nindent 4 }}
 spec:
   type: ExternalName
-  externalName: {{ .Values.externalService.name }}
+  externalName: {{ .Values.externalService.externalName | default .Values.externalService.name }}
   ports:
     - port: {{ .Values.externalService.port }}
       {{- if .Values.externalService.targetPort }}

charts/beeport-ui/templates/virtualserver.yaml

@@ -0,0 +1,61 @@
+{{- if .Values.virtualserver }}
+{{- if .Values.virtualserver.enabled }}
+---
+apiVersion: k8s.nginx.org/v1
+kind: VirtualServer
+metadata:
+  name: {{ template "robustName" .Release.Name }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "helm-chart.labels" . | nindent 4 }}
+  annotations:
+    {{- if .Values.virtualserver.annotations }}
+    {{- toYaml .Values.virtualserver.annotations | nindent 4 }}
+    {{- end }}
+spec:
+  host: {{ .Values.virtualserver.host }}
+  {{- if .Values.virtualserver.tls }}
+  tls:
+    secret: {{ .Values.virtualserver.tls.secret }}
+    redirect:
+      enable: {{ .Values.virtualserver.tls.redirect | default true }}
+  {{- end }}
+  
+  {{- if .Values.virtualserver.upstreams }}
+  upstreams:
+  {{- range .Values.virtualserver.upstreams }}
+  - name: {{ .name }}
+    service: {{ .service }}
+    port: {{ .port }}
+    {{- if .namespace }}
+    namespace: {{ .namespace }}
+    {{- end }}
+    {{- if .loadBalancingMethod }}
+    lb-method: {{ .loadBalancingMethod }}
+    {{- end }}
+    {{- if .maxConns }}
+    max-conns: {{ .maxConns }}
+    {{- end }}
+  {{- end }}
+  {{- end }}
+
+  routes:
+  {{- range .Values.virtualserver.routes }}
+  - path: {{ .path }}
+    {{- if .upstream }}
+    action:
+      pass: {{ .upstream }}
+    {{- end }}
+    {{- if .policies }}
+    policies:
+    {{- range .policies }}
+    - name: {{ . }}
+    {{- end }}
+    {{- end }}
+    {{- if .locationSnippets }}
+    location-snippets: |
+{{ .locationSnippets | indent 6 }}
+    {{- end }}
+  {{- end }}
+{{- end }}
+{{- end }}