diff --git a/charts/langsmith/Chart.yaml b/charts/langsmith/Chart.yaml index 3be685a..ba86278 100644 --- a/charts/langsmith/Chart.yaml +++ b/charts/langsmith/Chart.yaml @@ -5,5 +5,5 @@ maintainers: email: ankush@langchain.dev description: Helm chart to deploy the langsmith application and all services it depends on. type: application -version: 0.1.9 +version: 0.1.10 appVersion: "0.1.0" diff --git a/charts/langsmith/templates/_helpers.tpl b/charts/langsmith/templates/_helpers.tpl index 2690f2a..fe24a50 100644 --- a/charts/langsmith/templates/_helpers.tpl +++ b/charts/langsmith/templates/_helpers.tpl @@ -46,7 +46,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} {{/* -Common labels +Common annotations */}} {{- define "langsmith.annotations" -}} {{- if .Values.commonAnnotations }} diff --git a/charts/langsmith/templates/backend/deployment.yaml b/charts/langsmith/templates/backend/deployment.yaml index 478f189..916af13 100644 --- a/charts/langsmith/templates/backend/deployment.yaml +++ b/charts/langsmith/templates/backend/deployment.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} template: metadata: {{- with .Values.backend.deployment.annotations }} @@ -31,7 +31,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -84,6 +84,9 @@ spec: {{- toYaml .Values.backend.deployment.resources | nindent 12 }} securityContext: {{- toYaml .Values.backend.deployment.securityContext | nindent 12 }} + {{- with .Values.backend.deployment.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.backend.deployment.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/backend/run-migrations.yaml b/charts/langsmith/templates/backend/run-migrations.yaml index 8e8acff..9e14e23 100644 --- a/charts/langsmith/templates/backend/run-migrations.yaml +++ b/charts/langsmith/templates/backend/run-migrations.yaml @@ -28,7 +28,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} spec: restartPolicy: Never {{- with .Values.images.imagePullSecrets }} @@ -48,6 +48,9 @@ spec: {{- toYaml .Values.backend.migrations.resources | nindent 12 }} securityContext: {{- toYaml .Values.backend.migrations.securityContext | nindent 12 }} + {{- with .Values.backend.migrations.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.backend.migrations.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/backend/service.yaml b/charts/langsmith/templates/backend/service.yaml index b1ce60c..7a7853d 100644 --- a/charts/langsmith/templates/backend/service.yaml +++ b/charts/langsmith/templates/backend/service.yaml @@ -21,4 +21,4 @@ spec: protocol: TCP selector: {{- include "langsmith.selectorLabels" . | nindent 4 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.backend.name }} diff --git a/charts/langsmith/templates/frontend/deployment.yaml b/charts/langsmith/templates/frontend/deployment.yaml index 3f6d5e5..3a160c1 100644 --- a/charts/langsmith/templates/frontend/deployment.yaml +++ b/charts/langsmith/templates/frontend/deployment.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.frontend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.frontend.name }} template: metadata: annotations: @@ -32,7 +32,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.frontend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.frontend.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -101,6 +101,9 @@ spec: - mountPath: /etc/nginx/conf.d/default.conf name: nginx-conf subPath: nginx.conf + {{- with .Values.frontend.deployment.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.frontend.deployment.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/frontend/service.yaml b/charts/langsmith/templates/frontend/service.yaml index e6c1038..47f8e1f 100644 --- a/charts/langsmith/templates/frontend/service.yaml +++ b/charts/langsmith/templates/frontend/service.yaml @@ -25,4 +25,4 @@ spec: protocol: TCP selector: {{- include "langsmith.selectorLabels" . | nindent 4 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.frontend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.frontend.name }} diff --git a/charts/langsmith/templates/hub-backend/deployment.yaml b/charts/langsmith/templates/hub-backend/deployment.yaml index 1a26fb5..8095e97 100644 --- a/charts/langsmith/templates/hub-backend/deployment.yaml +++ b/charts/langsmith/templates/hub-backend/deployment.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.hubBackend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.hubBackend.name }} template: metadata: {{- with .Values.hubBackend.deployment.annotations }} @@ -31,7 +31,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.hubBackend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.hubBackend.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -79,6 +79,9 @@ spec: {{- toYaml .Values.hubBackend.deployment.resources | nindent 12 }} securityContext: {{- toYaml .Values.hubBackend.deployment.securityContext | nindent 12 }} + {{- with .Values.hubBackend.deployment.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.hubBackend.deployment.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/hub-backend/service.yaml b/charts/langsmith/templates/hub-backend/service.yaml index ca5f9fd..2058f96 100644 --- a/charts/langsmith/templates/hub-backend/service.yaml +++ b/charts/langsmith/templates/hub-backend/service.yaml @@ -21,4 +21,4 @@ spec: protocol: TCP selector: {{- include "langsmith.selectorLabels" . | nindent 4 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.hubBackend.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.hubBackend.name }} diff --git a/charts/langsmith/templates/playground/deployment.yaml b/charts/langsmith/templates/playground/deployment.yaml index 6f84c4b..885a391 100644 --- a/charts/langsmith/templates/playground/deployment.yaml +++ b/charts/langsmith/templates/playground/deployment.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.playground.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.playground.name }} template: metadata: {{- with .Values.playground.deployment.annotations }} @@ -31,7 +31,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.playground.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.playground.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -51,10 +51,34 @@ spec: - name: playground containerPort: {{ .Values.playground.containerPort }} protocol: TCP + startupProbe: + httpGet: + path: /ok + port: {{ .Values.playground.containerPort }} + failureThreshold: 6 + periodSeconds: 10 + timeoutSeconds: 1 + livenessProbe: + httpGet: + path: /ok + port: {{ .Values.playground.containerPort }} + failureThreshold: 6 + periodSeconds: 10 + timeoutSeconds: 1 + readinessProbe: + httpGet: + path: /ok + port: {{ .Values.playground.containerPort }} + failureThreshold: 6 + periodSeconds: 10 + timeoutSeconds: 1 resources: {{- toYaml .Values.playground.deployment.resources | nindent 12 }} securityContext: {{- toYaml .Values.playground.deployment.securityContext | nindent 12 }} + {{- with .Values.playground.deployment.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.playground.deployment.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/playground/service.yaml b/charts/langsmith/templates/playground/service.yaml index 878a162..523a181 100644 --- a/charts/langsmith/templates/playground/service.yaml +++ b/charts/langsmith/templates/playground/service.yaml @@ -21,4 +21,4 @@ spec: protocol: TCP selector: {{- include "langsmith.selectorLabels" . | nindent 4 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.playground.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.playground.name }} diff --git a/charts/langsmith/templates/postgres/service.yaml b/charts/langsmith/templates/postgres/service.yaml index 47ffe19..27de473 100644 --- a/charts/langsmith/templates/postgres/service.yaml +++ b/charts/langsmith/templates/postgres/service.yaml @@ -22,5 +22,5 @@ spec: protocol: TCP selector: {{- include "langsmith.selectorLabels" . | nindent 4 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.postgres.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.postgres.name }} {{- end }} diff --git a/charts/langsmith/templates/postgres/stateful-set.yaml b/charts/langsmith/templates/postgres/stateful-set.yaml index b29994d..0c37ac0 100644 --- a/charts/langsmith/templates/postgres/stateful-set.yaml +++ b/charts/langsmith/templates/postgres/stateful-set.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.postgres.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.postgres.name }} template: metadata: {{- with .Values.postgres.statefulSet.annotations }} @@ -31,7 +31,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.postgres.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.postgres.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -100,6 +100,9 @@ spec: - mountPath: /var/lib/postgresql/data name: data subPath: postgres + {{- with .Values.postgres.statefulSet.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.postgres.statefulSet.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/queue/deployment.yaml b/charts/langsmith/templates/queue/deployment.yaml index 38fca5a..6f16b47 100644 --- a/charts/langsmith/templates/queue/deployment.yaml +++ b/charts/langsmith/templates/queue/deployment.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.queue.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.queue.name }} template: metadata: {{- with .Values.queue.deployment.annotations }} @@ -31,7 +31,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.queue.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.queue.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -65,6 +65,9 @@ spec: {{- toYaml .Values.queue.deployment.resources | nindent 12 }} securityContext: {{- toYaml .Values.queue.deployment.securityContext | nindent 12 }} + {{- with .Values.queue.deployment.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.queue.deployment.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/templates/redis/service.yaml b/charts/langsmith/templates/redis/service.yaml index 709d641..c4ae508 100644 --- a/charts/langsmith/templates/redis/service.yaml +++ b/charts/langsmith/templates/redis/service.yaml @@ -22,5 +22,5 @@ spec: protocol: TCP selector: {{- include "langsmith.selectorLabels" . | nindent 4 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.redis.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.redis.name }} {{- end }} diff --git a/charts/langsmith/templates/redis/stateful-set.yaml b/charts/langsmith/templates/redis/stateful-set.yaml index 778d928..f8b5427 100644 --- a/charts/langsmith/templates/redis/stateful-set.yaml +++ b/charts/langsmith/templates/redis/stateful-set.yaml @@ -19,7 +19,7 @@ spec: selector: matchLabels: {{- include "langsmith.selectorLabels" . | nindent 6 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.redis.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.redis.name }} template: metadata: {{- with .Values.redis.statefulSet.annotations }} @@ -31,7 +31,7 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- include "langsmith.labels" . | nindent 8 }} - app.kubernetes.io/name: {{ include "langsmith.fullname" . }}-{{ .Values.redis.name }} + app.kubernetes.io/component: {{ include "langsmith.fullname" . }}-{{ .Values.redis.name }} spec: {{- with .Values.images.imagePullSecrets }} imagePullSecrets: @@ -87,6 +87,9 @@ spec: - mountPath: /data name: data {{- end }} + {{- with .Values.redis.statefulSet.sidecars }} + {{- toYaml . | nindent 8 }} + {{- end }} {{- with .Values.redis.statefulSet.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/langsmith/values.yaml b/charts/langsmith/values.yaml index a219481..37a42d1 100644 --- a/charts/langsmith/values.yaml +++ b/charts/langsmith/values.yaml @@ -71,6 +71,7 @@ backend: # cpu: 200m # memory: 500Mi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -89,6 +90,7 @@ backend: # cpu: 200m # memory: 500Mi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -120,6 +122,7 @@ frontend: # cpu: 200m # memory: 500Mi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -152,6 +155,7 @@ hubBackend: # cpu: 200m # memory: 500Mi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -183,6 +187,7 @@ playground: # cpu: 200m # memory: 500Mi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -226,6 +231,7 @@ postgres: # cpu: 1000m # memory: 4Gi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -255,6 +261,7 @@ queue: # cpu: 200m # memory: 500Mi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {} @@ -291,6 +298,7 @@ redis: # cpu: 1000m # memory: 2Gi extraEnv: [] + sidecars: [] nodeSelector: {} tolerations: [] affinity: {}