Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor!: remove original config usage and add configFile and configData field #152

Merged
merged 1 commit into from
Aug 6, 2024
Merged

refactor!: remove original config usage and add configFile and configData field #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/greptimedb-cluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: greptimedb-cluster
description: A Helm chart for deploying GreptimeDB cluster in Kubernetes.
type: application
version: 0.2.5
version: 0.2.6
appVersion: 0.9.1
home: https://github.com/GreptimeTeam/greptimedb
sources:
Expand Down
22 changes: 13 additions & 9 deletions charts/greptimedb-cluster/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A Helm chart for deploying GreptimeDB cluster in Kubernetes.

![Version: 0.2.5](https://img.shields.io/badge/Version-0.2.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.1](https://img.shields.io/badge/AppVersion-0.9.1-informational?style=flat-square)
![Version: 0.2.6](https://img.shields.io/badge/Version-0.2.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.9.1](https://img.shields.io/badge/AppVersion-0.9.1-informational?style=flat-square)

## Source Code

Expand Down Expand Up @@ -87,8 +87,9 @@ helm uninstall mycluster -n default
| base.podTemplate.nodeSelector | object | `{}` | The pod node selector |
| base.podTemplate.serviceAccountName | string | `""` | The global service account |
| base.podTemplate.tolerations | list | `[]` | The pod tolerations |
| datanode | object | `{"config":"","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":3,"storage":{"dataHome":"/data/greptimedb","storageClassName":null,"storageRetainPolicy":"Retain","storageSize":"10Gi","walDir":"/data/greptimedb/wal"}}` | Datanode configure |
| datanode.config | string | `""` | Extra datanode config in toml format. |
| datanode | object | `{"configData":"","configFile":"","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":3,"storage":{"dataHome":"/data/greptimedb","storageClassName":null,"storageRetainPolicy":"Retain","storageSize":"10Gi","walDir":"/data/greptimedb/wal"}}` | Datanode configure |
| datanode.configData | string | `""` | Extra raw toml config data of datanode. Skip if the `configFile` is used. |
| datanode.configFile | string | `""` | Extra toml file of datanode. |
| datanode.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]}` | The pod template for datanode |
| datanode.podTemplate.affinity | object | `{}` | The pod affinity |
| datanode.podTemplate.annotations | object | `{}` | The annotations to be created to the pod. |
Expand All @@ -113,8 +114,9 @@ helm uninstall mycluster -n default
| datanode.storage.storageRetainPolicy | string | `"Retain"` | Storage retain policy for datanode persistent volume |
| datanode.storage.storageSize | string | `"10Gi"` | Storage size for datanode persistent volume |
| datanode.storage.walDir | string | `"/data/greptimedb/wal"` | The wal directory of the storage, default is "/data/greptimedb/wal" |
| flownode | object | `{"config":"","enabled":false,"podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1}` | Flownode configure. **It's NOT READY YET** |
| flownode.config | string | `""` | Extra flownode config in toml format. |
| flownode | object | `{"configData":"","configFile":"","enabled":false,"podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1}` | Flownode configure. **It's NOT READY YET** |
| flownode.configData | string | `""` | Extra raw toml config data of flownode. Skip if the `configFile` is used. |
| flownode.configFile | string | `""` | Extra toml file of flownode. |
| flownode.enabled | bool | `false` | Enable flownode |
| flownode.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]}` | The pod template for frontend |
| flownode.podTemplate.affinity | object | `{}` | The pod affinity |
Expand All @@ -135,8 +137,9 @@ helm uninstall mycluster -n default
| flownode.podTemplate.tolerations | list | `[]` | The pod tolerations |
| flownode.podTemplate.volumes | list | `[]` | The pod volumes |
| flownode.replicas | int | `1` | Flownode replicas |
| frontend | object | `{"config":"","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1,"service":{},"tls":{}}` | Frontend configure |
| frontend.config | string | `""` | Extra frontend config in toml format. |
| frontend | object | `{"configData":"","configFile":"","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1,"service":{},"tls":{}}` | Frontend configure |
| frontend.configData | string | `""` | Extra raw toml config data of frontend. Skip if the `configFile` is used. |
| frontend.configFile | string | `""` | Extra toml file of frontend. |
| frontend.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","readinessProbe":{},"resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]}` | The pod template for frontend |
| frontend.podTemplate.affinity | object | `{}` | The pod affinity |
| frontend.podTemplate.annotations | object | `{}` | The annotations to be created to the pod. |
Expand Down Expand Up @@ -167,8 +170,9 @@ helm uninstall mycluster -n default
| initializer.registry | string | `"docker.io"` | Initializer image registry |
| initializer.repository | string | `"greptime/greptimedb-initializer"` | Initializer image repository |
| initializer.tag | string | `"0.1.0-alpha.28"` | Initializer image tag |
| meta | object | `{"config":"","enableRegionFailover":false,"etcdEndpoints":"etcd.default.svc.cluster.local:2379","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"readinessProbe":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1,"storeKeyPrefix":""}` | Meta configure |
| meta.config | string | `""` | Extra Meta config in toml format. |
| meta | object | `{"configData":"","configFile":"","enableRegionFailover":false,"etcdEndpoints":"etcd.default.svc.cluster.local:2379","podTemplate":{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"readinessProbe":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]},"replicas":1,"storeKeyPrefix":""}` | Meta configure |
| meta.configData | string | `""` | Extra raw toml config data of meta. Skip if the `configFile` is used. |
| meta.configFile | string | `""` | Extra toml file of meta. |
| meta.enableRegionFailover | bool | `false` | Whether to enable region failover |
| meta.etcdEndpoints | string | `"etcd.default.svc.cluster.local:2379"` | Meta etcd endpoints |
| meta.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}},"volumeMounts":[]},"nodeSelector":{},"readinessProbe":{},"serviceAccount":{"annotations":{},"create":false},"tolerations":[],"volumes":[]}` | The pod template for meta |
Expand Down
40 changes: 28 additions & 12 deletions charts/greptimedb-cluster/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,14 @@ spec:
{{- end }}
frontend:
replicas: {{ .Values.frontend.replicas }}
{{- if .Values.frontend.config }}
{{- if or .Values.frontend.configFile .Values.frontend.configData }}
config: |-
{{ .Values.frontend.config | nindent 6 }}
{{- end }}
{{- if .Values.frontend.configFile }}
{{ .Files.Get .Values.frontend.configFile | indent 6 }}
{{- else }}
{{ .Values.frontend.configData | indent 6 }}
{{- end }}
{{- end }}
{{- if .Values.frontend.tls }}
tls:
secretName: {{ .Values.frontend.tls.secretName }}
Expand Down Expand Up @@ -105,10 +109,14 @@ spec:
{{- end }}
meta:
replicas: {{ .Values.meta.replicas }}
{{- if .Values.meta.config }}
{{- if or .Values.meta.configFile .Values.meta.configData }}
config: |-
{{ .Values.meta.config | nindent 6 }}
{{- end }}
{{- if .Values.meta.configFile }}
{{ .Files.Get .Values.meta.configFile | indent 6 }}
{{- else }}
{{ .Values.meta.configData | indent 6 }}
{{- end }}
{{- end }}
{{- if .Values.meta.etcdEndpoints }}
etcdEndpoints:
- {{ .Values.meta.etcdEndpoints }}
Expand Down Expand Up @@ -165,10 +173,14 @@ spec:
{{- end }}
datanode:
replicas: {{ .Values.datanode.replicas }}
{{- if .Values.datanode.config }}
{{- if or .Values.datanode.configFile .Values.datanode.configData }}
config: |-
{{ .Values.datanode.config | nindent 6 }}
{{- end }}
{{- if .Values.datanode.configFile }}
{{ .Files.Get .Values.datanode.configFile | indent 6 }}
{{- else }}
{{ .Values.datanode.configData | indent 6 }}
{{- end }}
{{- end }}
template:
main:
{{- if .Values.datanode.podTemplate.main.image }}
Expand Down Expand Up @@ -222,10 +234,14 @@ spec:
{{- if .Values.flownode.enabled }}
flownode:
replicas: {{ .Values.flownode.replicas }}
{{- if .Values.flownode.config }}
{{- if or .Values.flownode.configFile .Values.flownode.configData }}
config: |-
{{ .Values.flownode.config | nindent 6 }}
{{- end }}
{{- if .Values.flownode.configFile }}
{{ .Files.Get .Values.flownode.configFile | indent 6 }}
{{- else }}
{{ .Values.flownode.configData | indent 6 }}
{{- end }}
{{- end }}
template:
main:
{{- if .Values.flownode.podTemplate.main.image }}
Expand Down
28 changes: 20 additions & 8 deletions charts/greptimedb-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,11 @@ frontend:
# -- Frontend replicas
replicas: 1

# -- Extra frontend config in toml format.
config: ""
# -- Extra toml file of frontend.
configFile: ""

# -- Extra raw toml config data of frontend. Skip if the `configFile` is used.
configData: ""

# -- The pod template for frontend
podTemplate:
Expand Down Expand Up @@ -149,8 +152,11 @@ meta:
# -- Meta replicas
replicas: 1

# -- Extra Meta config in toml format.
config: ""
# -- Extra toml file of meta.
configFile: ""

# -- Extra raw toml config data of meta. Skip if the `configFile` is used.
configData: ""

# -- The pod template for meta
podTemplate:
Expand Down Expand Up @@ -228,8 +234,11 @@ datanode:
# -- Datanode replicas
replicas: 3

# -- Extra datanode config in toml format.
config: ""
# -- Extra toml file of datanode.
configFile: ""

# -- Extra raw toml config data of datanode. Skip if the `configFile` is used.
configData: ""

# -- The pod template for datanode
podTemplate:
Expand Down Expand Up @@ -313,8 +322,11 @@ flownode:
# -- Flownode replicas
replicas: 1

# -- Extra flownode config in toml format.
config: ""
# -- Extra toml file of flownode.
configFile: ""

# -- Extra raw toml config data of flownode. Skip if the `configFile` is used.
configData: ""

# -- The pod template for frontend
podTemplate:
Expand Down
Loading