Skip to content

Update service template #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2023
Merged

Update service template #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbd6f74
Update service template
yunfeng-scale Aug 25, 2023
311a0dc
fix
yunfeng-scale Aug 25, 2023
63ffc11
Merge branch 'main' into yunfeng-update-template
phil-scale Aug 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions charts/llm-engine/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,21 +330,21 @@ volumeMounts:
mountPath: /workspace/llm_engine/llm_engine/infra/gateways/resources/templates
{{- if .Values.aws }}
- name: config-volume
mountPath: /home/user/.aws/config
mountPath: /root/.aws/config
subPath: config
{{- end }}
{{- if .Values.config.values }}
- name: llm-engine-service-config-volume
mountPath: /workspace/llm_engine/service_configs
- name: infra-service-config-volume
mountPath: /workspace/ml_infra_core/llm_engine.core/llm_engine.core/configs
mountPath: /workspace/model-engine/model_engine_server/core/configs
{{- end }}
{{- end }}

{{- define "llmEngine.forwarderVolumeMounts" }}
volumeMounts:
- name: config-volume
mountPath: /home/user/.aws/config
mountPath: /root/.aws/config
subPath: config
- name: user-config
mountPath: /workspace/user_config
Expand All @@ -354,7 +354,7 @@ volumeMounts:
subPath: raw_data
{{- if .Values.config.values }}
- name: infra-service-config-volume
mountPath: /workspace/ml_infra_core/llm_engine.core/llm_engine.core/configs
mountPath: /workspace/model-engine/model_engine_server/core/configs
{{- end }}
{{- end }}

Expand Down
112 changes: 109 additions & 3 deletions charts/llm-engine/templates/service_template_config_map.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ data:
- ddtrace-run
- run-service
- --config
- /workspace/server/model_engine_server/inference/configs/${FORWARDER_CONFIG_FILE_NAME}
- /workspace/model-engine/model_engine_server/inference/configs/${FORWARDER_CONFIG_FILE_NAME}
- --http
- production_threads
- --port
Expand Down Expand Up @@ -223,7 +223,7 @@ data:
- -m
- model_engine_server.inference.forwarding.http_forwarder
- --config
- /workspace/server/model_engine_server/inference/configs/service--http_forwarder.yaml
- /workspace/model-engine/model_engine_server/inference/configs/service--http_forwarder.yaml
- --port
- "${FORWARDER_PORT}"
- --num-workers
Expand Down Expand Up @@ -266,7 +266,7 @@ data:
- ddtrace-run
- run-service
- --config
- /workspace/server/model_engine_server/inference/configs/${FORWARDER_CONFIG_FILE_NAME}
- /workspace/model-engine/model_engine_server/inference/configs/${FORWARDER_CONFIG_FILE_NAME}
- --queue
- "${QUEUE}"
- --task-visibility
Expand Down Expand Up @@ -483,6 +483,62 @@ data:
protocol: TCP
name: http
${NODE_PORT_DICT}
virtual-service.yaml: |-
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: ${RESOURCE_NAME}
namespace: ${NAMESPACE}
labels:
user_id: ${OWNER}
team: ${TEAM}
product: ${PRODUCT}
created_by: ${CREATED_BY}
owner: ${OWNER}
env: circleci
managed-by: model-engine
use_scale_launch_endpoint_network_policy: "true"
tags.datadoghq.com/env: circleci
tags.datadoghq.com/version: ${GIT_TAG}
tags.datadoghq.com/service: ${ENDPOINT_NAME}
endpoint_id: ${ENDPOINT_ID}
endpoint_name: ${ENDPOINT_NAME}
spec:
hosts:
- ${RESOURCE_NAME}.${DNS_HOST_DOMAIN}
gateways:
- default/internal-gateway
http:
- route:
- destination:
host: "${RESOURCE_NAME}.${NAMESPACE}.svc.cluster.local"
port:
number: 80
destination-rule.yaml: |-
apiVersion: networking.istio.io/v1beta1
kind: DestinationRule
metadata:
name: ${RESOURCE_NAME}
namespace: ${NAMESPACE}
labels:
user_id: ${OWNER}
team: ${TEAM}
product: ${PRODUCT}
created_by: ${CREATED_BY}
owner: ${OWNER}
env: circleci
managed-by: model-engine
use_scale_launch_endpoint_network_policy: "true"
tags.datadoghq.com/env: circleci
tags.datadoghq.com/version: ${GIT_TAG}
tags.datadoghq.com/service: ${ENDPOINT_NAME}
endpoint_id: ${ENDPOINT_ID}
endpoint_name: ${ENDPOINT_NAME}
spec:
host: "${RESOURCE_NAME}.${NAMESPACE}.svc.cluster.local"
trafficPolicy:
loadBalancer:
simple: LEAST_REQUEST
vertical-pod-autoscaler.yaml: |-
apiVersion: "autoscaling.k8s.io/v1"
kind: VerticalPodAutoscaler
Expand Down Expand Up @@ -742,3 +798,53 @@ data:
command: ["/bin/sh", "-ec", "while : ; do sleep 30 ; done"]
terminationGracePeriodSeconds: 0
{{- end }}
cron-trigger.yaml: |-
apiVersion: batch/v1
kind: CronJob
metadata:
name: ${NAME}
labels:
user_id: ${OWNER}
team: ${TEAM}
product: ${PRODUCT}
created_by: ${CREATED_BY}
owner: ${OWNER}
launch_trigger_id: ${TRIGGER_ID}
tags.datadoghq.com/service: ${TRIGGER_ID}
spec:
schedule: "${CRON_SCHEDULE}"
successfulJobsHistoryLimit: 0
failedJobsHistoryLimit: 0
jobTemplate:
spec:
backoffLimit: 0
activeDeadlineSeconds: ${BATCH_CURL_JOB_ACTIVE_DEADLINE_SECONDS}
template:
metadata:
labels:
user_id: ${OWNER}
team: ${TEAM}
product: ${PRODUCT}
created_by: ${CREATED_BY}
owner: ${OWNER}
launch_trigger_id: ${TRIGGER_ID}
tags.datadoghq.com/service: ${TRIGGER_ID}
spec:
containers:
- name: ${NAME}
image: curlimages/curl:7.72.0
imagePullPolicy: IfNotPresent
command:
- curl
- -X
- 'POST'
- '${HOST}/v1/docker-image-batch-jobs'
- -H
- 'accept: application/json'
- -H
- 'Content-Type: application/json'
- -d
- '{ "docker_image_batch_job_bundle_id": "${DOCKER_IMAGE_BATCH_JOB_BUNDLE_ID}", "job_config": ${JOB_CONFIG}, "labels": ${JOB_METADATA} }'
- -u
- '${OWNER}:'
restartPolicy: Never