chore: remove pulsar, llm from defualt installed addons (#8655)

Co-authored-by: wusai80 <wusai80@gmail.com> (cherry picked from commit 18721cf)
apecloud · Dec 16, 2024 · 3b028bc · 3b028bc
1 parent 01a8145
commit 3b028bc
Show file tree

Hide file tree

Showing 24 changed files with 13 additions and 308 deletions.
diff --git a/deploy/helm/scripts/change_crs_release.sh b/deploy/helm/scripts/change_crs_release.sh
@@ -43,11 +43,9 @@ addons=(
     "apecloud-mysql"
     "etcd"
     "kafka"
-    "llm"
     "mongodb"
     "mysql"
     "postgresql"
-    "pulsar"
     "qdrant"
     "redis"
     "alertmanager-webhook-adaptor"

diff --git a/deploy/helm/templates/addons/apecloud-mysql-addon.yaml b/deploy/helm/templates/addons/apecloud-mysql-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "apecloud-mysql" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "apecloud-mysql"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/templates/addons/kafka-addon.yaml b/deploy/helm/templates/addons/kafka-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "kafka" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "kafka"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/templates/addons/mongodb-addon.yaml b/deploy/helm/templates/addons/mongodb-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "mongodb" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "mongodb"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/templates/addons/mysql-addon.yaml b/deploy/helm/templates/addons/mysql-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "mysql" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "mysql"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/templates/addons/postgresql-addon.yaml b/deploy/helm/templates/addons/postgresql-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "postgresql" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "postgresql"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/templates/addons/pulsar-addon.yaml b/deploy/helm/templates/addons/pulsar-addon.yaml
diff --git a/deploy/helm/templates/addons/qdrant-addon.yaml b/deploy/helm/templates/addons/qdrant-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "qdrant" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "qdrant"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/templates/addons/llm-addon.yaml → ...helm/templates/addons/rabbitmq-addon.yaml b/deploy/helm/templates/addons/llm-addon.yaml → ...helm/templates/addons/rabbitmq-addon.yaml
@@ -1,12 +1,12 @@
-{{- if has "llm" .Values.autoInstalledAddons  }}
+{{- if has "rabbitmq" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
-  "name" "llm"
+  "name" "rabbitmq"
   "version" "1.0.0-alpha.0"
-  "model" "LLM"
+  "model" "message"
   "provider" "community"
-  "description" "Large Language Models."
+  "description" "RabbitMQ is a reliable and mature messaging and streaming broker."
   "autoInstall" false) . ) -}}
   {{- end }}
diff --git a/deploy/helm/templates/addons/redis-addon.yaml b/deploy/helm/templates/addons/redis-addon.yaml
@@ -1,7 +1,7 @@
 {{- if has "redis" .Values.autoInstalledAddons  }}
 {{- $selectorLabels := include "kubeblocks.selectorLabels" . }}
 {{- include "kubeblocks.buildAddonCR" (merge (dict
-  "kbVersion" ">=0.7.0"
+  "kbVersion" ">=1.0.0"
   "selectorLabels" $selectorLabels
   "name" "redis"
   "version" "1.0.0-alpha.0"

diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -480,13 +480,12 @@ autoInstalledAddons:
   - "apecloud-mysql"
   - "etcd"
   - "kafka"
-  - "llm"
   - "mongodb"
   - "mysql"
   - "postgresql"
-  - "pulsar"
   - "qdrant"
   - "redis"
+  - "rabbitmq"
   - "alertmanager-webhook-adaptor"
   - "aws-load-balancer-controller"
   - "csi-hostpath-driver"

diff --git a/examples/llm/README.md b/examples/llm/README.md
diff --git a/examples/llm/cluster.yaml b/examples/llm/cluster.yaml
diff --git a/examples/llm/restart.yaml b/examples/llm/restart.yaml
diff --git a/examples/llm/start.yaml b/examples/llm/start.yaml
diff --git a/examples/llm/stop.yaml b/examples/llm/stop.yaml
diff --git a/test/e2e/testdata/smoketest/llm/00_llmcluster.yaml b/test/e2e/testdata/smoketest/llm/00_llmcluster.yaml
diff --git a/test/e2e/testdata/smoketest/llm/01_vscale.yaml b/test/e2e/testdata/smoketest/llm/01_vscale.yaml
diff --git a/test/e2e/testdata/smoketest/llm/02_hscale_out.yaml b/test/e2e/testdata/smoketest/llm/02_hscale_out.yaml
diff --git a/test/e2e/testdata/smoketest/llm/03_hscale_in.yaml b/test/e2e/testdata/smoketest/llm/03_hscale_in.yaml
diff --git a/test/e2e/testdata/smoketest/llm/04_vexpand.yaml b/test/e2e/testdata/smoketest/llm/04_vexpand.yaml
diff --git a/test/e2e/testdata/smoketest/llm/05_stop.yaml b/test/e2e/testdata/smoketest/llm/05_stop.yaml