cleanup

Author: ryansingman

deploy/helm/tlm/templates/chat/deployment.yaml

@@ -17,6 +17,10 @@ spec:
         azure.workload.identity/use: "true"
     spec:
       serviceAccountName: {{ .Values.chat_backend.service_account }}
+      {{- if .Values.imagePullSecret.enabled }}
+      imagePullSecrets:
+        - name: {{ .Values.imagePullSecret.name }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}-chat-backend
           {{if .Values.chat_backend.image.tag }}
@@ -69,7 +73,3 @@ spec:
               port: {{ .Values.chat_backend.container.port }}
           resources:
             {{- toYaml .Values.chat_backend.resources | nindent 12 }}
-      {{- if .Values.imagePullSecret.enabled }}
-      imagePullSecrets:
-        - name: {{ .Values.imagePullSecret.name }}
-      {{- end }}

infra/tlm/modules/tlm/app/main.tf

@@ -1,32 +1,34 @@
+resource helm_release "this" {
+    name = local.release_name
+    namespace = local.namespace
+    chart = "tlm"
+    repository = "oci://cleanlabtlm.azurecr.io/tlm"
 
-# resource helm_release "this" {
-#     name = local.release_name
-#     namespace = local.namespace
-#     chart = "tlm"
-#     repository = "oci://cleanlabtlm.azurecr.io/tlm"
+    repository_username = var.image_pull_username
+    repository_password = var.image_pull_password
 
-#     set {
-#         name = "chat_backend.imagePullSecret.enabled"
-#         value = true
-#     }
+    set {
+        name = "imagePullSecret.enabled"
+        value = true
+    }
 
-#     set {
-#         name = "chat_backend.imagePullSecret.name"
-#         value = local.image_pull_secret_name
-#     }
+    set {
+        name = "imagePullSecret.name"
+        value = local.image_pull_secret_name
+    }
 
-#     set {
-#         name = "chat_backend.image.repository"
-#         value = "cleanlabtlm.azurecr.io/tlm/chat-backend"
-#     }
+    set {
+        name = "chat_backend.image.repository"
+        value = "cleanlabtlm.azurecr.io/tlm/chat-backend"
+    }
 
-#     set {
-#         name = "chat_backend.service_account"
-#         value = kubernetes_service_account.openai_identity_sa.metadata[0].name
-#     }
+    set {
+        name = "chat_backend.service_account"
+        value = kubernetes_service_account.openai_identity_sa.metadata[0].name
+    }
 
-#     set {
-#         name = "chat_backend.defaults.TLM_DEFAULT_MODEL_API_BASE"
-#         value = data.azurerm_cognitive_account.openai_service.endpoint
-#     }
-# }
+    set {
+        name = "chat_backend.defaults.TLM_DEFAULT_MODEL_API_BASE"
+        value = data.azurerm_cognitive_account.openai_service.endpoint
+    }
+}

infra/tlm/modules/tlm/cluster/main.tf

@@ -7,7 +7,7 @@ resource "azurerm_kubernetes_cluster" "this" {
   default_node_pool {
     name       = "default"
     temporary_name_for_rotation = "temp"
-    node_count = 3
+    node_count = 2
     vm_size    = "Standard_D2as_v4"
   }