From e7fbe7615187ef86bb6a0a69926fbece0859af94 Mon Sep 17 00:00:00 2001 From: Jamie Land Date: Tue, 18 Mar 2025 19:42:23 -0400 Subject: [PATCH] Addressing comments --- .gitignore | 1 + {chart => charts/llama-stack}/.helmignore | 0 {chart => charts/llama-stack}/Chart.yaml | 3 ++- {chart => charts/llama-stack}/README.md | 6 ++++-- {chart => charts/llama-stack}/files/run.yaml | 0 {chart => charts/llama-stack}/templates/_helpers.tpl | 0 {chart => charts/llama-stack}/templates/config.yaml | 0 {chart => charts/llama-stack}/templates/deployment.yaml | 2 ++ {chart => charts/llama-stack}/templates/hpa.yaml | 0 {chart => charts/llama-stack}/templates/ingress.yaml | 0 .../llama-stack}/templates/openshift/route.yaml | 0 {chart => charts/llama-stack}/templates/service.yaml | 0 {chart => charts/llama-stack}/templates/serviceaccount.yaml | 0 {chart => charts/llama-stack}/values.yaml | 3 ++- 14 files changed, 11 insertions(+), 4 deletions(-) rename {chart => charts/llama-stack}/.helmignore (100%) rename {chart => charts/llama-stack}/Chart.yaml (95%) rename {chart => charts/llama-stack}/README.md (99%) rename {chart => charts/llama-stack}/files/run.yaml (100%) rename {chart => charts/llama-stack}/templates/_helpers.tpl (100%) rename {chart => charts/llama-stack}/templates/config.yaml (100%) rename {chart => charts/llama-stack}/templates/deployment.yaml (96%) rename {chart => charts/llama-stack}/templates/hpa.yaml (100%) rename {chart => charts/llama-stack}/templates/ingress.yaml (100%) rename {chart => charts/llama-stack}/templates/openshift/route.yaml (100%) rename {chart => charts/llama-stack}/templates/service.yaml (100%) rename {chart => charts/llama-stack}/templates/serviceaccount.yaml (100%) rename {chart => charts/llama-stack}/values.yaml (98%) diff --git a/.gitignore b/.gitignore index 3396249e4..73a2ef80f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ pytest-report.xml .coverage .python-version **/local-* +**/charts/*.tgz diff --git a/chart/.helmignore b/charts/llama-stack/.helmignore similarity index 100% rename from chart/.helmignore rename to charts/llama-stack/.helmignore diff --git a/chart/Chart.yaml b/charts/llama-stack/Chart.yaml similarity index 95% rename from chart/Chart.yaml rename to charts/llama-stack/Chart.yaml index e3b6b6069..467e54133 100644 --- a/chart/Chart.yaml +++ b/charts/llama-stack/Chart.yaml @@ -1,5 +1,6 @@ apiVersion: v2 name: llama-stack +icon: https://helm.sh/img/helm.svg description: Basic chart for deploying llama-stack # A chart can be either an 'application' or a 'library' chart. @@ -21,4 +22,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "0.1.6" diff --git a/chart/README.md b/charts/llama-stack/README.md similarity index 99% rename from chart/README.md rename to charts/llama-stack/README.md index bf21dc55b..d5e3f1765 100644 --- a/chart/README.md +++ b/charts/llama-stack/README.md @@ -1,4 +1,3 @@ - # Llama Stack Helm Chart This Helm chart is designed to install the Llama Stack, a comprehensive platform for llama-related tasks. @@ -27,9 +26,12 @@ vllm: Login to Kubernetes through the CLI and run: ```sh -helm upgrade -i ollama-stack . -f local-values.yaml +helm upgrade -i llama-stack . -f local-values.yaml ``` +> [!TIP] +> Can be installed on [minikube](https://minikube.sigs.k8s.io/docs/start/?arch=%2Flinux%2Fx86-64%2Fstable%2Fbinary+download) to for local validation. + ## Custom Configuration By default llama-stack will use the run.yaml config that comes with the specified distribution. For more granular control the `customRunConfig` can be set to true, in which case the helm chart will use the values inside of the `files/run.yaml` instead. diff --git a/chart/files/run.yaml b/charts/llama-stack/files/run.yaml similarity index 100% rename from chart/files/run.yaml rename to charts/llama-stack/files/run.yaml diff --git a/chart/templates/_helpers.tpl b/charts/llama-stack/templates/_helpers.tpl similarity index 100% rename from chart/templates/_helpers.tpl rename to charts/llama-stack/templates/_helpers.tpl diff --git a/chart/templates/config.yaml b/charts/llama-stack/templates/config.yaml similarity index 100% rename from chart/templates/config.yaml rename to charts/llama-stack/templates/config.yaml diff --git a/chart/templates/deployment.yaml b/charts/llama-stack/templates/deployment.yaml similarity index 96% rename from chart/templates/deployment.yaml rename to charts/llama-stack/templates/deployment.yaml index 59488ffc5..a030a4a4d 100644 --- a/chart/templates/deployment.yaml +++ b/charts/llama-stack/templates/deployment.yaml @@ -4,6 +4,8 @@ metadata: name: {{ include "llama-stack.fullname" . }} labels: {{- include "llama-stack.labels" . | nindent 4 }} + annotations: + checksum/run-config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} spec: replicas: {{ .Values.replicaCount }} selector: diff --git a/chart/templates/hpa.yaml b/charts/llama-stack/templates/hpa.yaml similarity index 100% rename from chart/templates/hpa.yaml rename to charts/llama-stack/templates/hpa.yaml diff --git a/chart/templates/ingress.yaml b/charts/llama-stack/templates/ingress.yaml similarity index 100% rename from chart/templates/ingress.yaml rename to charts/llama-stack/templates/ingress.yaml diff --git a/chart/templates/openshift/route.yaml b/charts/llama-stack/templates/openshift/route.yaml similarity index 100% rename from chart/templates/openshift/route.yaml rename to charts/llama-stack/templates/openshift/route.yaml diff --git a/chart/templates/service.yaml b/charts/llama-stack/templates/service.yaml similarity index 100% rename from chart/templates/service.yaml rename to charts/llama-stack/templates/service.yaml diff --git a/chart/templates/serviceaccount.yaml b/charts/llama-stack/templates/serviceaccount.yaml similarity index 100% rename from chart/templates/serviceaccount.yaml rename to charts/llama-stack/templates/serviceaccount.yaml diff --git a/chart/values.yaml b/charts/llama-stack/values.yaml similarity index 98% rename from chart/values.yaml rename to charts/llama-stack/values.yaml index 07171423c..08fea0b0e 100644 --- a/chart/values.yaml +++ b/charts/llama-stack/values.yaml @@ -15,6 +15,7 @@ vllm: # apiKey: "xxxxxxxxxxxx" # https://llama-stack.readthedocs.io/en/latest/distributions/selection.html +# Note this is only used if the `image.repository` is not overridden distribution: distribution-remote-vllm telemetry: @@ -31,7 +32,7 @@ replicaCount: 1 # This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/ image: repository: docker.io/llamastack/{{ $.Values.distribution }} - tag: 0.1.6 + # tag: latest # This sets the pull policy for images. pullPolicy: Always