diff --git a/README.md b/README.md index aa5731257..f5856231c 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ KubeBlocks add-ons. | official-postgresql | postgres-14.7 | A Official PostgreSQL cluster definition Helm chart for Kubernetes | kizuna-lek | | opengauss | opengauss-5.0.0 | A Helm chart for Kubernetes | 1aal | | openldap | openldap-2.4.57 | The OpenLDAP Project is a collaborative effort to develop a robust, commercial-grade, fully featured, and open source LDAP suite of applications and development tools. This chart provides KubeBlocks' | kissycn | -| opensearch | opensearch-2.7.0 | Open source distributed and RESTful search engine. | iziang | +| opensearch | opensearch-2.7.0
opensearch-dashboard-2.7.0 | Open source distributed and RESTful search engine. | iziang | | opentenbase | opentenbase-v2.5.0 | OpenTenBase is an enterprise-level distributed HTAP open source database. | ldming | | oracle | oracle-19.3.0-ee | A Helm chart for Kubernetes | 1aal | | orchestrator | orchestrator-3.2.6 | Orchestrator is a MySQL high availability and replication management tool, runs as a service and provides command line access, HTTP API and Web interface. | kubeJocker | diff --git a/addons-cluster/clickhouse/templates/_helpers.tpl b/addons-cluster/clickhouse/templates/_helpers.tpl index d0845595d..c6a53d507 100644 --- a/addons-cluster/clickhouse/templates/_helpers.tpl +++ b/addons-cluster/clickhouse/templates/_helpers.tpl @@ -107,10 +107,11 @@ Define clickhouse componentSpec with ComponentDefinition. {{/* Define clickhouse keeper componentSpec with ComponentDefinition. */}} -{{- define "ch-keeper-component" -}} +{{- define "clickhouse-keeper-component" -}} - name: ch-keeper - componentDef: ch-keeper-24 + componentDef: clickhouse-keeper-24 replicas: {{ .Values.keeper.replicaCount }} + disableExporter: {{ $.Values.disableExporter | default "false" }} {{- with .Values.keeper.tolerations }} tolerations: {{ .| toYaml | nindent 4 }} {{- end }} diff --git a/addons-cluster/clickhouse/templates/cluster.yaml b/addons-cluster/clickhouse/templates/cluster.yaml index 0fee87080..cedd9f71a 100644 --- a/addons-cluster/clickhouse/templates/cluster.yaml +++ b/addons-cluster/clickhouse/templates/cluster.yaml @@ -5,7 +5,7 @@ {{- end }} componentSpecs: {{- if eq .Values.mode "cluster" }} - {{- include "ch-keeper-component" . | nindent 4 }} + {{- include "clickhouse-keeper-component" . | nindent 4 }} {{- end }} {{- if eq (.Values.shardCount | int) 1 }} {{- include "clickhouse-component" . | nindent 4 }} diff --git a/addons/clickhouse/templates/_helpers.tpl b/addons/clickhouse/templates/_helpers.tpl index e9fac8f18..848b29e63 100644 --- a/addons/clickhouse/templates/_helpers.tpl +++ b/addons/clickhouse/templates/_helpers.tpl @@ -76,9 +76,9 @@ Define clickhouse24 component definition regex pattern {{- end -}} {{/* -Define ch-keeper24 component definition name +Define clickhouse-keeper24 component definition name */}} -{{- define "ch-keeper24.cmpdName" -}} +{{- define "clickhouse-keeper24.cmpdName" -}} {{- if eq (len .Values.cmpdVersionPrefix.keeper24 ) 0 -}} clickhouse-keeper-24-{{ .Chart.Version }} {{- else -}} @@ -87,9 +87,9 @@ clickhouse-keeper-24-{{ .Chart.Version }} {{- end -}} {{/* -Define ch-keeper24 component definition regex pattern +Define clickhouse-keeper24 component definition regex pattern */}} -{{- define "ch-keeper24.cmpdRegexpPattern" -}} +{{- define "clickhouse-keeper24.cmpdRegexpPattern" -}} ^clickhouse-keeper-24.* {{- end -}} @@ -122,9 +122,9 @@ clickhouse-24-user-configuration-tpl {{- end -}} {{/* -Define ch-keeper24 configuration tpl name +Define clickhouse-keeper24 configuration tpl name */}} -{{- define "ch-keeper24.configurationTplName" -}} +{{- define "clickhouse-keeper24.configurationTplName" -}} clickhouse-keeper-24-configuration-tpl {{- end -}} diff --git a/addons/clickhouse/templates/clusterdefinition.yaml b/addons/clickhouse/templates/clusterdefinition.yaml index 900d71293..d82190c42 100644 --- a/addons/clickhouse/templates/clusterdefinition.yaml +++ b/addons/clickhouse/templates/clusterdefinition.yaml @@ -15,7 +15,7 @@ spec: - name: clickhouse compDef: {{ include "clickhouse24.cmpdRegexpPattern" .}} - name: ch-keeper - compDef: {{ include "ch-keeper24.cmpdRegexpPattern" .}} + compDef: {{ include "clickhouse-keeper24.cmpdRegexpPattern" .}} orders: provision: - ch-keeper diff --git a/addons/clickhouse/templates/cmpd-ch-keeper.yaml b/addons/clickhouse/templates/cmpd-ch-keeper.yaml index 031382831..e1ff06ad5 100644 --- a/addons/clickhouse/templates/cmpd-ch-keeper.yaml +++ b/addons/clickhouse/templates/cmpd-ch-keeper.yaml @@ -1,7 +1,7 @@ apiVersion: apps.kubeblocks.io/v1 kind: ComponentDefinition metadata: - name: {{ include "ch-keeper24.cmpdName" . }} + name: {{ include "clickhouse-keeper24.cmpdName" . }} labels: {{- include "clickhouse.labels" . | nindent 4 }} annotations: @@ -108,8 +108,8 @@ spec: scrapePath: /metrics scrapePort: "8001" configs: - - name: ch-keeper-tpl - templateRef: {{ include "ch-keeper24.configurationTplName" . }} + - name: clickhouse-keeper-tpl + templateRef: {{ include "clickhouse-keeper24.configurationTplName" . }} volumeName: config namespace: {{ .Release.Namespace }} systemAccounts: diff --git a/addons/clickhouse/templates/cmpd-clickhouse.yaml b/addons/clickhouse/templates/cmpd-clickhouse.yaml index 4cfacfeb1..f6e4b082e 100644 --- a/addons/clickhouse/templates/cmpd-clickhouse.yaml +++ b/addons/clickhouse/templates/cmpd-clickhouse.yaml @@ -132,7 +132,7 @@ spec: - name: CH_KEEPER_POD_FQDN_LIST valueFrom: componentVarRef: - compDef: {{ include "ch-keeper24.cmpdRegexpPattern" . }} + compDef: {{ include "clickhouse-keeper24.cmpdRegexpPattern" . }} optional: true podFQDNs: Required volumes: diff --git a/addons/clickhouse/templates/cmpv.yaml b/addons/clickhouse/templates/cmpv.yaml index 59b7a8230..35e5517b4 100644 --- a/addons/clickhouse/templates/cmpv.yaml +++ b/addons/clickhouse/templates/cmpv.yaml @@ -13,7 +13,7 @@ spec: - releases: - 24.8.3 compDefs: - - {{ include "ch-keeper24.cmpdRegexpPattern" . }} + - {{ include "clickhouse-keeper24.cmpdRegexpPattern" . }} releases: - name: 24.8.3 serviceVersion: 24.8.3 diff --git a/addons/clickhouse/templates/configmap.yaml b/addons/clickhouse/templates/configmap.yaml index d20e61fec..bc2508c92 100644 --- a/addons/clickhouse/templates/configmap.yaml +++ b/addons/clickhouse/templates/configmap.yaml @@ -31,7 +31,7 @@ data: apiVersion: v1 kind: ConfigMap metadata: - name: {{ include "ch-keeper24.configurationTplName" . }} + name: {{ include "clickhouse-keeper24.configurationTplName" . }} labels: {{- include "clickhouse.labels" . | nindent 4 }} data: diff --git a/addons/clickhouse/values.yaml b/addons/clickhouse/values.yaml index a02a91388..dca042c74 100644 --- a/addons/clickhouse/values.yaml +++ b/addons/clickhouse/values.yaml @@ -16,7 +16,7 @@ commonAnnotations: {} # If specified, the component definition will use it as prefix. cmpdVersionPrefix: clickhouse24: "clickhouse-24" - keeper24: "ch-keeper-24" + keeper24: "clickhouse-keeper-24" image: registry: docker.io diff --git a/examples/clickhouse/cluster.yaml b/examples/clickhouse/cluster.yaml index cafdb2e25..5a4fe25e2 100644 --- a/examples/clickhouse/cluster.yaml +++ b/examples/clickhouse/cluster.yaml @@ -48,7 +48,7 @@ spec: requests: storage: 20Gi - name: ch-keeper - componentDef: ch-keeper-24 + componentDef: clickhouse-keeper-24 serviceAccountName: kb-clickhouse-cluster replicas: 1 systemAccounts: diff --git a/examples/clickhouse/restart.yaml b/examples/clickhouse/restart.yaml index ed61ec8b8..59dcf3a9e 100644 --- a/examples/clickhouse/restart.yaml +++ b/examples/clickhouse/restart.yaml @@ -11,5 +11,5 @@ spec: restart: # Specifies the name of the Component. # - clickhouse - # - ch-keeper + # - clickhouse-keeper - componentName: clickhouse diff --git a/examples/clickhouse/verticalscale.yaml b/examples/clickhouse/verticalscale.yaml index 4267efbff..fc82de08f 100644 --- a/examples/clickhouse/verticalscale.yaml +++ b/examples/clickhouse/verticalscale.yaml @@ -10,7 +10,7 @@ spec: # Lists VerticalScaling objects, each specifying a component and its desired compute resources for vertical scaling. verticalScaling: # - clickhouse - # - ch-keeper + # - clickhouse-keeper - componentName: clickhouse # VerticalScaling refers to the process of adjusting the compute resources (e.g., CPU, memory) allocated to a Component. It defines the parameters required for the operation. requests: diff --git a/examples/clickhouse/volumeexpand.yaml b/examples/clickhouse/volumeexpand.yaml index d35c907a9..633528a08 100644 --- a/examples/clickhouse/volumeexpand.yaml +++ b/examples/clickhouse/volumeexpand.yaml @@ -11,7 +11,7 @@ spec: volumeExpansion: # Specifies the name of the Component. # - clickhouse - # - ch-keeper + # - clickhouse-keeper - componentName: clickhouse # volumeClaimTemplates specifies the storage size and volumeClaimTemplate name. volumeClaimTemplates: