Unverified Commit e04cb827 authored by Sebastian Schüpbach's avatar Sebastian Schüpbach
Browse files

add app configs

parent 72b92af1
Pipeline #24566 failed with stages
in 2 minutes and 42 seconds
This diff is collapsed.
......@@ -5,4 +5,4 @@ metadata:
namespace: "{{ .Values.k8sNamespace }}"
data:
indexer.toml: |-
{{- (.Files.Get (printf "%s-config.yaml" .Values.k8sEnvironment)) | nindent 4 }}
{{- (.Files.Get (printf "%s-config.toml" .Values.k8sEnvironment)) | nindent 4 }}
apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
namespace: "{{ .Values.k8sNamespace }}"
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-iiif-ingress"
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
nginx.ingress.kubernetes.io/enable-cors: "true"
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/rewrite-target: /memo/$1/manifest/v$2
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-iiif-app"
spec:
tls:
- hosts:
- "{{ .Values.k8sIIIFHost }}"
secretName: "{{ .Values.k8sIIIFHost }}-tls"
rules:
- host: "{{ .Values.k8sIIIFHost }} "
http:
paths:
- path: /iiif/([^/]+)/manifest/v(.)
backend:
serviceName: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-service"
servicePort: {{ .Values.k8sPort }}
......@@ -2,20 +2,20 @@ apiVersion: networking.k8s.io/v1beta1
kind: Ingress
metadata:
namespace: "{{ .Values.k8sNamespace }}"
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-ingress"
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-media-ingress"
annotations:
cert-manager.io/cluster-issuer: letsencrypt-prod
nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
nginx.ingress.kubernetes.io/rewrite-target: /
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-app"
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-media-app"
spec:
tls:
- hosts:
- "{{ .Values.k8sHost }}"
secretName: "{{ .Values.k8sHost }}-tls"
- "{{ .Values.k8sMediaHost }}"
secretName: "{{ .Values.k8sMediaHost }}-tls"
rules:
- host: "{{ .Values.k8sHost }} "
- host: "{{ .Values.k8sMediaHost }} "
http:
paths:
- path: /
......
......@@ -13,7 +13,8 @@ k8sRequestsMemory: "128Mi"
k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi"
k8sPort: 8081
k8sHost: media.memobase.k8s.unibas.ch
k8sMediaHost: media.memobase.k8s.unibas.ch
k8sIIIFHost: iiif.memobase.k8s.unibas.ch
mariadbDatabaseConfigs: prod-mariadb-db-medienserver-configs
mariadbUserSecrets: prod-mariadb-user-medienserver-secrets
......
......@@ -13,7 +13,8 @@ k8sRequestsMemory: "128Mi"
k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi"
k8sPort: 8081
k8sHost: media-stage.memobase.k8s.unibas.ch
k8sMediaHost: media-stage.memobase.k8s.unibas.ch
k8sIIIFHost: iiif-stage.memobase.k8s.unibas.ch
mariadbDatabaseConfigs: stage-mariadb-db-medienserver-configs
mariadbUserSecrets: stage-mariadb-user-medienserver-secrets
......
......@@ -13,7 +13,8 @@ k8sRequestsMemory: "128Mi"
k8sLimitsCpu: "1"
k8sLimitsMemory: "1Gi"
k8sPort: 8081
k8sHost: media-test.memobase.k8s.unibas.ch
k8sMediaHost: media-test.memobase.k8s.unibas.ch
k8sIIIFHost: iiif-test.memobase.k8s.unibas.ch
mariadbDatabaseConfigs: test-mariadb-db-medienserver-configs
mariadbUserSecrets: test-mariadb-user-medienserver-secrets
......
Supports Markdown
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