Merge branch 'main' into main

Author: zerofishnoodles

helm/templates/deployment-router.yaml

@@ -41,10 +41,18 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
       {{- end }}
+      {{- if .Values.routerSpec.securityContext }}
+      securityContext:
+        {{- toYaml .Values.routerSpec.securityContext | nindent 8 }}
+      {{- end }}
       containers:
       - name: router-container
         image: "{{ .Values.routerSpec.repository | default "lmcache/lmstack-router" }}:{{ .Values.routerSpec.tag | default "latest" }}"
         imagePullPolicy: "{{ .Values.routerSpec.imagePullPolicy | default "Always" }}"
+        {{- if .Values.routerSpec.containerSecurityContext }}
+        securityContext:
+          {{- toYaml .Values.routerSpec.containerSecurityContext | nindent 10 }}
+        {{- end }}
         env:
           {{- if .Values.routerSpec.hf_token }}
           - name: HF_TOKEN

helm/templates/deployment-vllm-multi.yaml

@@ -86,6 +86,10 @@ spec:
             {{- toYaml . | nindent 12 }}
             {{- end }}
           {{- end }}
+          {{- if .Values.servingEngineSpec.containerSecurityContext }}
+          securityContext:
+            {{- toYaml .Values.servingEngineSpec.containerSecurityContext | nindent 12 }}
+          {{- end }}
       {{- end }}
       {{- if .Values.servingEngineSpec.securityContext }}
       securityContext:

helm/values.schema.json

@@ -487,6 +487,17 @@
         "containerPort": {
           "type": "integer"
         },
+        "securityContext": {
+          "type": "object",
+          "description": "Pod-level security context configuration",
+          "additionalProperties": true
+        },
+        "containerSecurityContext": {
+          "type": "object",
+          "description": "Container-level security context configuration",
+          "additionalProperties": true
+        },
+
         "servicePort": {
           "type": "integer"
         },

helm/values.yaml

@@ -312,6 +312,12 @@ routerSpec:
   tag: "latest"
   imagePullPolicy: "Always"
 
+  # -- Pod-level security context configuration. https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#podsecuritycontext-v1-core
+  securityContext: {}
+
+  # -- Container-level security context configuration. https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.32/#securitycontext-v1-core
+  containerSecurityContext: {}
+
   # -- Whether to enable the router service
   enableRouter: true