From cfe694ef1137e29efddff76f5dc09ac23462b220 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Mei=C3=9Fl?= <stephan.meissl@eox.at>
Date: Wed, 7 Oct 2020 14:25:13 +0200
Subject: [PATCH] adding initial ingress and service
---
chart/templates/ingress.yaml | 54 ++++++++++++++++++++++++
chart/templates/renderer-deployment.yaml | 2 +-
chart/templates/renderer-service.yaml | 17 ++++++++
chart/values.yaml | 9 ++--
4 files changed, 77 insertions(+), 5 deletions(-)
create mode 100644 chart/templates/ingress.yaml
create mode 100644 chart/templates/renderer-service.yaml
diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml
new file mode 100644
index 00000000..05de097d
--- /dev/null
+++ b/chart/templates/ingress.yaml
@@ -0,0 +1,54 @@
+{{- $fullName := include "vs.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1beta1
+{{- else -}}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+ name: {{ $fullName }}
+ labels:
+ {{- include "vs.labels" . | nindent 4 }}
+ {{- with .Values.ingress.annotations }}
+ annotations:
+ {{- toYaml . | nindent 4 }}
+ nginx.ingress.kubernetes.io/rewrite-target: /$1
+ {{- end }}
+spec:
+ {{- if .Values.ingress.tls }}
+ tls:
+ {{- range .Values.ingress.tls }}
+ - hosts:
+ {{- range .hosts }}
+ - {{ . | quote }}
+ {{- end }}
+ secretName: {{ .secretName }}
+ {{- end }}
+ {{- end }}
+ rules:
+ {{- range .Values.ingress.hosts }}
+ - host: {{ .host | quote }}
+ http:
+ paths:
+ - path: /(ows.*)
+ backend:
+ serviceName: renderer
+ servicePort: http
+ - path: /(opensearch.*)
+ backend:
+ serviceName: renderer
+ servicePort: http
+ - path: /(admin.*)
+ backend:
+ serviceName: renderer
+ servicePort: http
+ # - path: /cache/(.*)
+ # backend:
+ # serviceName: cache
+ # servicePort: http
+ # - path: /(.*)
+ # backend:
+ # serviceName: client
+ # servicePort: http
+ {{- end }}
diff --git a/chart/templates/renderer-deployment.yaml b/chart/templates/renderer-deployment.yaml
index d8a8f83a..59e9666d 100644
--- a/chart/templates/renderer-deployment.yaml
+++ b/chart/templates/renderer-deployment.yaml
@@ -87,7 +87,7 @@ spec:
volumes:
- configMap:
items:
- - key: vhr18_init-db.sh
+ - key: init-db.sh
path: init-db.sh
name: init-db
name: {{ include "vs.fullname" . }}-init-db
diff --git a/chart/templates/renderer-service.yaml b/chart/templates/renderer-service.yaml
new file mode 100644
index 00000000..93be22e3
--- /dev/null
+++ b/chart/templates/renderer-service.yaml
@@ -0,0 +1,17 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ include "vs.fullname" . }}-renderer
+ labels:
+ {{- include "vs.labels" . | nindent 4 }}
+ app.kubernetes.io/service: renderer
+spec:
+ type: {{ .Values.service.type }}
+ ports:
+ - port: {{ .Values.service.port }}
+ targetPort: http
+ protocol: TCP
+ name: http
+ selector:
+ {{- include "vs.selectorLabels" . | nindent 4 }}
+ app.kubernetes.io/service: renderer
diff --git a/chart/values.yaml b/chart/values.yaml
index b411b1e0..b748774f 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -91,15 +91,16 @@ service:
port: 80
ingress:
- enabled: false
annotations:
kubernetes.io/ingress.class: nginx
kubernetes.io/tls-acme: "true"
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/enable-cors: "true"
hosts:
- - host: chart-example.local
- paths: []
- tls: []
+ - host: vs.local
+ tls:
+ - hosts:
+ - vs.local
+ secretName: vs-secret
affinity: {}
--
GitLab