use lws as sub chart

carlory · carlory · commit 348c943c2f3c · 2025-05-09T18:40:44.000+08:00
diff --git a/chart/Chart.lock b/chart/Chart.lock
@@ -1,12 +1,15 @@
 dependencies:
+- name: lws
+  repository: oci://registry.k8s.io/lws/charts
+  version: 0.6.1
 - name: open-webui
-  repository: https://helm.openwebui.com/
+  repository: https://helm.openwebui.com
   version: 6.4.0
 - name: gateway-helm
-  repository: oci://registry-1.docker.io/envoyproxy/
+  repository: oci://registry-1.docker.io/envoyproxy
   version: 0.0.0-latest
 - name: ai-gateway-helm
-  repository: oci://registry-1.docker.io/envoyproxy/
+  repository: oci://registry-1.docker.io/envoyproxy
   version: v0.0.0-latest
-digest: sha256:c7b1aa22097a6a1a6f4dd04beed3287ab8ef2ae1aec8a9a4ec7a71251be23e4c
-generated: "2025-04-22T20:15:43.343515+08:00"
+digest: sha256:c38d3f50113d621f6ed8ce25d39b6f8253aa771a079eca4ea6321af865b0215b
+generated: "2025-05-09T18:36:57.472144+08:00"
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -21,15 +21,19 @@ version: 0.0.9
 appVersion: 0.1.3
 
 dependencies:
+  - name: lws
+    version: 0.6.1
+    repository: "oci://registry.k8s.io/lws/charts"
+    condition: leaderWorkerSet.enabled
   - name: open-webui
     version: "6.4.0"
-    repository: "https://helm.openwebui.com/"
+    repository: "https://helm.openwebui.com"
     condition: open-webui.enabled
   - name: gateway-helm
     version: 0.0.0-latest
-    repository: "oci://registry-1.docker.io/envoyproxy/"
+    repository: "oci://registry-1.docker.io/envoyproxy"
     condition: envoy-gateway.enabled
   - name: ai-gateway-helm
     version: v0.0.0-latest
-    repository: "oci://registry-1.docker.io/envoyproxy/"
+    repository: "oci://registry-1.docker.io/envoyproxy"
     condition: envoy-ai-gateway.enabled
diff --git a/chart/crds/backendruntime-crd.yaml b/chart/crds/backendruntime-crd.yaml
@@ -1601,3 +1601,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/chart/crds/openmodel-crd.yaml b/chart/crds/openmodel-crd.yaml
@@ -240,3 +240,4 @@ spec:
     storage: true
     subresources:
       status: {}
+
diff --git a/chart/crds/playground-crd.yaml b/chart/crds/playground-crd.yaml
@@ -58,7 +58,6 @@ spec:
                       the hood, e.g. vLLM.
                     type: string
                   configName:
-                    default: default
                     description: |-
                       ConfigName represents the recommended configuration name for the backend,
                       It will be inferred from the models in the runtime if not specified, e.g. default,
@@ -1018,3 +1017,4 @@ spec:
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.replicas
       status: {}
+
diff --git a/chart/crds/service-crd.yaml b/chart/crds/service-crd.yaml
@@ -16520,3 +16520,4 @@ spec:
         specReplicasPath: .spec.replicas
         statusReplicasPath: .status.replicas
       status: {}
+
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -67,4 +67,4 @@ spec:
       - name: cert
         secret:
           defaultMode: 420
-          secretName: {{ include "chart.fullname" . }}-webhook-server-cert
+          secretName: {{ include "chart.fullname" . }}-webhook-server-cert
diff --git a/chart/templates/leader-election-rbac.yaml b/chart/templates/leader-election-rbac.yaml
@@ -56,4 +56,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/chart/templates/lws/leaderworkerset.yaml b/chart/templates/lws/leaderworkerset.yaml
diff --git a/chart/templates/manager-rbac.yaml b/chart/templates/manager-rbac.yaml
@@ -155,4 +155,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/chart/templates/metrics-reader-rbac.yaml b/chart/templates/metrics-reader-rbac.yaml
@@ -25,4 +25,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/chart/templates/metrics-service.yaml b/chart/templates/metrics-service.yaml
@@ -12,4 +12,4 @@ spec:
     control-plane: controller-manager
     {{- include "chart.selectorLabels" . | nindent 4 }}
   ports:
-  {{- .Values.metricsService.ports | toYaml | nindent 2 }}
+  {{- .Values.metricsService.ports | toYaml | nindent 2 }}
diff --git a/chart/templates/mutating-webhook-configuration.yaml b/chart/templates/mutating-webhook-configuration.yaml
@@ -86,4 +86,4 @@ webhooks:
     - UPDATE
     resources:
     - services
-  sideEffects: None
+  sideEffects: None
diff --git a/chart/templates/proxy-rbac.yaml b/chart/templates/proxy-rbac.yaml
@@ -35,4 +35,4 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: '{{ include "chart.fullname" . }}-controller-manager'
-  namespace: '{{ .Release.Namespace }}'
+  namespace: '{{ .Release.Namespace }}'
diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml
@@ -8,4 +8,4 @@ metadata:
     app.kubernetes.io/part-of: llmaz
   {{- include "chart.labels" . | nindent 4 }}
   annotations:
-    {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
+    {{- toYaml .Values.controllerManager.serviceAccount.annotations | nindent 4 }}
diff --git a/chart/templates/validating-webhook-configuration.yaml b/chart/templates/validating-webhook-configuration.yaml
@@ -86,4 +86,4 @@ webhooks:
     - UPDATE
     resources:
     - services
-  sideEffects: None
+  sideEffects: None
diff --git a/chart/templates/webhook-server-cert.yaml b/chart/templates/webhook-server-cert.yaml
@@ -3,4 +3,4 @@ kind: Secret
 metadata:
   name: {{ include "chart.fullname" . }}-webhook-server-cert
   labels:
-  {{- include "chart.labels" . | nindent 4 }}
+  {{- include "chart.labels" . | nindent 4 }}
diff --git a/chart/templates/webhook-service.yaml b/chart/templates/webhook-service.yaml
@@ -13,4 +13,4 @@ spec:
     control-plane: controller-manager
     {{- include "chart.selectorLabels" . | nindent 4 }}
   ports:
-  {{- .Values.webhookService.ports | toYaml | nindent 2 }}
+  {{- .Values.webhookService.ports | toYaml | nindent 2 }}
diff --git a/chart/values.global.yaml b/chart/values.global.yaml
@@ -29,9 +29,6 @@ backendRuntime:
 
 leaderWorkerSet:
   enabled: true
-  namespace: "llmaz-system"
-  controller:
-    replicas: 1
 
 prometheus:
   # Prometheus is required to enable smart routing.
diff --git a/site/content/en/docs/installation.md b/site/content/en/docs/installation.md
@@ -15,6 +15,7 @@ description: >
 - Prometheus, see [installation](https://github.com/InftyAI/llmaz/blob/main/site/content/en/docs/integrations/prometheus-operator.md#install-the-prometheus-operator).
 
 Note: llmaz helm chart will by default install
+- [LWS](https://github.com/kubernetes-sigs/lws) as the default inference workload in the llmaz-system, if you *already installed it * or *want to deploy it in other namespaces like lws-system* , append `--set leaderWorkerSet.enabled=false` to the command below.
 - [Envoy Gateway](https://github.com/envoyproxy/gateway) and [Envoy AI Gateway](https://github.com/envoyproxy/ai-gateway) as the frontier in the llmaz-system, if you *already installed these two components* or *want to deploy in other namespaces* , append `--set envoy-gateway.enabled=false --set envoy-ai-gateway.enabled=false` to the command below.
 - [Open WebUI](https://github.com/open-webui/open-webui) as the default chatbot, if you want to disable it, append `--set open-webui.enabled=false` to the command below.
 
