correct services app labels

aimclub · Dec 17, 2023 · c35249c · c35249c
1 parent cac4e7b
commit c35249c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 9 deletions.
diff --git a/distributed/charts/autotm/templates/deployments.yaml b/distributed/charts/autotm/templates/deployments.yaml
@@ -20,10 +20,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}mlflow
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}mlflow
     spec:
       volumes:
         - name: mlflow-vol
@@ -64,10 +64,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}mlflow-db
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}mlflow-db
     spec:
       volumes:
         - name: mlflow-db-vol
@@ -119,10 +119,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}mlflow-db-phpmyadmin
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}mlflow-db-phpmyadmin
     spec:
       containers:
       - name: phpmyadmin
@@ -161,10 +161,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}mongo-tm-experiments-db
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}mongo-tm-experiments-db
     spec:
       tolerations:
         - key: "node.kubernetes.io/disk-pressure"
@@ -211,10 +211,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}mongo-express-tm-experiments
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}mongo-express-tm-experiments
     spec:
 #      volumes:
 #        - name: wait-for-vol
@@ -264,10 +264,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}rabbitmq
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}rabbitmq
     spec:
       volumes:
         - name: config-volume
@@ -302,10 +302,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}redis
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}redis
     spec:
       containers:
       - name: redis
@@ -336,10 +336,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}celery-flower
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}celery-flower
     spec:
       containers:
       - name: flower
@@ -372,10 +372,10 @@ spec:
       annotations:
         "sidecar.istio.io/inject": "false"
       labels:
-        app: {{ include "autotm.prefix" . }}fitness-worker
         {{- range $key, $val := .Values.required_labels }}
         {{ $key }}: {{ $val | quote }}
         {{- end }}
+        app: {{ include "autotm.prefix" . }}fitness-worker
     spec:
       volumes:
         - name: dataset

diff --git a/distributed/charts/autotm/templates/services.yaml b/distributed/charts/autotm/templates/services.yaml
@@ -4,6 +4,21 @@
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  name: {{ include "autotm.prefix" . }}mlflow
+  labels:
+    {{- range $key, $val := .Values.required_labels }}
+    {{ $key }}: {{ $val | quote }}
+    {{- end }}
+spec:
+  type: NodePort
+  ports:
+  - port: 5000
+  selector:
+    app: {{ include "autotm.prefix" . }}mlflow
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: {{ include "autotm.prefix" . }}mlflow-db-phpmyadmin
   labels: