statefull-editoast: remove tile-server and create a statefull-editoast

Signed-off-by: bloussou <[email protected]>
OpenRailAssociation · Oct 18, 2024 · 9439b01 · 9439b01
1 parent 7b4fccd
commit 9439b01
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 77 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -71,23 +71,23 @@ app.kubernetes.io/instance: {{ .Release.Name }}-editoast
 {{- end }}
 
 {{/*
-Common labels Tile Server
+Common labels stateful Editoast
 */}}
-{{- define "osrd.labels.tileServer" -}}
+{{- define "osrd.labels.statefulEditoast" -}}
 helm.sh/chart: {{ include "osrd.chart" . }}
-{{ include "osrd.selectorLabels.tileServer" . }}
+{{ include "osrd.selectorLabels.statefulEditoast" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
 {{/*
-Selector labels Tile Server
+Selector labels stateful Editoast
 */}}
-{{- define "osrd.selectorLabels.tileServer" -}}
-app.kubernetes.io/name: {{ include "osrd.name" . }}-tile-server
-app.kubernetes.io/instance: {{ .Release.Name }}-tile-server
+{{- define "osrd.selectorLabels.statefulEditoast" -}}
+app.kubernetes.io/name: {{ include "osrd.name" . }}-stateful-editoast
+app.kubernetes.io/instance: {{ .Release.Name }}-stateful-editoast
 {{- end }}
 
 {{/*

diff --git a/templates/editoast/autoscaler.yaml b/templates/editoast/autoscaler.yaml
@@ -0,0 +1,16 @@
+{{- if .Values.services.editoast.hpa.enabled -}}
+
+apiVersion: autoscaling/v1
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ include "osrd.fullname" . }}-editoast-hpa
+spec:
+  maxReplicas: {{ .Values.services.editoast.hpa.maxReplicas }}
+  minReplicas: {{ .Values.services.editoast.hpa.minReplicas }}
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ include "osrd.fullname" . }}-editoast
+  targetCPUUtilizationPercentage: {{ .Values.services.editoast.hpa.targetCPUUtilizationPercentage }}
+
+{{- end }}
diff --git a/templates/gateway/configmap.yaml b/templates/gateway/configmap.yaml
@@ -23,12 +23,10 @@ data:
     {{- end }}
     {{- end }}
 
-    {{- if .Values.services.tileServer.enabled }}
     [[targets]]
-    prefix = "/api/layers"
-    upstream = "http://{{ include "osrd.fullname" . }}-tile-server/layers"
+    prefix = "/api/infra"
+    upstream = "http://{{ include "osrd.fullname" . }}-stateful-editoast/infra"
     require_auth = true
-    {{- end }}
 
     [[targets]]
     prefix = "/api"

diff --git a/templates/tile_server/deployment.yaml → templates/stateful_editoast/deployment.yaml b/templates/tile_server/deployment.yaml → templates/stateful_editoast/deployment.yaml
@@ -1,26 +1,25 @@
-{{- if .Values.services.tileServer.enabled -}}
+{{- if .Values.services.statefulEditoast.enabled -}}
 
-{{- $mergedAnnotations := merge (.Values.annotations | default dict) (.Values.services.tileServer.annotations | default dict) }}
-{{- $generatedLabels := include "osrd.labels.tileServer" . | fromYaml }}
-{{- $mergedLabels := merge (.Values.labels | default dict) (.Values.services.tileServer.labels | default dict) $generatedLabels }}
+{{- $mergedAnnotations := merge (.Values.annotations | default dict) (.Values.services.statefulEditoast.annotations | default dict) }}
+{{- $generatedLabels := include "osrd.labels.statefulEditoast" . | fromYaml }}
+{{- $mergedLabels := merge (.Values.labels | default dict) (.Values.services.statefulEditoast.labels | default dict) $generatedLabels }}
 
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "osrd.fullname" . }}-tile-server
+  name: {{ include "osrd.fullname" . }}-stateful-editoast
   labels:
     {{- toYaml $mergedLabels | nindent 4 }}
   annotations:
     {{- toYaml $mergedAnnotations | nindent 4 }}
 spec:
-  replicas: {{ .Values.services.tileServer.replicaCount }}
+  replicas: 1
   selector:
     matchLabels:
-      {{- include "osrd.selectorLabels.tileServer" . | nindent 6 }}
+      {{- include "osrd.selectorLabels.statefulEditoast" . | nindent 6 }}
   template:
     metadata:
       labels:
-        rollme: {{ randAlphaNum 5 | quote }}
         {{- toYaml $mergedLabels | nindent 8 }}
       annotations:
         {{- toYaml $mergedAnnotations | nindent 8 }}
@@ -30,35 +29,31 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
-        - name: {{ include "osrd.name" . }}-tile-server
+        - name: {{ include "osrd.name" . }}-stateful-editoast
           image: "{{ .Values.images.editoast }}"
           imagePullPolicy: {{ .Values.pullPolicy }}
 
           ports:
             - name: http
-              containerPort: {{ .Values.services.tileServer.service.port }}
+              containerPort: {{ .Values.services.statefulEditoast.service.port }}
               protocol: TCP
 
-          {{- if not .Values.services.tileServer.livenessProbe.disabled }}
           livenessProbe:
             httpGet:
               path: /health
               port: http
-            initialDelaySeconds: {{ .Values.services.tileServer.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.services.tileServer.livenessProbe.periodSeconds }}
-            timeoutSeconds: {{ .Values.services.tileServer.livenessProbe.timeoutSeconds }}
-          {{- end }}
+            initialDelaySeconds: {{ .Values.services.statefulEditoast.livenessProbe.initialDelaySeconds }}
+            periodSeconds: {{ .Values.services.statefulEditoast.livenessProbe.periodSeconds }}
+            timeoutSeconds: {{ .Values.services.statefulEditoast.livenessProbe.timeoutSeconds }}
 
-          {{- if not .Values.services.tileServer.readinessProbe.disabled }}
           readinessProbe:
             httpGet:
               path: /health
               port: http
-          {{- end }}
 
           env:
             - name: EDITOAST_PORT
-              value: "{{ .Values.services.tileServer.service.targetPort }}"
+              value: "{{ .Values.services.statefulEditoast.service.targetPort }}"
 
             - name: OSRDYNE_API_URL
               value: http://{{ include "osrd.fullname" . }}-osrdyne
@@ -97,12 +92,12 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
 
-            {{- with .Values.services.tileServer.env | default dict }}
+            {{- with .Values.services.statefulEditoast.env | default dict }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
 
           resources:
-            {{- toYaml .Values.services.tileServer.resources | nindent 12 }}
+            {{- toYaml .Values.services.statefulEditoast.resources | nindent 12 }}
 
       nodeSelector:
         {{- toYaml (merge (.Values.nodeSelector | default dict) (.Values.services.gateway.nodeSelector | default dict)) | nindent 8 }}
@@ -114,7 +109,7 @@ spec:
         {{- with .Values.tolerations | default dict }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.services.tileServer.tolerations | default dict }}
+        {{- with .Values.services.statefulEditoast.tolerations | default dict }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
 {{- end }}
diff --git a/templates/stateful_editoast/service.yaml b/templates/stateful_editoast/service.yaml
@@ -0,0 +1,19 @@
+{{- if .Values.services.statefulEditoast.enabled -}}
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "osrd.fullname" . }}-stateful-editoast
+  labels:
+    {{- include "osrd.labels.statefulEditoast" . | nindent 4 }}
+spec:
+  type: {{ .Values.services.statefulEditoast.service.type }}
+  ports:
+    - port: {{ .Values.services.statefulEditoast.service.port }}
+      targetPort: {{ .Values.services.statefulEditoast.service.targetPort }}
+      protocol: TCP
+      name: http
+  selector:
+    {{- include "osrd.selectorLabels.statefulEditoast" . | nindent 4 }}
+
+{{- end }}
diff --git a/templates/tile_server/autoscaler.yaml b/templates/tile_server/autoscaler.yaml
diff --git a/templates/tile_server/service.yaml b/templates/tile_server/service.yaml
diff --git a/values.yaml b/values.yaml
@@ -87,9 +87,9 @@ services:
     autoscaling:
       type: NoScaling
 
-  tileServer:
+  statefulEditoast:
     enabled: true
-    replicaCount: 2
+    replicaCount: 1
     service:
       type: ClusterIP
       port: 80
@@ -99,13 +99,6 @@ services:
       initialDelaySeconds: 0
       periodSeconds: 10
       timeoutSeconds: 1
-    readinessProbe:
-      disabled: false
-    hpa:
-      enabled: false
-      minReplicas: 1
-      maxReplicas: 10
-      targetCPUUtilizationPercentage: 80
     annotations: {}
     labels: {}
     nodeSelector: {}
@@ -160,7 +153,7 @@ services:
 
   editoast:
     enabled: true
-    replicaCount: 1
+    replicaCount: 2
     service:
       type: ClusterIP
       port: 80
@@ -172,6 +165,11 @@ services:
       timeoutSeconds: 1
     readinessProbe:
       disabled: false
+    hpa:
+      enabled: true
+      minReplicas: 2
+      maxReplicas: 10
+      targetCPUUtilizationPercentage: 80
     annotations: {}
     init:
       enabled: true