From 4083eccc4ea5e7916948d2e548d0972c02b788cc Mon Sep 17 00:00:00 2001 From: Leon Date: Fri, 7 Feb 2025 18:16:39 +0800 Subject: [PATCH] update --- addons-cluster/llm/templates/cluster.yaml | 4 ++-- addons/llm/Chart.yaml | 2 +- addons/xinference/Chart.yaml | 2 +- examples/etcd/cluster.yaml | 2 +- examples/llm/cluster.yaml | 4 ++-- examples/xinference/cluster.yaml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons-cluster/llm/templates/cluster.yaml b/addons-cluster/llm/templates/cluster.yaml index 01de43b84..674af9ca2 100644 --- a/addons-cluster/llm/templates/cluster.yaml +++ b/addons-cluster/llm/templates/cluster.yaml @@ -12,7 +12,7 @@ spec: clusterDef: ggml # ref clusterDefinition.name componentSpecs: - name: ggml - componentDefRef: ggml + componentDef: ggml {{- include "kblib.componentMonitor" . | indent 6 }} replicas: {{ .Values.replicas }} {{- include "kblib.componentResources" . | indent 6 }} @@ -20,7 +20,7 @@ spec: clusterDef: vllm # ref clusterDefinition.name componentSpecs: - name: vllm - componentDefRef: vllm + componentDef: vllm {{- include "kblib.componentMonitor" . | indent 6 }} replicas: {{ .Values.replicas }} resources: diff --git a/addons/llm/Chart.yaml b/addons/llm/Chart.yaml index ae555920d..06d6b5003 100644 --- a/addons/llm/Chart.yaml +++ b/addons/llm/Chart.yaml @@ -28,6 +28,6 @@ maintainers: url: https://github.com/apecloud/kubeblocks/ annotations: - addon.kubeblocks.io/kubeblocks-version: ">=0.9.0" + addon.kubeblocks.io/kubeblocks-version: ">=1.0.0" addon.kubeblocks.io/model: "LLM" addon.kubeblocks.io/provider: "community" diff --git a/addons/xinference/Chart.yaml b/addons/xinference/Chart.yaml index d70bb49d4..8cc7b5adc 100644 --- a/addons/xinference/Chart.yaml +++ b/addons/xinference/Chart.yaml @@ -28,6 +28,6 @@ maintainers: url: https://github.com/apecloud/kubeblocks/ annotations: - addon.kubeblocks.io/kubeblocks-version: ">=0.9.0" + addon.kubeblocks.io/kubeblocks-version: ">=1.0.0" addon.kubeblocks.io/model: "LLM" addon.kubeblocks.io/provider: "community" diff --git a/examples/etcd/cluster.yaml b/examples/etcd/cluster.yaml index 2277f61b0..6b5f00c76 100644 --- a/examples/etcd/cluster.yaml +++ b/examples/etcd/cluster.yaml @@ -47,4 +47,4 @@ spec: resources: requests: # Set the storage size as needed - storage: 20Gi \ No newline at end of file + storage: 20Gi diff --git a/examples/llm/cluster.yaml b/examples/llm/cluster.yaml index 447d561be..8c46225c7 100644 --- a/examples/llm/cluster.yaml +++ b/examples/llm/cluster.yaml @@ -7,8 +7,8 @@ spec: # Specifies the name of the ClusterDefinition to use when creating a Cluster. clusterDefinitionRef: vllm # Specifies the behavior when a Cluster is deleted. + # Valid options are: [DoNotTerminate, Delete, WipeOut] (`Halt` is deprecated since KB 0.9) # - `DoNotTerminate`: Prevents deletion of the Cluster. This policy ensures that all resources remain intact. - # - `Halt`: Deletes Cluster resources like Pods and Services but retains Persistent Volume Claims (PVCs), allowing for data preservation while stopping other operations. # - `Delete`: Extends the `Halt` policy by also removing PVCs, leading to a thorough cleanup while removing all persistent data. # - `WipeOut`: An aggressive policy that deletes all Cluster resources, including volume snapshots and backups in external storage. This results in complete data removal and should be used cautiously, primarily in non-production environments to avoid irreversible data loss. terminationPolicy: Delete @@ -17,7 +17,7 @@ spec: # ClusterComponentSpec defines the specifications for a Component in a Cluster. componentSpecs: - name: vllm - componentDefRef: vllm + componentDef: vllm replicas: 1 resources: limits: diff --git a/examples/xinference/cluster.yaml b/examples/xinference/cluster.yaml index 880eae18a..f78de9277 100644 --- a/examples/xinference/cluster.yaml +++ b/examples/xinference/cluster.yaml @@ -5,8 +5,8 @@ metadata: namespace: default spec: # Specifies the behavior when a Cluster is deleted. + # Valid options are: [DoNotTerminate, Delete, WipeOut] (`Halt` is deprecated since KB 0.9) # - `DoNotTerminate`: Prevents deletion of the Cluster. This policy ensures that all resources remain intact. - # - `Halt`: Deletes Cluster resources like Pods and Services but retains Persistent Volume Claims (PVCs), allowing for data preservation while stopping other operations. # - `Delete`: Extends the `Halt` policy by also removing PVCs, leading to a thorough cleanup while removing all persistent data. # - `WipeOut`: An aggressive policy that deletes all Cluster resources, including volume snapshots and backups in external storage. This results in complete data removal and should be used cautiously, primarily in non-production environments to avoid irreversible data loss. terminationPolicy: Delete