From f88856e65c97102ae7b1ed88781fedbeeb39c0de Mon Sep 17 00:00:00 2001 From: 1aal Date: Sat, 14 Oct 2023 12:04:09 +0800 Subject: [PATCH 1/6] temp save --- .../apecloud-mysql/apecloud-mysql-addon.yaml | 30 ++++++++--------- addons/elasticsearch/elasticsearch-addon.yaml | 32 +++++++++---------- addons/foxlake/foxlake-addon.yaml | 28 ++++++++-------- addons/greptimedb/greptimedb-addon.yaml | 27 ++++++++-------- addons/kafka/kafka-addon.yaml | 18 +++++++---- addons/llm/llm-addon.yaml | 17 +++++++--- addons/milvus/milvus-addon.yaml | 18 +++++++---- addons/mongodb/mongodb-addon.yaml | 18 +++++++---- addons/mysql/mysql-addon.yaml | 18 +++++++---- addons/nebula/nebula-addon.yaml | 18 +++++++---- addons/neon/neon-addon.yaml | 18 +++++++---- addons/opensearch/opensearch-addon.yaml | 18 +++++++---- addons/oracle-mysql/oracle-mysql-addon.yaml | 18 +++++++---- addons/orioledb/orioledb-addon.yaml | 18 +++++++---- addons/postgresql/postgresql-addon.yaml | 18 +++++++---- addons/pulsar/pulsar-addon.yaml | 18 +++++++---- addons/qdrant/qdrant-addon.yaml | 19 +++++++---- addons/redis/redis-addon.yaml | 18 +++++++---- addons/risingwave/risingwave-addon.yaml | 18 +++++++---- addons/starrocks/starrocks-addon.yaml | 18 +++++++---- addons/tdengine/tdengine-addon.yaml | 18 +++++++---- addons/weaviate/vmagent-addon.yaml | 18 +++++++---- addons/weaviate/weaviate-addon.yaml | 18 +++++++---- 23 files changed, 287 insertions(+), 172 deletions(-) diff --git a/addons/apecloud-mysql/apecloud-mysql-addon.yaml b/addons/apecloud-mysql/apecloud-mysql-addon.yaml index a7cccdd..cf54145 100644 --- a/addons/apecloud-mysql/apecloud-mysql-addon.yaml +++ b/addons/apecloud-mysql/apecloud-mysql-addon.yaml @@ -2,28 +2,26 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: apecloud-mysql - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": apecloud - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'ApeCloud MySQL is a database that is compatible with MySQL syntax and achieves high availability through the utilization of the RAFT consensus protocol.' - type: Helm - helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "apecloud-mysql" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - - installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} - +# chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-cluster-0.6.3/apecloud-mysql-cluster-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/apecloud-mysql-0.6.3.tgz" defaultInstallValues: - enabled: true diff --git a/addons/elasticsearch/elasticsearch-addon.yaml b/addons/elasticsearch/elasticsearch-addon.yaml index a593d51..f748cfd 100644 --- a/addons/elasticsearch/elasticsearch-addon.yaml +++ b/addons/elasticsearch/elasticsearch-addon.yaml @@ -3,32 +3,32 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: elasticsearch - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Search-Engine + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Elasticsearch is a distributed search and analytics engine. It is used for web search, log monitoring, and real-time analytics. Ideal for Big Data applications.' type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "elasticsearch" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - - installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} + # todo: both are 404 + chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/elasticsearch-0.7.0-beta.0/elasticsearch-0.7.0-beta.0.tgz" + # chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/elasticsearch-0.7.0-beta.0.tgz" installable: autoInstall: false defaultInstallValues: - enabled: false - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" diff --git a/addons/foxlake/foxlake-addon.yaml b/addons/foxlake/foxlake-addon.yaml index 51fd293..2c00df2 100644 --- a/addons/foxlake/foxlake-addon.yaml +++ b/addons/foxlake/foxlake-addon.yaml @@ -2,26 +2,28 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: foxlake - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: ApeCloud FoxLake is an open-source cloud-native data warehouse. type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "foxlake" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - - installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} + # todo: both are 404 + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-cluster-0.6.3/apecloud-mysql-cluster-0.6.3.tgz" + chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0-beta.0/foxlake-0.7.0-beta.0.tgz" installable: autoInstall: false diff --git a/addons/greptimedb/greptimedb-addon.yaml b/addons/greptimedb/greptimedb-addon.yaml index 600aa8a..0f5db03 100644 --- a/addons/greptimedb/greptimedb-addon.yaml +++ b/addons/greptimedb/greptimedb-addon.yaml @@ -2,26 +2,27 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: greptimedb - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Time-Series + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'GreptimeDB is an Apache 2.0 licensed distributed time-series database.' type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "greptimedb" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - - installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-cluster-0.6.3/apecloud-mysql-cluster-0.6.3.tgz" + chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/greptimedb-0.7.0-beta.0/greptimedb-0.7.0-beta.0.tgz" installable: autoInstall: false diff --git a/addons/kafka/kafka-addon.yaml b/addons/kafka/kafka-addon.yaml index bc735b0..ddc0de9 100644 --- a/addons/kafka/kafka-addon.yaml +++ b/addons/kafka/kafka-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: kafka - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Stream + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Apache Kafka is a distributed streaming platform designed to build real-time pipelines and can be used as a message broker or as a replacement for a log aggregation solution for big data applications.' diff --git a/addons/llm/llm-addon.yaml b/addons/llm/llm-addon.yaml index 9d887b6..ae2c970 100644 --- a/addons/llm/llm-addon.yaml +++ b/addons/llm/llm-addon.yaml @@ -2,12 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: llm - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: LLM + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: The large language model. type: Helm diff --git a/addons/milvus/milvus-addon.yaml b/addons/milvus/milvus-addon.yaml index 4a350db..8d719c8 100644 --- a/addons/milvus/milvus-addon.yaml +++ b/addons/milvus/milvus-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: milvus - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Vector-DBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Milvus is an open source (Apache-2.0 licensed) vector database built to power embedding similarity search and AI applications.' diff --git a/addons/mongodb/mongodb-addon.yaml b/addons/mongodb/mongodb-addon.yaml index 0786daf..78cdce9 100644 --- a/addons/mongodb/mongodb-addon.yaml +++ b/addons/mongodb/mongodb-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: mongodb - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Document + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'MongoDB is a document database designed for ease of application development and scaling.' diff --git a/addons/mysql/mysql-addon.yaml b/addons/mysql/mysql-addon.yaml index cda1ddc..45d7ee9 100644 --- a/addons/mysql/mysql-addon.yaml +++ b/addons/mysql/mysql-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: mysql - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' diff --git a/addons/nebula/nebula-addon.yaml b/addons/nebula/nebula-addon.yaml index cde5ce4..5de8adb 100644 --- a/addons/nebula/nebula-addon.yaml +++ b/addons/nebula/nebula-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: nebula - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Graph + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'NebulaGraph is an Apache 2.0 licensed distributed graph database.' diff --git a/addons/neon/neon-addon.yaml b/addons/neon/neon-addon.yaml index f4f3bcb..1330d8e 100644 --- a/addons/neon/neon-addon.yaml +++ b/addons/neon/neon-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: neon - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Neon is a fully managed serverless PostgreSQL with a generous free tier. Neon separates storage and compute and offers modern developer features such as serverless, branching, bottomless storage, and more. Before deploying neon, you must execute `kbcli addon enable cert-manager` command to deploy cert-manager.' diff --git a/addons/opensearch/opensearch-addon.yaml b/addons/opensearch/opensearch-addon.yaml index b89bca4..f02931d 100644 --- a/addons/opensearch/opensearch-addon.yaml +++ b/addons/opensearch/opensearch-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: opensearch - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Search-Engine + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'OpenSearch is a scalable, flexible, and extensible open-source software suite for search, analytics, and observability applications licensed under Apache 2.0.' diff --git a/addons/oracle-mysql/oracle-mysql-addon.yaml b/addons/oracle-mysql/oracle-mysql-addon.yaml index 215524d..5eb2133 100644 --- a/addons/oracle-mysql/oracle-mysql-addon.yaml +++ b/addons/oracle-mysql/oracle-mysql-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: oracle-mysql - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": ApeCloud - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' diff --git a/addons/orioledb/orioledb-addon.yaml b/addons/orioledb/orioledb-addon.yaml index c83f9bf..e075895 100644 --- a/addons/orioledb/orioledb-addon.yaml +++ b/addons/orioledb/orioledb-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: orioledb - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": apecloud - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'OrioleDB – a modern cloud-native storage engine solving some PostgreSQL wicked problems.' diff --git a/addons/postgresql/postgresql-addon.yaml b/addons/postgresql/postgresql-addon.yaml index 4c3545a..af912cd 100644 --- a/addons/postgresql/postgresql-addon.yaml +++ b/addons/postgresql/postgresql-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: postgresql - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'PostgreSQL (Postgres) is an open source object-relational database known for reliability and data integrity. ACID-compliant, it supports foreign keys, joins, views, triggers and stored procedures.' diff --git a/addons/pulsar/pulsar-addon.yaml b/addons/pulsar/pulsar-addon.yaml index 6f36219..ec9f69d 100644 --- a/addons/pulsar/pulsar-addon.yaml +++ b/addons/pulsar/pulsar-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: pulsar - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Stream + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: "Apache® Pulsar™ is an open-source, distributed messaging and streaming platform built for the cloud." diff --git a/addons/qdrant/qdrant-addon.yaml b/addons/qdrant/qdrant-addon.yaml index 3b635d8..4d9c2ac 100644 --- a/addons/qdrant/qdrant-addon.yaml +++ b/addons/qdrant/qdrant-addon.yaml @@ -1,14 +1,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: - name: qdrant - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Vector-DBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Qdrant is an open source (Apache-2.0 licensed), vector similarity search engine and vector database.' diff --git a/addons/redis/redis-addon.yaml b/addons/redis/redis-addon.yaml index de2211d..1741c70 100644 --- a/addons/redis/redis-addon.yaml +++ b/addons/redis/redis-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: redis - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Key-value + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.' diff --git a/addons/risingwave/risingwave-addon.yaml b/addons/risingwave/risingwave-addon.yaml index d55cacb..0a1bd45 100644 --- a/addons/risingwave/risingwave-addon.yaml +++ b/addons/risingwave/risingwave-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: risingwave - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'RisingWave is a distributed SQL streaming database.' diff --git a/addons/starrocks/starrocks-addon.yaml b/addons/starrocks/starrocks-addon.yaml index ac3a0b8..dcc945b 100644 --- a/addons/starrocks/starrocks-addon.yaml +++ b/addons/starrocks/starrocks-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: starrocks - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Starrocks is an open-source, high-performance analytical database.' diff --git a/addons/tdengine/tdengine-addon.yaml b/addons/tdengine/tdengine-addon.yaml index 84f1bdd..5f7c8c5 100644 --- a/addons/tdengine/tdengine-addon.yaml +++ b/addons/tdengine/tdengine-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: tdengine - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'TDengine is an open source, high-performance, cloud native time-series database optimized for Internet of Things (IoT), Connected Cars, and Industrial IoT.' diff --git a/addons/weaviate/vmagent-addon.yaml b/addons/weaviate/vmagent-addon.yaml index aec6622..b0fc173 100644 --- a/addons/weaviate/vmagent-addon.yaml +++ b/addons/weaviate/vmagent-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: victoria-metrics-agent - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'vmagent is a tiny agent which helps you collect metrics from various sources, relabel and filter the collected metrics and store them in VictoriaMetrics or any other storage systems via Prometheus remote_write protocol.' type: Helm diff --git a/addons/weaviate/weaviate-addon.yaml b/addons/weaviate/weaviate-addon.yaml index 51c5216..04a6711 100644 --- a/addons/weaviate/weaviate-addon.yaml +++ b/addons/weaviate/weaviate-addon.yaml @@ -2,13 +2,19 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: name: weaviate - labels: - {{- include "kubeblocks.labels" . | nindent 4 }} - "kubeblocks.io/provider": community - {{- if .Values.keepAddons }} annotations: - helm.sh/resource-policy: keep - {{- end }} + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/model: Vector-DBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.6.3 + helm.sh/chart: kubeblocks-0.6.3 + kubeblocks.io/provider: community spec: description: 'Weaviate is an open-source (BSD-3.0 licensed) vector database. It allows you to store data objects and vector embeddings from your favorite ML-models, and scale seamlessly into billions of data objects.' From 1bacd1daf58306d323e201fb1e6b46875eb59eb9 Mon Sep 17 00:00:00 2001 From: 1aal Date: Sat, 14 Oct 2023 18:07:41 +0800 Subject: [PATCH 2/6] temp save --- addons/greptimedb/greptimedb-addon.yaml | 1 + addons/kafka/kafka-addon.yaml | 9 ++------- addons/llm/llm-addon.yaml | 19 +++++++------------ addons/milvus/milvus-addon.yaml | 12 ++++-------- addons/mongodb/mongodb-addon.yaml | 7 ++----- addons/mysql/mysql-addon.yaml | 10 +++------- addons/nebula/nebula-addon.yaml | 8 ++------ addons/neon/neon-addon.yaml | 10 ++++------ addons/opensearch/opensearch-addon.yaml | 11 +++-------- addons/oracle-mysql/oracle-mysql-addon.yaml | 9 +++------ addons/orioledb/orioledb-addon.yaml | 14 ++++---------- addons/postgresql/postgresql-addon.yaml | 7 ++----- addons/pulsar/pulsar-addon.yaml | 9 +++------ addons/qdrant/qdrant-addon.yaml | 12 ++++-------- addons/redis/redis-addon.yaml | 7 ++----- addons/risingwave/risingwave-addon.yaml | 8 +++----- addons/starrocks/starrocks-addon.yaml | 10 ++++------ addons/tdengine/tdengine-addon.yaml | 9 +++------ addons/weaviate/vmagent-addon.yaml | 18 +++++++----------- addons/weaviate/weaviate-addon.yaml | 11 +++-------- 20 files changed, 66 insertions(+), 135 deletions(-) diff --git a/addons/greptimedb/greptimedb-addon.yaml b/addons/greptimedb/greptimedb-addon.yaml index 0f5db03..a044dad 100644 --- a/addons/greptimedb/greptimedb-addon.yaml +++ b/addons/greptimedb/greptimedb-addon.yaml @@ -21,6 +21,7 @@ spec: type: Helm helm: + # todo: both are 404 # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-cluster-0.6.3/apecloud-mysql-cluster-0.6.3.tgz" chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/greptimedb-0.7.0-beta.0/greptimedb-0.7.0-beta.0.tgz" diff --git a/addons/kafka/kafka-addon.yaml b/addons/kafka/kafka-addon.yaml index ddc0de9..116d1d9 100644 --- a/addons/kafka/kafka-addon.yaml +++ b/addons/kafka/kafka-addon.yaml @@ -22,13 +22,8 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "kafka" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - - installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/kafka-0.6.3/kafka-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/kafka-0.6.3.tgz" installable: autoInstall: true diff --git a/addons/llm/llm-addon.yaml b/addons/llm/llm-addon.yaml index ae2c970..86e0a77 100644 --- a/addons/llm/llm-addon.yaml +++ b/addons/llm/llm-addon.yaml @@ -20,13 +20,10 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "llm" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # todo: 404 not found + chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/llm-0.7.0-beta.0/llm-0.7.0-beta.0.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: 0.1.0 - {{- end }} valuesMapping: valueMap: @@ -43,11 +40,9 @@ spec: requests: resources.requests.memory limits: resources.limits.memory - defaultInstallValues: - - replicas: 1 - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + defaultInstallValues: + - replicas: 1 + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" - installable: - autoInstall: false + installable: + autoInstall: false diff --git a/addons/milvus/milvus-addon.yaml b/addons/milvus/milvus-addon.yaml index 8d719c8..356d07d 100644 --- a/addons/milvus/milvus-addon.yaml +++ b/addons/milvus/milvus-addon.yaml @@ -21,19 +21,15 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "milvus" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} +# chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/milvus-0.6.3/milvus-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/milvus-0.6.3.tgz" + installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - enabled: false - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" \ No newline at end of file diff --git a/addons/mongodb/mongodb-addon.yaml b/addons/mongodb/mongodb-addon.yaml index 78cdce9..2ffd400 100644 --- a/addons/mongodb/mongodb-addon.yaml +++ b/addons/mongodb/mongodb-addon.yaml @@ -21,13 +21,10 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "mongodb" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} +# chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/mongodb-0.6.3/mongodb-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/mongodb-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: true diff --git a/addons/mysql/mysql-addon.yaml b/addons/mysql/mysql-addon.yaml index 45d7ee9..70b7bb8 100644 --- a/addons/mysql/mysql-addon.yaml +++ b/addons/mysql/mysql-addon.yaml @@ -21,13 +21,9 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "mysql" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - - installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} + # todo: not found + chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/mysql-0.7.0-beta.0/mysql-0.7.0-beta.0.tgz" + # chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/mysql-0.7.0-beta.0.tgz" installable: autoInstall: true diff --git a/addons/nebula/nebula-addon.yaml b/addons/nebula/nebula-addon.yaml index 5de8adb..ac144fb 100644 --- a/addons/nebula/nebula-addon.yaml +++ b/addons/nebula/nebula-addon.yaml @@ -21,13 +21,9 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "nebula" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} - + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/nebula-0.6.3/nebula-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/nebula-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false diff --git a/addons/neon/neon-addon.yaml b/addons/neon/neon-addon.yaml index 1330d8e..47e8162 100644 --- a/addons/neon/neon-addon.yaml +++ b/addons/neon/neon-addon.yaml @@ -21,16 +21,14 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "neon" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # todo: not found + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/neon-0.7.0-beta.0/neon-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/neon-0.7.0-beta.0.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - - enabled: true + - enabled: true \ No newline at end of file diff --git a/addons/opensearch/opensearch-addon.yaml b/addons/opensearch/opensearch-addon.yaml index f02931d..ae872b3 100644 --- a/addons/opensearch/opensearch-addon.yaml +++ b/addons/opensearch/opensearch-addon.yaml @@ -21,19 +21,14 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "opensearch" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/opensearch-0.6.3/opensearch-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/opensearch-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - enabled: false - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" \ No newline at end of file diff --git a/addons/oracle-mysql/oracle-mysql-addon.yaml b/addons/oracle-mysql/oracle-mysql-addon.yaml index 5eb2133..eacb21c 100644 --- a/addons/oracle-mysql/oracle-mysql-addon.yaml +++ b/addons/oracle-mysql/oracle-mysql-addon.yaml @@ -19,15 +19,12 @@ spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' type: Helm - helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "oracle-mysql" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # todo: not found + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/oracle-mysql-0.7.0-beta.0/oracle-mysql-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/oracle-mysql-0.7.0-beta.0.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false diff --git a/addons/orioledb/orioledb-addon.yaml b/addons/orioledb/orioledb-addon.yaml index e075895..07bfc80 100644 --- a/addons/orioledb/orioledb-addon.yaml +++ b/addons/orioledb/orioledb-addon.yaml @@ -21,21 +21,15 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "orioledb" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # todo: not found + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/orioledb-0.6.3/orioledb-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/orioledb-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - enabled: false - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} - - + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" \ No newline at end of file diff --git a/addons/postgresql/postgresql-addon.yaml b/addons/postgresql/postgresql-addon.yaml index af912cd..7f3c2a5 100644 --- a/addons/postgresql/postgresql-addon.yaml +++ b/addons/postgresql/postgresql-addon.yaml @@ -21,13 +21,10 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "postgresql" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/postgresql-0.6.3/postgresql-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/postgresql-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: true diff --git a/addons/pulsar/pulsar-addon.yaml b/addons/pulsar/pulsar-addon.yaml index ec9f69d..48d93cc 100644 --- a/addons/pulsar/pulsar-addon.yaml +++ b/addons/pulsar/pulsar-addon.yaml @@ -21,16 +21,13 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "pulsar" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/pulsar-0.6.3/pulsar-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/pulsar-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: true defaultInstallValues: - - enabled: true + - enabled: true \ No newline at end of file diff --git a/addons/qdrant/qdrant-addon.yaml b/addons/qdrant/qdrant-addon.yaml index 4d9c2ac..2b92445 100644 --- a/addons/qdrant/qdrant-addon.yaml +++ b/addons/qdrant/qdrant-addon.yaml @@ -1,6 +1,7 @@ apiVersion: extensions.kubeblocks.io/v1alpha1 kind: Addon metadata: + name: qdrant annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks @@ -20,19 +21,14 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "qdrant" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/qdrant-0.6.3/qdrant-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/qdrant-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - enabled: false - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" \ No newline at end of file diff --git a/addons/redis/redis-addon.yaml b/addons/redis/redis-addon.yaml index 1741c70..29dc1ad 100644 --- a/addons/redis/redis-addon.yaml +++ b/addons/redis/redis-addon.yaml @@ -21,13 +21,10 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "redis" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/redis-0.6.3/redis-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/redis-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: true diff --git a/addons/risingwave/risingwave-addon.yaml b/addons/risingwave/risingwave-addon.yaml index 0a1bd45..415756b 100644 --- a/addons/risingwave/risingwave-addon.yaml +++ b/addons/risingwave/risingwave-addon.yaml @@ -21,13 +21,11 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "risingwave" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # todo: not found + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/risingwave-0.6.3/risingwave-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/risingwave-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false diff --git a/addons/starrocks/starrocks-addon.yaml b/addons/starrocks/starrocks-addon.yaml index dcc945b..0182746 100644 --- a/addons/starrocks/starrocks-addon.yaml +++ b/addons/starrocks/starrocks-addon.yaml @@ -21,16 +21,14 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "starrocks" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # todo: not found + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/starrocks-0.6.3/starrocks-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/starrocks-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - - enabled: true + - enabled: true \ No newline at end of file diff --git a/addons/tdengine/tdengine-addon.yaml b/addons/tdengine/tdengine-addon.yaml index 5f7c8c5..c0ea92e 100644 --- a/addons/tdengine/tdengine-addon.yaml +++ b/addons/tdengine/tdengine-addon.yaml @@ -21,16 +21,13 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "tdengine" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/tdengine-0.6.3/tdengine-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/tdengine-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - - enabled: true + - enabled: true \ No newline at end of file diff --git a/addons/weaviate/vmagent-addon.yaml b/addons/weaviate/vmagent-addon.yaml index b0fc173..ce8a9c9 100644 --- a/addons/weaviate/vmagent-addon.yaml +++ b/addons/weaviate/vmagent-addon.yaml @@ -20,13 +20,11 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "victoria-metrics-agent" "version" "0.8.41" "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/victoria-metrics-agent-0.8.41/victoria-metrics-agent-0.8.41.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/victoria-metrics-agent-0.8.41.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: 0.8.41 - {{- end }} valuesMapping: valueMap: @@ -42,12 +40,10 @@ spec: memory: requests: resources.requests.memory limits: resources.limits.memory - + defaultInstallValues: - - replicas: 1 - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + - replicas: 1 + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" installable: - autoInstall: false + autoInstall: false \ No newline at end of file diff --git a/addons/weaviate/weaviate-addon.yaml b/addons/weaviate/weaviate-addon.yaml index 04a6711..e3ca014 100644 --- a/addons/weaviate/weaviate-addon.yaml +++ b/addons/weaviate/weaviate-addon.yaml @@ -21,19 +21,14 @@ spec: type: Helm helm: - {{- include "kubeblocks.addonChartLocationURL" ( dict "name" "weaviate" "version" (default .Chart.Version .Values.versionOverride) "values" .Values) | indent 4 }} - {{- include "kubeblocks.addonChartsImage" . | indent 4 }} + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/weaviate-0.6.3/weaviate-0.6.3.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/weaviate-0.6.3.tgz" installOptions: - {{- if hasPrefix "oci://" .Values.addonChartLocationBase }} - version: {{ default .Chart.Version .Values.versionOverride }} - {{- end }} installable: autoInstall: false defaultInstallValues: - enabled: false - {{- with .Values.tolerations }} - tolerations: {{ toJson . | quote }} - {{- end }} + tolerations: "[{\"effect\":\"NoSchedule\",\"key\":\"kb-controller\",\"operator\":\"Equal\",\"value\":\"true\"}]" \ No newline at end of file From a7f7c0c91b3d49f7a1345368990713502ea9a816 Mon Sep 17 00:00:00 2001 From: 1aal Date: Sat, 14 Oct 2023 18:46:20 +0800 Subject: [PATCH 3/6] fix addon --- .../{apecloud-mysql-addon.yaml => 0.6.3.yaml} | 2 +- addons/apecloud-mysql/0.7.0-beta.0.yaml | 30 +++++++++++++++++++ ...ticsearch-addon.yaml => 0.7.0-beta.0.yaml} | 11 ++++--- .../{foxlake-addon.yaml => 0.7.0-beta.0.yaml} | 12 ++++---- ...reptimedb-addon.yaml => 0.7.0-beta.0.yaml} | 10 +++---- addons/kafka/{kafka-addon.yaml => 0.6.3.yaml} | 0 .../llm/{llm-addon.yaml => 0.7.0-beta.0.yaml} | 9 +++--- .../{milvus-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{mongodb-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{mysql-addon.yaml => 0.7.0-beta.0.yaml} | 11 ++++--- .../{nebula-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{neon-addon.yaml => 0.7.0-beta.0.yaml} | 8 ++--- ...{opensearch-addon.yaml => 0.6.3.yaml.yaml} | 0 ...cle-mysql-addon.yaml => 0.7.0-beta.0.yaml} | 10 +++---- ...{orioledb-addon.yaml => 0.7.0-beta.0.yaml} | 12 ++++---- ...{postgresql-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{pulsar-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{qdrant-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{redis-addon.yaml => 0.6.3.yaml.yaml} | 0 ...isingwave-addon.yaml => 0.7.0-beta.0.yaml} | 11 ++++--- ...starrocks-addon.yaml => 0.7.0-beta.0.yaml} | 11 ++++--- .../{tdengine-addon.yaml => 0.6.3.yaml.yaml} | 0 .../{weaviate-addon.yaml => 0.6.3.yaml.yaml} | 0 .../victoria-metrics-agent-addon.yaml | 0 24 files changed, 82 insertions(+), 55 deletions(-) rename addons/apecloud-mysql/{apecloud-mysql-addon.yaml => 0.6.3.yaml} (93%) create mode 100644 addons/apecloud-mysql/0.7.0-beta.0.yaml rename addons/elasticsearch/{elasticsearch-addon.yaml => 0.7.0-beta.0.yaml} (68%) rename addons/foxlake/{foxlake-addon.yaml => 0.7.0-beta.0.yaml} (60%) rename addons/greptimedb/{greptimedb-addon.yaml => 0.7.0-beta.0.yaml} (68%) rename addons/kafka/{kafka-addon.yaml => 0.6.3.yaml} (100%) rename addons/llm/{llm-addon.yaml => 0.7.0-beta.0.yaml} (74%) rename addons/milvus/{milvus-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/mongodb/{mongodb-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/mysql/{mysql-addon.yaml => 0.7.0-beta.0.yaml} (62%) rename addons/nebula/{nebula-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/neon/{neon-addon.yaml => 0.7.0-beta.0.yaml} (80%) rename addons/opensearch/{opensearch-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/oracle-mysql/{oracle-mysql-addon.yaml => 0.7.0-beta.0.yaml} (75%) rename addons/orioledb/{orioledb-addon.yaml => 0.7.0-beta.0.yaml} (72%) rename addons/postgresql/{postgresql-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/pulsar/{pulsar-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/qdrant/{qdrant-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/redis/{redis-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/risingwave/{risingwave-addon.yaml => 0.7.0-beta.0.yaml} (67%) rename addons/starrocks/{starrocks-addon.yaml => 0.7.0-beta.0.yaml} (68%) rename addons/tdengine/{tdengine-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/weaviate/{weaviate-addon.yaml => 0.6.3.yaml.yaml} (100%) rename addons/weaviate/vmagent-addon.yaml => applications/victoria-metrics-agent/victoria-metrics-agent-addon.yaml (100%) diff --git a/addons/apecloud-mysql/apecloud-mysql-addon.yaml b/addons/apecloud-mysql/0.6.3.yaml similarity index 93% rename from addons/apecloud-mysql/apecloud-mysql-addon.yaml rename to addons/apecloud-mysql/0.6.3.yaml index cf54145..fbf7225 100644 --- a/addons/apecloud-mysql/apecloud-mysql-addon.yaml +++ b/addons/apecloud-mysql/0.6.3.yaml @@ -6,7 +6,7 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: "== 0.6.3 && < 0.7.0-beta.0 " xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks diff --git a/addons/apecloud-mysql/0.7.0-beta.0.yaml b/addons/apecloud-mysql/0.7.0-beta.0.yaml new file mode 100644 index 0000000..a7e1680 --- /dev/null +++ b/addons/apecloud-mysql/0.7.0-beta.0.yaml @@ -0,0 +1,30 @@ +apiVersion: extensions.kubeblocks.io/v1alpha1 +kind: Addon +metadata: + name: apecloud-mysql + annotations: + addons.extensions.kubeblocks.io/default-is-empty: "true" + meta.helm.sh/release-name: kubeblocks + meta.helm.sh/release-namespace: kb-system + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/model: RDBMS + labels: + app.kubernetes.io/instance: kubeblocks + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: kubeblocks + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 + kubeblocks.io/provider: community +spec: + description: 'ApeCloud MySQL is a database that is compatible with MySQL syntax and achieves high availability + through the utilization of the RAFT consensus protocol.' + type: Helm + helm: + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-0.7.0-beta.0/apecloud-mysql-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/apecloud-mysql-0.7.0-beta.0.tgz" + defaultInstallValues: + - enabled: true + + installable: + autoInstall: true + diff --git a/addons/elasticsearch/elasticsearch-addon.yaml b/addons/elasticsearch/0.7.0-beta.0.yaml similarity index 68% rename from addons/elasticsearch/elasticsearch-addon.yaml rename to addons/elasticsearch/0.7.0-beta.0.yaml index f748cfd..26f4412 100644 --- a/addons/elasticsearch/elasticsearch-addon.yaml +++ b/addons/elasticsearch/0.7.0-beta.0.yaml @@ -7,14 +7,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: Search-Engine labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: 0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'Elasticsearch is a distributed search and analytics engine. It is used for web search, log monitoring, and real-time analytics. Ideal for Big Data applications.' @@ -22,9 +22,8 @@ spec: type: Helm helm: - # todo: both are 404 - chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/elasticsearch-0.7.0-beta.0/elasticsearch-0.7.0-beta.0.tgz" - # chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/elasticsearch-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/elasticsearch-0.7.0-beta.0/elasticsearch-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/elasticsearch-0.7.0-beta.0.tgz" installable: autoInstall: false diff --git a/addons/foxlake/foxlake-addon.yaml b/addons/foxlake/0.7.0-beta.0.yaml similarity index 60% rename from addons/foxlake/foxlake-addon.yaml rename to addons/foxlake/0.7.0-beta.0.yaml index 2c00df2..0dc0d4f 100644 --- a/addons/foxlake/foxlake-addon.yaml +++ b/addons/foxlake/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: "== 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: ApeCloud FoxLake is an open-source cloud-native data warehouse. @@ -21,9 +21,9 @@ spec: type: Helm helm: - # todo: both are 404 - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-cluster-0.6.3/apecloud-mysql-cluster-0.6.3.tgz" - chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0-beta.0/foxlake-0.7.0-beta.0.tgz" +# chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0-beta.0/foxlake-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/foxlake-0.7.0-beta.0.tgz" + installable: autoInstall: false diff --git a/addons/greptimedb/greptimedb-addon.yaml b/addons/greptimedb/0.7.0-beta.0.yaml similarity index 68% rename from addons/greptimedb/greptimedb-addon.yaml rename to addons/greptimedb/0.7.0-beta.0.yaml index a044dad..3489e76 100644 --- a/addons/greptimedb/greptimedb-addon.yaml +++ b/addons/greptimedb/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: Time-Series labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'GreptimeDB is an Apache 2.0 licensed distributed time-series database.' @@ -22,8 +22,8 @@ spec: helm: # todo: both are 404 - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-cluster-0.6.3/apecloud-mysql-cluster-0.6.3.tgz" - chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/greptimedb-0.7.0-beta.0/greptimedb-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/greptimedb-0.7.0-beta.0/greptimedb-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/greptimedb-0.7.0-beta.0.tgz" installable: autoInstall: false diff --git a/addons/kafka/kafka-addon.yaml b/addons/kafka/0.6.3.yaml similarity index 100% rename from addons/kafka/kafka-addon.yaml rename to addons/kafka/0.6.3.yaml diff --git a/addons/llm/llm-addon.yaml b/addons/llm/0.7.0-beta.0.yaml similarity index 74% rename from addons/llm/llm-addon.yaml rename to addons/llm/0.7.0-beta.0.yaml index 86e0a77..81dca42 100644 --- a/addons/llm/llm-addon.yaml +++ b/addons/llm/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: LLM labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: The large language model. @@ -21,7 +21,8 @@ spec: helm: # todo: 404 not found - chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/llm-0.7.0-beta.0/llm-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/llm-0.7.0-beta.0/llm-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/llm-0.7.0-beta.0.tgz" installOptions: diff --git a/addons/milvus/milvus-addon.yaml b/addons/milvus/0.6.3.yaml.yaml similarity index 100% rename from addons/milvus/milvus-addon.yaml rename to addons/milvus/0.6.3.yaml.yaml diff --git a/addons/mongodb/mongodb-addon.yaml b/addons/mongodb/0.6.3.yaml.yaml similarity index 100% rename from addons/mongodb/mongodb-addon.yaml rename to addons/mongodb/0.6.3.yaml.yaml diff --git a/addons/mysql/mysql-addon.yaml b/addons/mysql/0.7.0-beta.0.yaml similarity index 62% rename from addons/mysql/mysql-addon.yaml rename to addons/mysql/0.7.0-beta.0.yaml index 70b7bb8..bba988a 100644 --- a/addons/mysql/mysql-addon.yaml +++ b/addons/mysql/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' @@ -21,9 +21,8 @@ spec: type: Helm helm: - # todo: not found - chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/mysql-0.7.0-beta.0/mysql-0.7.0-beta.0.tgz" - # chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/mysql-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/mysql-0.7.0-beta.0/mysql-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/mysql-0.7.0-beta.0.tgz" installable: autoInstall: true diff --git a/addons/nebula/nebula-addon.yaml b/addons/nebula/0.6.3.yaml.yaml similarity index 100% rename from addons/nebula/nebula-addon.yaml rename to addons/nebula/0.6.3.yaml.yaml diff --git a/addons/neon/neon-addon.yaml b/addons/neon/0.7.0-beta.0.yaml similarity index 80% rename from addons/neon/neon-addon.yaml rename to addons/neon/0.7.0-beta.0.yaml index 47e8162..6a8d682 100644 --- a/addons/neon/neon-addon.yaml +++ b/addons/neon/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'Neon is a fully managed serverless PostgreSQL with a generous free tier. Neon separates storage and compute and offers modern developer features such as serverless, branching, bottomless storage, and more. Before deploying neon, you must execute `kbcli addon enable cert-manager` command to deploy cert-manager.' @@ -23,7 +23,7 @@ spec: helm: # todo: not found # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/neon-0.7.0-beta.0/neon-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/neon-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/neon-0.7.0-beta.0.tgz" installOptions: diff --git a/addons/opensearch/opensearch-addon.yaml b/addons/opensearch/0.6.3.yaml.yaml similarity index 100% rename from addons/opensearch/opensearch-addon.yaml rename to addons/opensearch/0.6.3.yaml.yaml diff --git a/addons/oracle-mysql/oracle-mysql-addon.yaml b/addons/oracle-mysql/0.7.0-beta.0.yaml similarity index 75% rename from addons/oracle-mysql/oracle-mysql-addon.yaml rename to addons/oracle-mysql/0.7.0-beta.0.yaml index eacb21c..0b45a85 100644 --- a/addons/oracle-mysql/oracle-mysql-addon.yaml +++ b/addons/oracle-mysql/0.7.0-beta.0.yaml @@ -6,23 +6,23 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' type: Helm helm: - # todo: not found # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/oracle-mysql-0.7.0-beta.0/oracle-mysql-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/oracle-mysql-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/oracle-mysql-0.7.0-beta.0.tgz" + installOptions: diff --git a/addons/orioledb/orioledb-addon.yaml b/addons/orioledb/0.7.0-beta.0.yaml similarity index 72% rename from addons/orioledb/orioledb-addon.yaml rename to addons/orioledb/0.7.0-beta.0.yaml index 07bfc80..3660885 100644 --- a/addons/orioledb/orioledb-addon.yaml +++ b/addons/orioledb/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'OrioleDB – a modern cloud-native storage engine solving some PostgreSQL wicked problems.' @@ -21,9 +21,9 @@ spec: type: Helm helm: - # todo: not found - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/orioledb-0.6.3/orioledb-0.6.3.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/orioledb-0.6.3.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/orioledb-0.7.0-beta.0/orioledb-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/orioledb-0.7.0-beta.0.tgz" + installOptions: diff --git a/addons/postgresql/postgresql-addon.yaml b/addons/postgresql/0.6.3.yaml.yaml similarity index 100% rename from addons/postgresql/postgresql-addon.yaml rename to addons/postgresql/0.6.3.yaml.yaml diff --git a/addons/pulsar/pulsar-addon.yaml b/addons/pulsar/0.6.3.yaml.yaml similarity index 100% rename from addons/pulsar/pulsar-addon.yaml rename to addons/pulsar/0.6.3.yaml.yaml diff --git a/addons/qdrant/qdrant-addon.yaml b/addons/qdrant/0.6.3.yaml.yaml similarity index 100% rename from addons/qdrant/qdrant-addon.yaml rename to addons/qdrant/0.6.3.yaml.yaml diff --git a/addons/redis/redis-addon.yaml b/addons/redis/0.6.3.yaml.yaml similarity index 100% rename from addons/redis/redis-addon.yaml rename to addons/redis/0.6.3.yaml.yaml diff --git a/addons/risingwave/risingwave-addon.yaml b/addons/risingwave/0.7.0-beta.0.yaml similarity index 67% rename from addons/risingwave/risingwave-addon.yaml rename to addons/risingwave/0.7.0-beta.0.yaml index 415756b..3415722 100644 --- a/addons/risingwave/risingwave-addon.yaml +++ b/addons/risingwave/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'RisingWave is a distributed SQL streaming database.' @@ -21,9 +21,8 @@ spec: type: Helm helm: - # todo: not found - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/risingwave-0.6.3/risingwave-0.6.3.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/risingwave-0.6.3.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/risingwave-0.7.0-beta.0/risingwave-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/risingwave-0.7.0-beta.0.tgz" installOptions: diff --git a/addons/starrocks/starrocks-addon.yaml b/addons/starrocks/0.7.0-beta.0.yaml similarity index 68% rename from addons/starrocks/starrocks-addon.yaml rename to addons/starrocks/0.7.0-beta.0.yaml index 0182746..b8cdccb 100644 --- a/addons/starrocks/starrocks-addon.yaml +++ b/addons/starrocks/0.7.0-beta.0.yaml @@ -6,14 +6,14 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: kubeblocks - app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 + app.kubernetes.io/version: 0.7.0-beta.0 + helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'Starrocks is an open-source, high-performance analytical database.' @@ -21,9 +21,8 @@ spec: type: Helm helm: - # todo: not found - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/starrocks-0.6.3/starrocks-0.6.3.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/85949/packages/helm/stable/charts/starrocks-0.6.3.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/starrocks-0.7.0-beta.0/starrocks-0.7.0-beta.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/starrocks-0.7.0-beta.0.tgz" installOptions: diff --git a/addons/tdengine/tdengine-addon.yaml b/addons/tdengine/0.6.3.yaml.yaml similarity index 100% rename from addons/tdengine/tdengine-addon.yaml rename to addons/tdengine/0.6.3.yaml.yaml diff --git a/addons/weaviate/weaviate-addon.yaml b/addons/weaviate/0.6.3.yaml.yaml similarity index 100% rename from addons/weaviate/weaviate-addon.yaml rename to addons/weaviate/0.6.3.yaml.yaml diff --git a/addons/weaviate/vmagent-addon.yaml b/applications/victoria-metrics-agent/victoria-metrics-agent-addon.yaml similarity index 100% rename from addons/weaviate/vmagent-addon.yaml rename to applications/victoria-metrics-agent/victoria-metrics-agent-addon.yaml From d01199708993b6911213067aafdc9756ced4eda1 Mon Sep 17 00:00:00 2001 From: 1aal Date: Sat, 14 Oct 2023 18:50:40 +0800 Subject: [PATCH 4/6] fix addon --- addons/apecloud-mysql/0.6.3.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/apecloud-mysql/0.6.3.yaml b/addons/apecloud-mysql/0.6.3.yaml index fbf7225..de70719 100644 --- a/addons/apecloud-mysql/0.6.3.yaml +++ b/addons/apecloud-mysql/0.6.3.yaml @@ -6,7 +6,7 @@ metadata: addons.extensions.kubeblocks.io/default-is-empty: "true" meta.helm.sh/release-name: kubeblocks meta.helm.sh/release-namespace: kb-system - xx.kubeblocks.io/kubeblocks-version: "== 0.6.3 && < 0.7.0-beta.0 " + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3 && < 0.7.0-beta.0 " xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/instance: kubeblocks From 9949dd2b801d0af416e1498b162f39e524030581 Mon Sep 17 00:00:00 2001 From: 1aal Date: Sun, 15 Oct 2023 19:05:05 +0800 Subject: [PATCH 5/6] remove excessive labels and annotations --- addons/apecloud-mysql/0.6.3.yaml | 8 +------- addons/apecloud-mysql/0.7.0-beta.0.yaml | 8 +------- addons/elasticsearch/0.7.0-beta.0.yaml | 6 ------ addons/foxlake/0.7.0-beta.0.yaml | 8 +------- addons/greptimedb/0.7.0-beta.0.yaml | 6 ------ addons/kafka/0.6.3.yaml | 6 ------ addons/llm/0.7.0-beta.0.yaml | 8 +------- addons/milvus/0.6.3.yaml.yaml | 6 ------ addons/mongodb/0.6.3.yaml.yaml | 6 ------ addons/mysql/0.7.0-beta.0.yaml | 6 ------ addons/nebula/0.6.3.yaml.yaml | 6 ------ addons/neon/0.7.0-beta.0.yaml | 6 ------ addons/opensearch/0.6.3.yaml.yaml | 6 ------ addons/oracle-mysql/0.7.0-beta.0.yaml | 8 +------- addons/orioledb/0.7.0-beta.0.yaml | 8 +------- addons/postgresql/0.6.3.yaml.yaml | 6 ------ addons/pulsar/0.6.3.yaml.yaml | 6 ------ addons/qdrant/0.6.3.yaml.yaml | 6 ------ addons/redis/0.6.3.yaml.yaml | 6 ------ addons/risingwave/0.7.0-beta.0.yaml | 6 ------ addons/starrocks/0.7.0-beta.0.yaml | 6 ------ addons/tdengine/0.6.3.yaml.yaml | 6 ------ addons/weaviate/0.6.3.yaml.yaml | 6 ------ 23 files changed, 6 insertions(+), 144 deletions(-) diff --git a/addons/apecloud-mysql/0.6.3.yaml b/addons/apecloud-mysql/0.6.3.yaml index de70719..37a6849 100644 --- a/addons/apecloud-mysql/0.6.3.yaml +++ b/addons/apecloud-mysql/0.6.3.yaml @@ -4,17 +4,11 @@ metadata: name: apecloud-mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3 && < 0.7.0-beta.0 " xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 - kubeblocks.io/provider: community + kubeblocks.io/provider: apecloud spec: description: 'ApeCloud MySQL is a database that is compatible with MySQL syntax and achieves high availability through the utilization of the RAFT consensus protocol.' diff --git a/addons/apecloud-mysql/0.7.0-beta.0.yaml b/addons/apecloud-mysql/0.7.0-beta.0.yaml index a7e1680..13fe0dc 100644 --- a/addons/apecloud-mysql/0.7.0-beta.0.yaml +++ b/addons/apecloud-mysql/0.7.0-beta.0.yaml @@ -4,17 +4,11 @@ metadata: name: apecloud-mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 - kubeblocks.io/provider: community + kubeblocks.io/provider: apecloud spec: description: 'ApeCloud MySQL is a database that is compatible with MySQL syntax and achieves high availability through the utilization of the RAFT consensus protocol.' diff --git a/addons/elasticsearch/0.7.0-beta.0.yaml b/addons/elasticsearch/0.7.0-beta.0.yaml index 26f4412..e5a9497 100644 --- a/addons/elasticsearch/0.7.0-beta.0.yaml +++ b/addons/elasticsearch/0.7.0-beta.0.yaml @@ -5,16 +5,10 @@ metadata: name: elasticsearch annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: Search-Engine labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: 0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'Elasticsearch is a distributed search and analytics engine. It is used for web search, log monitoring, and real-time analytics. Ideal for Big Data applications.' diff --git a/addons/foxlake/0.7.0-beta.0.yaml b/addons/foxlake/0.7.0-beta.0.yaml index 0dc0d4f..2edcb5a 100644 --- a/addons/foxlake/0.7.0-beta.0.yaml +++ b/addons/foxlake/0.7.0-beta.0.yaml @@ -4,16 +4,10 @@ metadata: name: foxlake annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: "== 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: ApeCloud FoxLake is an open-source cloud-native data warehouse. @@ -21,7 +15,7 @@ spec: type: Helm helm: -# chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0-beta.0/foxlake-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0-beta.0/foxlake-0.7.0-beta.0.tgz" chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/foxlake-0.7.0-beta.0.tgz" diff --git a/addons/greptimedb/0.7.0-beta.0.yaml b/addons/greptimedb/0.7.0-beta.0.yaml index 3489e76..0f0f660 100644 --- a/addons/greptimedb/0.7.0-beta.0.yaml +++ b/addons/greptimedb/0.7.0-beta.0.yaml @@ -4,16 +4,10 @@ metadata: name: greptimedb annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: Time-Series labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'GreptimeDB is an Apache 2.0 licensed distributed time-series database.' diff --git a/addons/kafka/0.6.3.yaml b/addons/kafka/0.6.3.yaml index 116d1d9..a21a0ee 100644 --- a/addons/kafka/0.6.3.yaml +++ b/addons/kafka/0.6.3.yaml @@ -4,16 +4,10 @@ metadata: name: kafka annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Stream labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'Apache Kafka is a distributed streaming platform designed to build real-time pipelines and can be used as a message diff --git a/addons/llm/0.7.0-beta.0.yaml b/addons/llm/0.7.0-beta.0.yaml index 81dca42..f95ed86 100644 --- a/addons/llm/0.7.0-beta.0.yaml +++ b/addons/llm/0.7.0-beta.0.yaml @@ -4,17 +4,11 @@ metadata: name: llm annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: LLM labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 - kubeblocks.io/provider: community + kubeblocks.io/provider: apecloud spec: description: The large language model. type: Helm diff --git a/addons/milvus/0.6.3.yaml.yaml b/addons/milvus/0.6.3.yaml.yaml index 356d07d..be10264 100644 --- a/addons/milvus/0.6.3.yaml.yaml +++ b/addons/milvus/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: milvus annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Vector-DBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'Milvus is an open source (Apache-2.0 licensed) vector database built to power embedding similarity search and AI applications.' diff --git a/addons/mongodb/0.6.3.yaml.yaml b/addons/mongodb/0.6.3.yaml.yaml index 2ffd400..41570b7 100644 --- a/addons/mongodb/0.6.3.yaml.yaml +++ b/addons/mongodb/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: mongodb annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Document labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'MongoDB is a document database designed for ease of application development and scaling.' diff --git a/addons/mysql/0.7.0-beta.0.yaml b/addons/mysql/0.7.0-beta.0.yaml index bba988a..475763f 100644 --- a/addons/mysql/0.7.0-beta.0.yaml +++ b/addons/mysql/0.7.0-beta.0.yaml @@ -4,16 +4,10 @@ metadata: name: mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' diff --git a/addons/nebula/0.6.3.yaml.yaml b/addons/nebula/0.6.3.yaml.yaml index ac144fb..9223f73 100644 --- a/addons/nebula/0.6.3.yaml.yaml +++ b/addons/nebula/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: nebula annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Graph labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'NebulaGraph is an Apache 2.0 licensed distributed graph database.' diff --git a/addons/neon/0.7.0-beta.0.yaml b/addons/neon/0.7.0-beta.0.yaml index 6a8d682..9a746d1 100644 --- a/addons/neon/0.7.0-beta.0.yaml +++ b/addons/neon/0.7.0-beta.0.yaml @@ -4,16 +4,10 @@ metadata: name: neon annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'Neon is a fully managed serverless PostgreSQL with a generous free tier. Neon separates storage and compute and offers modern developer features such as serverless, branching, bottomless storage, and more. Before deploying neon, you must execute `kbcli addon enable cert-manager` command to deploy cert-manager.' diff --git a/addons/opensearch/0.6.3.yaml.yaml b/addons/opensearch/0.6.3.yaml.yaml index ae872b3..48aea04 100644 --- a/addons/opensearch/0.6.3.yaml.yaml +++ b/addons/opensearch/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: opensearch annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Search-Engine labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'OpenSearch is a scalable, flexible, and extensible open-source software suite for search, analytics, and observability applications licensed under Apache 2.0.' diff --git a/addons/oracle-mysql/0.7.0-beta.0.yaml b/addons/oracle-mysql/0.7.0-beta.0.yaml index 0b45a85..eb94e73 100644 --- a/addons/oracle-mysql/0.7.0-beta.0.yaml +++ b/addons/oracle-mysql/0.7.0-beta.0.yaml @@ -4,17 +4,11 @@ metadata: name: oracle-mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 - kubeblocks.io/provider: community + kubeblocks.io/provider: apecloud spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' diff --git a/addons/orioledb/0.7.0-beta.0.yaml b/addons/orioledb/0.7.0-beta.0.yaml index 3660885..e3c312a 100644 --- a/addons/orioledb/0.7.0-beta.0.yaml +++ b/addons/orioledb/0.7.0-beta.0.yaml @@ -4,17 +4,11 @@ metadata: name: orioledb annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 - kubeblocks.io/provider: community + kubeblocks.io/provider: apecloud spec: description: 'OrioleDB – a modern cloud-native storage engine solving some PostgreSQL wicked problems.' diff --git a/addons/postgresql/0.6.3.yaml.yaml b/addons/postgresql/0.6.3.yaml.yaml index 7f3c2a5..a160a49 100644 --- a/addons/postgresql/0.6.3.yaml.yaml +++ b/addons/postgresql/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: postgresql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'PostgreSQL (Postgres) is an open source object-relational database known for reliability and data integrity. ACID-compliant, it supports foreign keys, joins, views, triggers and stored procedures.' diff --git a/addons/pulsar/0.6.3.yaml.yaml b/addons/pulsar/0.6.3.yaml.yaml index 48d93cc..881de57 100644 --- a/addons/pulsar/0.6.3.yaml.yaml +++ b/addons/pulsar/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: pulsar annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Stream labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: "Apache® Pulsar™ is an open-source, distributed messaging and streaming platform built for the cloud." diff --git a/addons/qdrant/0.6.3.yaml.yaml b/addons/qdrant/0.6.3.yaml.yaml index 2b92445..8061ec1 100644 --- a/addons/qdrant/0.6.3.yaml.yaml +++ b/addons/qdrant/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: qdrant annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Vector-DBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'Qdrant is an open source (Apache-2.0 licensed), vector similarity search engine and vector database.' diff --git a/addons/redis/0.6.3.yaml.yaml b/addons/redis/0.6.3.yaml.yaml index 29dc1ad..4da8c27 100644 --- a/addons/redis/0.6.3.yaml.yaml +++ b/addons/redis/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: redis annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Key-value labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'Redis is an open source (BSD licensed), in-memory data structure store, used as a database, cache and message broker.' diff --git a/addons/risingwave/0.7.0-beta.0.yaml b/addons/risingwave/0.7.0-beta.0.yaml index 3415722..73178df 100644 --- a/addons/risingwave/0.7.0-beta.0.yaml +++ b/addons/risingwave/0.7.0-beta.0.yaml @@ -4,16 +4,10 @@ metadata: name: risingwave annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'RisingWave is a distributed SQL streaming database.' diff --git a/addons/starrocks/0.7.0-beta.0.yaml b/addons/starrocks/0.7.0-beta.0.yaml index b8cdccb..80e785a 100644 --- a/addons/starrocks/0.7.0-beta.0.yaml +++ b/addons/starrocks/0.7.0-beta.0.yaml @@ -4,16 +4,10 @@ metadata: name: starrocks annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.7.0-beta.0 - helm.sh/chart: kubeblocks-0.7.0-beta.0 kubeblocks.io/provider: community spec: description: 'Starrocks is an open-source, high-performance analytical database.' diff --git a/addons/tdengine/0.6.3.yaml.yaml b/addons/tdengine/0.6.3.yaml.yaml index c0ea92e..3b675e8 100644 --- a/addons/tdengine/0.6.3.yaml.yaml +++ b/addons/tdengine/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: tdengine annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'TDengine is an open source, high-performance, cloud native time-series database optimized for Internet of Things (IoT), Connected Cars, and Industrial IoT.' diff --git a/addons/weaviate/0.6.3.yaml.yaml b/addons/weaviate/0.6.3.yaml.yaml index e3ca014..e2d5780 100644 --- a/addons/weaviate/0.6.3.yaml.yaml +++ b/addons/weaviate/0.6.3.yaml.yaml @@ -4,16 +4,10 @@ metadata: name: weaviate annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - meta.helm.sh/release-name: kubeblocks - meta.helm.sh/release-namespace: kb-system xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3" xx.kubeblocks.io/model: Vector-DBMS labels: - app.kubernetes.io/instance: kubeblocks - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: kubeblocks app.kubernetes.io/version: 0.6.3 - helm.sh/chart: kubeblocks-0.6.3 kubeblocks.io/provider: community spec: description: 'Weaviate is an open-source (BSD-3.0 licensed) vector database. It allows you to store data objects and vector embeddings from your favorite ML-models, and scale seamlessly into billions of data objects.' From f3a5f9901d6d7be4ea5389ffef4a58ea0de9bb29 Mon Sep 17 00:00:00 2001 From: 1aal Date: Mon, 13 Nov 2023 14:54:55 +0800 Subject: [PATCH 6/6] fix the version --- addons/apecloud-mysql/0.6.3.yaml | 2 +- addons/apecloud-mysql/0.7.0-beta.0.yaml | 8 ++++---- addons/elasticsearch/0.7.0-beta.0.yaml | 8 ++++---- addons/foxlake/0.7.0-beta.0.yaml | 8 ++++---- addons/greptimedb/0.7.0-beta.0.yaml | 8 ++++---- addons/llm/0.7.0-beta.0.yaml | 8 ++++---- addons/mysql/0.7.0-beta.0.yaml | 8 ++++---- addons/neon/0.7.0-beta.0.yaml | 8 ++++---- addons/oracle-mysql/0.7.0-beta.0.yaml | 8 ++++---- addons/orioledb/0.7.0-beta.0.yaml | 8 ++++---- addons/risingwave/0.7.0-beta.0.yaml | 8 ++++---- addons/starrocks/0.7.0-beta.0.yaml | 8 ++++---- 12 files changed, 45 insertions(+), 45 deletions(-) diff --git a/addons/apecloud-mysql/0.6.3.yaml b/addons/apecloud-mysql/0.6.3.yaml index 37a6849..de4a3d7 100644 --- a/addons/apecloud-mysql/0.6.3.yaml +++ b/addons/apecloud-mysql/0.6.3.yaml @@ -4,7 +4,7 @@ metadata: name: apecloud-mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3 && < 0.7.0-beta.0 " + xx.kubeblocks.io/kubeblocks-version: ">= 0.6.3 && < 0.7.0 " xx.kubeblocks.io/model: RDBMS labels: app.kubernetes.io/version: 0.6.3 diff --git a/addons/apecloud-mysql/0.7.0-beta.0.yaml b/addons/apecloud-mysql/0.7.0-beta.0.yaml index 13fe0dc..5251a29 100644 --- a/addons/apecloud-mysql/0.7.0-beta.0.yaml +++ b/addons/apecloud-mysql/0.7.0-beta.0.yaml @@ -4,18 +4,18 @@ metadata: name: apecloud-mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: apecloud spec: description: 'ApeCloud MySQL is a database that is compatible with MySQL syntax and achieves high availability through the utilization of the RAFT consensus protocol.' type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-0.7.0-beta.0/apecloud-mysql-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/apecloud-mysql-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/apecloud-mysql-0.7.0/apecloud-mysql-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/apecloud-mysql-0.7.0.tgz" defaultInstallValues: - enabled: true diff --git a/addons/elasticsearch/0.7.0-beta.0.yaml b/addons/elasticsearch/0.7.0-beta.0.yaml index e5a9497..629e1d6 100644 --- a/addons/elasticsearch/0.7.0-beta.0.yaml +++ b/addons/elasticsearch/0.7.0-beta.0.yaml @@ -5,10 +5,10 @@ metadata: name: elasticsearch annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: Search-Engine labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: 'Elasticsearch is a distributed search and analytics engine. It is used for web search, log monitoring, and real-time analytics. Ideal for Big Data applications.' @@ -16,8 +16,8 @@ spec: type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/elasticsearch-0.7.0-beta.0/elasticsearch-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/elasticsearch-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/elasticsearch-0.7.0/elasticsearch-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/elasticsearch-0.7.0.tgz" installable: autoInstall: false diff --git a/addons/foxlake/0.7.0-beta.0.yaml b/addons/foxlake/0.7.0-beta.0.yaml index 2edcb5a..38c9da3 100644 --- a/addons/foxlake/0.7.0-beta.0.yaml +++ b/addons/foxlake/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: foxlake annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: "== 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: "== 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: ApeCloud FoxLake is an open-source cloud-native data warehouse. @@ -15,8 +15,8 @@ spec: type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0-beta.0/foxlake-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/foxlake-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/foxlake-0.7.0/foxlake-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/foxlake-0.7.0.tgz" installable: diff --git a/addons/greptimedb/0.7.0-beta.0.yaml b/addons/greptimedb/0.7.0-beta.0.yaml index 0f0f660..05a45c6 100644 --- a/addons/greptimedb/0.7.0-beta.0.yaml +++ b/addons/greptimedb/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: greptimedb annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: Time-Series labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: 'GreptimeDB is an Apache 2.0 licensed distributed time-series database.' @@ -16,8 +16,8 @@ spec: helm: # todo: both are 404 - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/greptimedb-0.7.0-beta.0/greptimedb-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/greptimedb-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/greptimedb-0.7.0/greptimedb-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/greptimedb-0.7.0.tgz" installable: autoInstall: false diff --git a/addons/llm/0.7.0-beta.0.yaml b/addons/llm/0.7.0-beta.0.yaml index f95ed86..b02ce0d 100644 --- a/addons/llm/0.7.0-beta.0.yaml +++ b/addons/llm/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: llm annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: LLM labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: apecloud spec: description: The large language model. @@ -15,8 +15,8 @@ spec: helm: # todo: 404 not found - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/llm-0.7.0-beta.0/llm-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/llm-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/llm-0.7.0/llm-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/llm-0.7.0.tgz" installOptions: diff --git a/addons/mysql/0.7.0-beta.0.yaml b/addons/mysql/0.7.0-beta.0.yaml index 475763f..202473d 100644 --- a/addons/mysql/0.7.0-beta.0.yaml +++ b/addons/mysql/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' @@ -15,8 +15,8 @@ spec: type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/mysql-0.7.0-beta.0/mysql-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/mysql-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/mysql-0.7.0/mysql-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/mysql-0.7.0.tgz" installable: autoInstall: true diff --git a/addons/neon/0.7.0-beta.0.yaml b/addons/neon/0.7.0-beta.0.yaml index 9a746d1..3d8f91b 100644 --- a/addons/neon/0.7.0-beta.0.yaml +++ b/addons/neon/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: neon annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: 'Neon is a fully managed serverless PostgreSQL with a generous free tier. Neon separates storage and compute and offers modern developer features such as serverless, branching, bottomless storage, and more. Before deploying neon, you must execute `kbcli addon enable cert-manager` command to deploy cert-manager.' @@ -16,8 +16,8 @@ spec: helm: # todo: not found - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/neon-0.7.0-beta.0/neon-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/neon-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/neon-0.7.0/neon-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/neon-0.7.0.tgz" installOptions: diff --git a/addons/oracle-mysql/0.7.0-beta.0.yaml b/addons/oracle-mysql/0.7.0-beta.0.yaml index eb94e73..01082cc 100644 --- a/addons/oracle-mysql/0.7.0-beta.0.yaml +++ b/addons/oracle-mysql/0.7.0-beta.0.yaml @@ -4,18 +4,18 @@ metadata: name: oracle-mysql annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: apecloud spec: description: 'MySQL is a widely used, open-source relational database management system (RDBMS).' type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/oracle-mysql-0.7.0-beta.0/oracle-mysql-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/oracle-mysql-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/oracle-mysql-0.7.0/oracle-mysql-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/oracle-mysql-0.7.0.tgz" installOptions: diff --git a/addons/orioledb/0.7.0-beta.0.yaml b/addons/orioledb/0.7.0-beta.0.yaml index e3c312a..ae5650e 100644 --- a/addons/orioledb/0.7.0-beta.0.yaml +++ b/addons/orioledb/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: orioledb annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: apecloud spec: description: 'OrioleDB – a modern cloud-native storage engine solving some PostgreSQL wicked problems.' @@ -15,8 +15,8 @@ spec: type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/orioledb-0.7.0-beta.0/orioledb-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/orioledb-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/orioledb-0.7.0/orioledb-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/orioledb-0.7.0.tgz" installOptions: diff --git a/addons/risingwave/0.7.0-beta.0.yaml b/addons/risingwave/0.7.0-beta.0.yaml index 73178df..1e43c86 100644 --- a/addons/risingwave/0.7.0-beta.0.yaml +++ b/addons/risingwave/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: risingwave annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: 'RisingWave is a distributed SQL streaming database.' @@ -15,8 +15,8 @@ spec: type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/risingwave-0.7.0-beta.0/risingwave-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/risingwave-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/risingwave-0.7.0/risingwave-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/risingwave-0.7.0.tgz" installOptions: diff --git a/addons/starrocks/0.7.0-beta.0.yaml b/addons/starrocks/0.7.0-beta.0.yaml index 80e785a..48b0762 100644 --- a/addons/starrocks/0.7.0-beta.0.yaml +++ b/addons/starrocks/0.7.0-beta.0.yaml @@ -4,10 +4,10 @@ metadata: name: starrocks annotations: addons.extensions.kubeblocks.io/default-is-empty: "true" - xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0-beta.0" + xx.kubeblocks.io/kubeblocks-version: ">= 0.7.0" xx.kubeblocks.io/model: RDBMS labels: - app.kubernetes.io/version: 0.7.0-beta.0 + app.kubernetes.io/version: 0.7.0 kubeblocks.io/provider: community spec: description: 'Starrocks is an open-source, high-performance analytical database.' @@ -15,8 +15,8 @@ spec: type: Helm helm: - # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/starrocks-0.7.0-beta.0/starrocks-0.7.0-beta.0.tgz" - chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/starrocks-0.7.0-beta.0.tgz" + # chartLocationURL: "https://github.com/apecloud/helm-charts/releases/download/starrocks-0.7.0/starrocks-0.7.0.tgz" + chartLocationURL: "https://jihulab.com/api/v4/projects/150246/packages/helm/stable/charts/starrocks-0.7.0.tgz" installOptions: