diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml new file mode 100644 index 0000000000000000000000000000000000000000..05de097d1cc59eed3b52a6f255f10029be516515 --- /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 d8a8f83a0ecaec0431fcb7d9aa487440136e25f2..59e9666dabaf50f00bb358682ae80d94a3261ec2 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 0000000000000000000000000000000000000000..93be22e38f4e8d98bf8255ce4c41505aee9de3b0 --- /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 b411b1e033340e08012f89204088b5fc09c79a30..b748774f8f8e27f7df3f4d931992b731a8f182e0 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: {}