EOX GitLab Instance

Commit 034e0357 authored by Nikola Jankovic's avatar Nikola Jankovic 💻
Browse files

added ingress

updated values
parent ea4c87ac
Pipeline #18085 passed with stages
in 3 minutes and 33 seconds
......@@ -40,4 +40,4 @@ COPY webpack.config.js browserslist .babelrc ./
CMD ["npm", "run", "dev-server"]
LABEL version="1.5.2"
LABEL version="2.0.0"
......@@ -20,12 +20,12 @@
<script src="vsclient.js"></script>
<script>
var baseUrl = '//{{ index (index .Values.ingress.tls 0).hosts 0 }}/';
var baseUrl = '//{{ index (index .Values.global.ingress.tls 0).hosts 0 }}/';
var baseUrlsWMTS = [
'//{{ index (index .Values.ingress.tls 0).hosts 0 }}/cache/ows/wmts',
'//{{ index (index .Values.global.ingress.tls 0).hosts 0 }}/cache/ows/wmts',
];
var baseUrlsOws = [
'//{{ index (index .Values.ingress.tls 0).hosts 0 }}/ows',
'//{{ index (index .Values.global.ingress.tls 0).hosts 0 }}/ows',
];
var config = {
"settings": {
......
......@@ -28,7 +28,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}-client
- name: {{ .Chart.Name }}
image: {{ .Values.image.repository }}:{{ .Values.image.tag | default ( print "release-" .Chart.AppVersion ) }}
imagePullPolicy: {{ .Values.image.pullPolicy | default "IfNotPresent" }}
ports:
......
{{- $fullName := include "vs-client.fullname" . -}}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
apiVersion: networking.k8s.io/v1
{{- else -}}
apiVersion: extensions/v1beta1
{{- end }}
kind: Ingress
metadata:
name: {{ $fullName }}
labels:
{{- include "vs-client.labels" . | nindent 4 }}
{{- with .Values.global.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
nginx.ingress.kubernetes.io/rewrite-target: /$1
{{- end }}
spec:
{{- if .Values.global.ingress.tls }}
tls:
{{- range .Values.global.ingress.tls }}
- hosts:
{{- range .hosts }}
- {{ . | quote }}
{{- end }}
secretName: {{ .secretName }}
{{- end }}
{{- end }}
rules:
{{- range .Values.global.ingress.hosts }}
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
- host: {{ .host | quote }}
http:
paths:
- path: /(.*)
pathType: Prefix
backend:
service:
name: {{ $fullName }}
port:
number: 80
{{- else }}
- host: {{ .host | quote }}
http:
paths:
- path: /(.*)
backend:
serviceName: {{ $fullName }}
servicePort: http
{{- end -}}
{{- end }}
replicaCount: 1
nameOverride:
fullNameOverride:
image:
repository: registry.gitlab.eox.at/vs/client
......@@ -39,11 +41,6 @@ resources:
affinity: {}
ingress:
tls:
- hosts:
- sample.url.io
livenessProbe:
failureThreshold: 3
httpGet:
......@@ -60,3 +57,18 @@ global:
header: PRISM Data Access View Server (VS) Client powered by <a href="//eox.at"><img src="//eox.at/wp-content/uploads/2017/09/EOX_Logo.svg" alt="EOX" style="height:25px;margin-left:10px"/></a>
layers: []
overlayLayers: []
ingress:
enabled: true
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"
cert-manager.io/cluster-issuer: letsencrypt
hosts:
- host: vs.local
tls:
- hosts:
- vs.local
secretName: vs-secret
# hosts and tls will be redefined always
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment