Skip to content

Commit 2f4a720

Browse files
author
smiletan
committed
values.yaml and template all finished, helm template not error
1 parent b5bfe9f commit 2f4a720

File tree

10 files changed

+489
-1
lines changed

10 files changed

+489
-1
lines changed

‎api/disaggregated/v1/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ type CommonSpec struct {
147147
//+optional
148148
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
149149

150-
// export metaservice for accessing from outside k8s.
150+
// export service for accessing from outside k8s.
151151
Service *ExportService `json:"service,omitempty"`
152152

153153
// ConfigMaps describe all configmap that need to be mounted.

‎helm-charts/doris-disaggregated/.helmignore‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Patterns to ignore when building packages.
2+
# This supports shell glob matching, relative path matching, and
3+
# negation (prefixed with !). Only one pattern per line.
4+
.DS_Store
5+
# Common VCS dirs
6+
.git/
7+
.gitignore
8+
.bzr/
9+
.bzrignore
10+
.hg/
11+
.hgignore
12+
.svn/
13+
# Common backup files
14+
*.swp
15+
*.bak
16+
*.tmp
17+
*.orig
18+
*~
19+
# Various IDEs
20+
.project
21+
.idea/
22+
*.tmproj
23+
.vscode/

‎helm-charts/doris-disaggregated/Chart.yaml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
apiVersion: v2
19+
name: doris-disaggregated
20+
description: A Helm chart for deploying Doris Cluster of compute and storage decoupled.
21+
22+
# A chart can be either an 'application' or a 'library' chart.
23+
#
24+
# Application charts are a collection of templates that can be packaged into versioned archives
25+
# to be deployed.
26+
#
27+
# Library charts provide useful utilities or functions for the chart developer. They're included as
28+
# a dependency of application charts to inject those utilities and functions into the rendering
29+
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
30+
type: application
31+
32+
# This is the chart version. This version number should be incremented each time you make changes
33+
# to the chart and its templates, including the app version.
34+
# Versions are expected to follow Semantic Versioning (https://semver.org/)
35+
version: 0.1.0
36+
37+
# This is the version number of the application being deployed. This version number should be
38+
# incremented each time you make changes to the application. Versions are not expected to
39+
# follow Semantic Versioning. They should reflect the version the application is using.
40+
# It is recommended to use it with quotes.
41+
appVersion: "3.4.0"

‎helm-charts/doris-disaggregated/templates/NOTES.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Thank you for installing {{ .Chart.Name }}-{{ .Chart.Version }}

‎helm-charts/doris-disaggregated/templates/_helpers.tpl‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{*
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
*}
19+
20+
{{/*
21+
cluster config
22+
*/}}
23+
{{- define "doris-disaggregated.name" -}}
24+
{{- default .Chart.Name .Values.clusterName | trunc 63 | trimSuffix "-" }}
25+
{{- end }}
26+
27+
{{/*
28+
ms config part
29+
*/}}
30+
{{- define "ms.fdb.namespace" -}}
31+
{{- default .Release.Namespace .Values.msSpec.fdb.namespace -}}
32+
{{- end }}
33+
34+
{{- define "ms.fdb.configmap.name" -}}
35+
{{ .Values.msSpec.fdb.fdbClusterName }}-config
36+
{{- end }}
37+
38+
{{- define "ms.configmap.name" -}}
39+
{{- print "ms-configmap" }}
40+
{{- end }}
41+
42+
{{- define "ms.configmap.mountpath" -}}
43+
{{- print "/etc/doris" -}}
44+
{{- end }}
45+
46+
47+
{{/*
48+
fe config part
49+
*/}}
50+
{{- define "fe.electionnumber" -}}
51+
{{- default 3 .Values.feSpec.electionNumber -}}
52+
{{- end }}
53+
54+
{{- define "fe.configmap.name" -}}
55+
{{- print "fe-configmap" }}
56+
{{- end }}
57+
58+
{{- define "fe.configmap.mountpath" -}}
59+
{{- print "/etc/doris" -}}
60+
{{- end }}
61+
62+
63+
{{/*
64+
be config part
65+
*/}}
66+
{{- define "be.configmap.name" -}}
67+
{{- print "be-configmap" -}}
68+
{{- end }}
69+
70+
{{- define "be.configmap.mountpath" -}}
71+
{{- print "/etc/doris" -}}
72+
{{- end }}
73+

‎helm-charts/doris-disaggregated/templates/be-configmap.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
apiVersion: v1
19+
kind: ConfigMap
20+
metadata:
21+
name: {{ include "be.configmap.name" . }}
22+
labels:
23+
app.kubernetes.io/component: be
24+
data:
25+
be.conf: |
26+
# For jdk 17, this JAVA_OPTS will be used as default JVM options
27+
JAVA_OPTS_FOR_JDK_17="-Xmx1024m -DlogPath=$LOG_DIR/jni.log -Xlog:gc*:$LOG_DIR/be.gc.log.$CUR_DATE:time,uptime:filecount=10,filesize=50M -Djavax.security.auth.useSubjectCredsOnly=false -Dsun.security.krb5.debug=true -Dsun.java.command=DorisBE -XX:-CriticalJNINatives -XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.invoke=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/sun.nio.cs=ALL-UNNAMED --add-opens=java.base/sun.security.action=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED"
28+
file_cache_path = [{"path":"/opt/apache-doris/be/file_cache","total_size":107374182400,"query_limit":107374182400}]
29+
storage_root_path = /opt/apache-doris/be/file_cache

‎helm-charts/doris-disaggregated/templates/dorisdisaggregatedcluster.yaml‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
apiVersion: disaggregated.cluster.doris.com/v1
19+
kind: DorisDisaggregatedCluster
20+
metadata:
21+
name: {{ include "doris-disaggregated.name" . }}
22+
{{- if .Values.Labels }}
23+
labels:
24+
{{- .Values.Labels | nindent 4 }}
25+
{{- end }}
26+
spec:
27+
{{- if .Values.adminUser }}
28+
adminUser:
29+
name: {{ .Values.adminUser.name }}
30+
password: {{ .Values.adminUser.password }}
31+
{{- end }}
32+
metaService:
33+
image: {{ .Values.msSpec.image.repository }}:{{ .Values.msSpec.image.tag }}
34+
{{- if .Values.msSpec.imagePullSecrets }}
35+
imagePullSecrets:
36+
{{- toYaml .Values.msSpec.imagePullSecrets | nindent 6 }}
37+
{{- end }}
38+
replicas: {{ .Values.msSpec.replicas }}
39+
fdb:
40+
configMapNamespaceName:
41+
name: {{ include "ms.fdb.configmap.name" . }}
42+
namespace: {{ include "ms.fdb.namespace" . }}
43+
configMaps:
44+
- name: {{ include "ms.configmap.name" . }}
45+
mountPath: {{ include "ms.configmap.mountpath" . }}
46+
{{- if .Values.msSpec.resources }}
47+
{{- toYaml .Values.msSpec.resources | nindent 4 }}
48+
{{- end }}
49+
{{- if .Values.msSpec.nodeSelector }}
50+
nodeSelector:
51+
{{- toYaml .Values.msSpec.nodeSelector | nindent 6 }}
52+
{{- end }}
53+
feSpec:
54+
replicas: {{ .Values.feSpec.replicas }}
55+
electionNumber: {{ include "fe.electionnumber" . }}
56+
image: {{ .Values.feSpec.image.repository }}:{{ .Values.feSpec.image.tag }}
57+
{{- if .Values.feSpec.imagePullSecrets }}
58+
imagePullSecrets:
59+
{{- toYaml .Values.feSpec.imagePullSecrets | nindent 6 }}
60+
{{- end }}
61+
configMaps:
62+
- name: {{ include "fe.configmap.name" . }}
63+
mountPath: {{ include "fe.configmap.mountpath" . }}
64+
logNotStore: {{ .Values.feSpec.logNotStore }}
65+
{{- if .Values.feSpec.resources }}
66+
{{- toYaml .Values.feSpec.resources | nindent 4 }}
67+
{{- end }}
68+
{{- if .Values.feSpec.service }}
69+
{{- toYaml .Values.feSpec.service }}
70+
{{- end }}
71+
{{- if .Values.feSpec.persistentVolumes }}
72+
persistentVolumes:
73+
{{- toYaml .Values.feSpec.persistentVolumes | nindent 4 }}
74+
{{- end }}
75+
computeGroups:
76+
{{- $originalContext := . -}}
77+
{{- range $index, $cgName := .Values.computeGroupNames }}
78+
- uniqueId: {{ $cgName }}
79+
replicas: {{ $originalContext.Values.computeSpec.replicas }}
80+
image: {{ $originalContext.Values.computeSpec.image.repository }}:{{ $originalContext.Values.computeSpec.image.tag }}
81+
{{- if $originalContext.Values.computeSpec.imagePullSecrets }}
82+
imagePullSecrets:
83+
{{- toYaml $originalContext.Values.computeSpec.imagePullSecrets | nindent 6 }}
84+
{{- end }}
85+
{{- if $originalContext.Values.computeSpec.resources }}
86+
{{- toYaml $originalContext.Values.computeSpec.resources | nindent 4 }}
87+
{{- end }}
88+
configMaps:
89+
- name: {{ include "be.configmap.name" . }}
90+
mountPath: {{ include "be.configmap.mountpath" . }}
91+
logNotStore: {{ $originalContext.Values.computeSpec.logNotStore }}
92+
{{- if $originalContext.Values.computeSpec.persistentVolumes }}
93+
persistentVolumes:
94+
{{- toYaml $originalContext.Values.computeSpec.persistentVolumes | nindent 4 }}
95+
{{- end }}
96+
{{- end }}

‎helm-charts/doris-disaggregated/templates/fe-configmap.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
apiVersion: v1
19+
data:
20+
doris_cloud.conf: |
21+
# // meta_service
22+
brpc_listen_port = 5000
23+
brpc_num_threads = -1
24+
brpc_idle_timeout_sec = 30
25+
http_token = greedisgood9999
26+
27+
# // doris txn config
28+
label_keep_max_second = 259200
29+
expired_txn_scan_key_nums = 1000
30+
31+
# // logging
32+
log_dir = ./log/
33+
# info warn error
34+
log_level = info
35+
log_size_mb = 1024
36+
log_filenum_quota = 10
37+
log_immediate_flush = false
38+
# log_verbose_modules = *
39+
40+
# //max stage num
41+
max_num_stages = 40
42+
kind: ConfigMap
43+
metadata:
44+
name: {{ include "fe.configmap.name" . }}

‎helm-charts/doris-disaggregated/templates/ms-configmap.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
apiVersion: v1
19+
kind: ConfigMap
20+
metadata:
21+
name: {{ include "ms.configmap.name" . }}
22+
data:
23+
doris_cloud.conf: |
24+
# // meta_service
25+
brpc_listen_port = 5000
26+
brpc_num_threads = -1
27+
brpc_idle_timeout_sec = 30
28+
http_token = greedisgood9999
29+
30+
# // doris txn config
31+
label_keep_max_second = 259200
32+
expired_txn_scan_key_nums = 1000
33+
34+
# // logging
35+
log_dir = ./log/
36+
# info warn error
37+
log_level = info
38+
log_size_mb = 1024
39+
log_filenum_quota = 10
40+
log_immediate_flush = false
41+
# log_verbose_modules = *
42+
43+
# //max stage num
44+
max_num_stages = 40

0 commit comments

Comments
 (0)