Merge branch 'main' into avimoondra/fix-backend-host-bug

tryretool · May 22, 2024 · 9301e56 · 9301e56
2 parents 3ee9435 + ac9499d
commit 9301e56
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 29 deletions.
diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-deployment.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-deployment.yaml
@@ -198,7 +198,7 @@ spec:
             - name: membership
               containerPort: {{ include (printf "temporal.%s.membershipPort" $service) $ }}
               protocol: TCP
-            - name: metrics
+            - name: http-metrics
               containerPort: 9090
               protocol: TCP
           {{- if and (ne $service "worker") $.Values.server.useLegacyHealthProbe }}

diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-service-monitor.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-service-monitor.yaml
@@ -19,7 +19,7 @@ metadata:
     {{- end }}
 spec:
   endpoints:
-  - port: metrics
+  - port: http-metrics
     interval: {{ default $.Values.server.metrics.serviceMonitor.interval $serviceValues.metrics.serviceMonitor.interval }}
     {{- with (default $.Values.server.metrics.serviceMonitor.metricRelabelings $serviceValues.metrics.serviceMonitor.metricRelabelings) }}
     metricRelabelings:

diff --git a/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml b/charts/retool/charts/retool-temporal-services-helm/templates/server-service.yaml
@@ -87,9 +87,9 @@ spec:
       protocol: TCP
       name: grpc-membership
     - port: 9090
-      targetPort: metrics
+      targetPort: http-metrics
       protocol: TCP
-      name: metrics
+      name: http-metrics
   selector:
     app.kubernetes.io/name: {{ include "temporal.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}

diff --git a/charts/retool/templates/_helpers.tpl b/charts/retool/templates/_helpers.tpl
@@ -305,6 +305,14 @@ Set code executor service name
 {{ template "retool.fullname" . }}-code-executor
 {{- end -}}
 
+{{/*
+Set multiplayer service name
+*/}}
+{{- define "retool.multiplayer.name" -}}
+{{ template "retool.fullname" . }}-multiplayer-ws
+{{- end -}}
+
+
 {{/*
 Set code executor image tag
 Usage: (template "retool.codeExecutor.image.tag" .)

diff --git a/charts/retool/templates/deployment_backend.yaml b/charts/retool/templates/deployment_backend.yaml
@@ -241,7 +241,7 @@ spec:
         {{- end }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
-          name: {{ template "retool.name" . }}
+          name: http-server
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:

diff --git a/charts/retool/templates/deployment_code_executor.yaml b/charts/retool/templates/deployment_code_executor.yaml
@@ -20,9 +20,6 @@ spec:
   template:
     metadata:
       annotations:
-        prometheus.io/job: {{ template "retool.codeExecutor.name" . }}
-        prometheus.io/scrape: 'true'
-        prometheus.io/port: '9090'
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
 {{- end }}
@@ -89,10 +86,7 @@ spec:
           {{- end }}
         ports:
         - containerPort: 3004
-          name: {{ template "retool.name" . }}
-          protocol: TCP
-        - containerPort: 9090
-          name: metrics
+          name: http-server
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -143,9 +137,5 @@ spec:
   - protocol: TCP
     port: 80
     targetPort: 3004
-    name: {{ template "retool.name" . }}
-  - protocol: TCP
-    port: 9090
-    targetPort: metrics
-    name: metrics
+    name: http-server
 {{- end }}
diff --git a/charts/retool/templates/deployment_multiplayer_ws.yaml b/charts/retool/templates/deployment_multiplayer_ws.yaml
@@ -2,20 +2,20 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "retool.fullname" . }}-multiplayer-ws
+  name: {{ template "retool.multiplayer.name" . }}
 spec:
   selector:
-    retoolService: {{ template "retool.fullname" . }}-multiplayer-ws
+    retoolService: {{ template "retool.multiplayer.name" . }}
   ports:
-  - name: ws
+  - name: http-server
     protocol: TCP
     port: 80
     targetPort: 3001
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "retool.fullname" . }}-multiplayer-ws
+  name: {{ template "retool.multiplayer.name" . }}
   labels:
 {{- include "retool.labels" . | nindent 4 }}
 {{- if .Values.deployment.annotations }}
@@ -128,6 +128,10 @@ spec:
         - name: "{{ $key }}"
           value: "{{ $value }}"
         {{- end }}
+        ports:
+          - containerPort: 3001
+            name: http-server
+            protocol: TCP
         resources:
 {{ toYaml .Values.multiplayer.resources | indent 10 }}
         readinessProbe:

diff --git a/charts/retool/templates/deployment_telemetry.yaml b/charts/retool/templates/deployment_telemetry.yaml
@@ -127,7 +127,7 @@ spec:
           {{- end }}
         ports:
           - containerPort: 9125
-            name: statsd-udp
+            name: udp-statsd
             protocol: UDP
           {{- if .Values.telemetry.extraPorts }}
           {{- .Values.telemetry.extraPorts | toYaml | nindent 10 }}
@@ -175,7 +175,7 @@ metadata:
     {{- include "retool.telemetry.labels" . | nindent 4 }}
 spec:
   ports:
-    - name: statsd-udp
+    - name: udp-statsd
       port: 9125
       protocol: UDP
   selector:

diff --git a/charts/retool/templates/deployment_workflows.yaml b/charts/retool/templates/deployment_workflows.yaml
@@ -223,7 +223,7 @@ spec:
         {{- end }}
         ports:
         - containerPort: {{ .Values.service.internalPort }}
-          name: {{ template "retool.name" . }}
+          name: http-server
           protocol: TCP
 {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -319,4 +319,5 @@ spec:
   - protocol: TCP
     port: 80
     targetPort: {{ .Values.service.internalPort }}
+    name: http-server
 {{- end }}
diff --git a/charts/retool/templates/deployment_workflows_worker.yaml b/charts/retool/templates/deployment_workflows_worker.yaml
@@ -242,10 +242,10 @@ spec:
         {{- end }}
         ports:
         - containerPort: 3005
-          name: {{ template "retool.name" . }}
+          name: http-server
           protocol: TCP
         - containerPort: 9090
-          name: metrics
+          name: http-metrics
           protocol: TCP
 
 {{- if .Values.livenessProbe.enabled }}
@@ -342,9 +342,9 @@ spec:
   - protocol: TCP
     port: 3005
     targetPort: 3005
-    name: {{ template "retool.name" . }}
+    name: http-server
   - protocol: TCP
     port: 9090
-    targetPort: metrics
-    name: metrics
+    targetPort: http-metrics
+    name: http-metrics
 {{- end }}