Commit 29ab173a authored by Jonas Waeber's avatar Jonas Waeber
Browse files

Update Ingress to v1

Update labels to resources.
parent ab23f538
Pipeline #34829 passed with stages
in 3 minutes and 34 seconds
......@@ -10,5 +10,3 @@
* [Play framework](https://www.playframework.com/)
* modularized typed data repositories (for memobase we use an ElasticSearch data repository)
* alternatives could be Solr, Mongo,maybe Kafka, ... . These have to be implemented (via typed interfaces) if desired
......@@ -3,6 +3,10 @@ kind: ConfigMap
metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-config"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
data:
#ELASTIC_INDEX: "{{ .Values.elasticIndexConfigs }}"
RESPONSE_LISTLENGTH: "{{ .Values.responseListlength }}"
......
......@@ -5,6 +5,8 @@ metadata:
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
spec:
selector:
matchLabels:
......
apiVersion: networking.k8s.io/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: "{{ .Values.k8sNamespace }}"
......@@ -8,7 +8,9 @@ metadata:
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}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
spec:
tls:
- hosts:
......@@ -19,6 +21,9 @@ spec:
http:
paths:
- path: /
pathType: Prefix
backend:
serviceName: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-service"
servicePort: {{ .Values.k8sPort }}
service:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-service"
port:
number: {{ .Values.k8sPort }}
......@@ -3,6 +3,10 @@ kind: ConfigMap
metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-oai-config"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
data:
oai.conf: |-
{{- (.Files.Get (printf "%s-oai.conf" .Values.k8sEnvironment)) | nindent 4 }}
......@@ -3,6 +3,10 @@ kind: ConfigMap
metadata:
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-secure-config"
namespace: "{{ .Values.k8sNamespace }}"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
data:
secure.conf: |-
{{- (.Files.Get (printf "%s-secure.conf" .Values.k8sEnvironment)) | nindent 4 }}
......@@ -4,7 +4,9 @@ metadata:
namespace: "{{ .Values.k8sNamespace }}"
name: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-service"
labels:
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment }}-app"
app: "{{ .Values.k8sGroupId }}-{{ .Values.k8sName }}-{{ .Values.k8sEnvironment}}-app"
group: "{{ .Values.k8sGroupName }}"
environment: "{{ .Values.k8sEnvironment }}"
spec:
ports:
- port: {{ .Values.k8sPort }}
......
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