EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit e219d7d4 authored by Mussab Abdalla's avatar Mussab Abdalla
Browse files

Merge branch 'staging' into ingestor_status

parents b92a74ba d9be4296
No related branches found
No related tags found
2 merge requests!55Production release 1.2.0,!50Ingestor status
Hide whitespace changes
Inline Side-by-side
Showing
with 147 additions and 17 deletions
chart/Chart.yaml
+ 1
− 1
View file @ e219d7d4
...@@ -7,7 +7,7 @@ type: application ...@@ -7,7 +7,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.2.0 version: 0.3.1
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
......
chart/files/index.html
+ 3
− 3
View file @ e219d7d4
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>PRISM View Server</title> <title>{{ .Values.config.client.title | default "PRISM View Server" }}</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" /> <link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" /> <link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
</head> </head>
<body> <body>
<header id="header" style="width: 100%; height:70px;"> <header id="header" style="width: 100%; height:70px;">
<h3 style="width:100%;text-align:center; <h3 style="width:100%;text-align:center;
color: #006699;">PRISM View Server (PVS) Client powered by color: #006699;">
<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> {{ .Values.config.client.header | default "PRISM View Server (PVS) 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>" }}
</h3> </h3>
</header> </header>
<div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div> <div id="app" style="width: 100%; top: 60px; bottom: 0; position: absolute; margin: 0; padding:0;"></div>
......
chart/files/mapcache.xml
+ 22
− 2
View file @ e219d7d4
...@@ -63,9 +63,29 @@ ...@@ -63,9 +63,29 @@
<container>{{ .Values.config.objectStorage.cache.container }}</container> <container>{{ .Values.config.objectStorage.cache.container }}</container>
<key>{{ .Values.config.objectStorage.key | default "/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}" }}</key> <key>{{ .Values.config.objectStorage.key | default "/{tileset}/{grid}/{dim}/{z}/{x}/{y}.{ext}" }}</key>
</cache> </cache>
{{- else if eq .Values.config.objectStorage.cache.type "S3"}} # TODO {{- else if eq .Values.config.objectStorage.cache.type "S3" }}
<cache name="cache" type="S3">
<url>{{ .Values.config.objectStorage.cache.endpoint_url }}/{tileset}/{grid}/{z}/{x}/{y}/{ext}</url>
<!-- <headers>
<Host>foo.s3.amazonaws.com</Host>
</headers> -->
<id>{{ .Values.config.objectStorage.cache.access_key_id }}</id>
<secret>{{ .Values.config.objectStorage.cache.secret_access_key }}</secret>
{{- if .Values.config.objectStorage.cache.region }}
<region>{{ .Values.config.objectStorage.cache.region }}</region>
{{- end }}
<!-- <operation type="put">
<headers>
<x-amz-storage-class>REDUCED_REDUNDANCY</x-amz-storage-class>
<x-amz-acl>public-read</x-amz-acl>
</headers>
</operation> -->
</cache>
{{- else }} {{- else }}
<!-- no storage configured --> <!-- no storage configured, using temp one -->
<cache name="cache" type="sqlite3">
<dbfile>/tmp/cache.db</dbfile>
</cache>
{{- end }} {{- end }}
{{- define "mapcache-layerid" -}}{{ .collection_name }}{{ if .level_name }}__{{ .level_name }}{{ end }}{{ if .sub_layer_name }}__{{ .sub_layer_name }}{{ end }}{{- end }} {{- define "mapcache-layerid" -}}{{ .collection_name }}{{ if .level_name }}__{{ .level_name }}{{ end }}{{ if .sub_layer_name }}__{{ .sub_layer_name }}{{ end }}{{- end }}
......
chart/templates/cache-configmap.yaml
+ 1
− 1
View file @ e219d7d4
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ include "vs.fullname" . }}-cache name: {{ include "vs.fullname" . }}-cache-config
data: data:
{{ (tpl (.Files.Glob "files/mapcache.xml").AsConfig . ) | nindent 2}} {{ (tpl (.Files.Glob "files/mapcache.xml").AsConfig . ) | nindent 2}}
chart/templates/cache-deployment.yaml 0 → 100644
+ 93
− 0
View file @ e219d7d4
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "vs.fullname" . }}-cache
labels:
{{- include "vs.labels" . | nindent 4 }}
app.kubernetes.io/service: cache
spec:
replicas: {{ .Values.cache.replicaCount }}
selector:
matchLabels:
{{- include "vs.selectorLabels" . | nindent 6 }}
app.kubernetes.io/service: cache
strategy:
rollingUpdate:
maxUnavailable: 0
type: RollingUpdate
template:
metadata:
annotations:
prometheus.io/scrape: "false"
labels:
{{- include "vs.selectorLabels" . | nindent 8 }}
app.kubernetes.io/service: cache
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}-cache
image: "{{ .Values.cache.image.repository | default "registry.gitlab.eox.at/esa/prism/vs/pvs_cache" }}:{{ .Values.cache.image.tag | default ( print "release-" .Chart.AppVersion ) }}"
imagePullPolicy: {{ .Values.cache.image.pullPolicy | default "IfNotPresent" }}
ports:
- name: http
containerPort: 80
protocol: TCP
livenessProbe:
httpGet:
path: /
port: http
readinessProbe:
httpGet:
path: /
port: http
startupProbe:
httpGet:
path: /
port: http
failureThreshold: 30
periodSeconds: 10
resources:
{{- toYaml .Values.cache.resources | nindent 12 }}
args:
- /run-httpd.sh
env:
{{- range $key, $value := .Values.config.general }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
{{- range $key, $value := .Values.config.database }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
- name: DB_HOST
value: {{ .Release.Name }}-database
{{- range $key, $value := .Values.config.objectStorage.data }}
- name: {{ $key }}
value: {{ $value | quote }}
{{- end }}
- name: RENDERER_HOST
value: {{ .Release.Name }}-renderer
- name: INSTANCE_ID
value: prism-view-server_cache
- name: WAIT_SERVICES
value: "{{ .Release.Name }}-database:{{ .Values.config.database.DB_PORT }} {{ .Release.Name }}-renderer:80"
- name: WAIT_TIMEOUT
value: "300"
volumeMounts:
- mountPath: /mapcache-template.xml
name: cache-config.xml
subPath: cache-config.xml
{{- with .Values.cache.affinity | default .Values.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
volumes:
- configMap:
items:
- key: cache-config.xml
path: cache-config.xml
name: {{ include "vs.fullname" . }}-cache-config
name: cache-config
chart/templates/cache-service.yaml 0 → 100644
+ 17
− 0
View file @ e219d7d4
apiVersion: v1
kind: Service
metadata:
name: {{ include "vs.fullname" . }}-cache
labels:
{{- include "vs.labels" . | nindent 4 }}
app.kubernetes.io/service: cache
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: cache
chart/templates/client-deployment.yaml
+ 2
− 2
View file @ e219d7d4
...@@ -29,8 +29,8 @@ spec: ...@@ -29,8 +29,8 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }}-client - name: {{ .Chart.Name }}-client
image: '{{ .Values.image.repository | default "registry.gitlab.eox.at/esa/prism/vs" }}/pvs_client:{{ .Values.image.tag | default .Chart.AppVersion }}' image: '{{ .Values.client.image.repository | default "registry.gitlab.eox.at/esa/prism/vs/pvs_client" }}:{{ .Values.client.image.tag | default ( print "release-" .Chart.AppVersion ) }}'
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.client.image.pullPolicy | default "IfNotPresent" }}
ports: ports:
- name: http - name: http
containerPort: 80 containerPort: 80
......
chart/templates/ingress.yaml
+ 4
− 4
View file @ e219d7d4
...@@ -43,12 +43,12 @@ spec: ...@@ -43,12 +43,12 @@ spec:
backend: backend:
serviceName: {{ $fullName }}-renderer serviceName: {{ $fullName }}-renderer
servicePort: http servicePort: http
- path: /cache/(.*)
backend:
serviceName: {{ $fullName }}-cache
servicePort: http
- path: /(.*) - path: /(.*)
backend: backend:
serviceName: {{ $fullName }}-client serviceName: {{ $fullName }}-client
servicePort: http servicePort: http
# - path: /cache/(.*)
# backend:
# serviceName: {{ $fullName }}-cache
# servicePort: http
{{- end }} {{- end }}
chart/templates/registrar-deployment.yaml
+ 2
− 2
View file @ e219d7d4
...@@ -29,8 +29,8 @@ spec: ...@@ -29,8 +29,8 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }}-registrar - name: {{ .Chart.Name }}-registrar
image: "{{ .Values.image.repository | default "registry.gitlab.eox.at/esa/prism/vs" }}/{{ .Values.renderer.image | default "pvs_core" }}:{{ .Values.image.tag | default .Chart.AppVersion }}" image: "{{ .Values.registrar.image.repository | default "registry.gitlab.eox.at/esa/prism/vs/pvs_core" }}:{{ .Values.registrar.image.tag | default ( print "release-" .Chart.AppVersion ) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.registrar.image.pullPolicy | default "IfNotPresent" }}
resources: resources:
{{- toYaml .Values.registrar.resources | nindent 12 }} {{- toYaml .Values.registrar.resources | nindent 12 }}
args: args:
......
chart/templates/renderer-deployment.yaml
+ 2
− 2
View file @ e219d7d4
...@@ -29,8 +29,8 @@ spec: ...@@ -29,8 +29,8 @@ spec:
{{- end }} {{- end }}
containers: containers:
- name: {{ .Chart.Name }}-renderer - name: {{ .Chart.Name }}-renderer
image: "{{ .Values.image.repository | default "registry.gitlab.eox.at/esa/prism/vs" }}/{{ .Values.renderer.image | default "pvs_core" }}:{{ .Values.image.tag | default .Chart.AppVersion }}" image: "{{ .Values.renderer.image.repository | default "registry.gitlab.eox.at/esa/prism/vs/pvs_core" }}:{{ .Values.renderer.image.tag | default ( print "release-" .Chart.AppVersion ) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.renderer.image.pullPolicy | default "IfNotPresent" }}
ports: ports:
- name: http - name: http
containerPort: 80 containerPort: 80
......
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