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

chore: update operator version, and support oss storage, wal configure #65

Merged
merged 2 commits into from
Oct 11, 2023
Merged

chore: update operator version, and support oss storage, wal configure #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba01347
chore: update operator version, and support oss strorage, wal configure
daviderli614 Oct 11, 2023
3ac06cd
refactor: wal values
daviderli614 Oct 11, 2023
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
4 changes: 2 additions & 2 deletions charts/greptimedb-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
kubeVersion: ">=1.18.0-0"
description: The greptimedb-operator Helm chart for Kubernetes
name: greptimedb-operator
appVersion: 0.1.0-alpha.15
version: 0.1.1-alpha.12
appVersion: 0.1.0-alpha.16
version: 0.1.1-alpha.13
type: application
home: https://github.com/GreptimeTeam/greptimedb-operator
sources:
Expand Down
19 changes: 19 additions & 0 deletions charts/greptimedb-operator/crds/greptimedbcluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2710,6 +2710,8 @@ spec:
storageSize:
pattern: (^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$)
type: string
walDir:
type: string
type: object
template:
properties:
Expand Down Expand Up @@ -10714,11 +10716,28 @@ spec:
type: integer
storage:
properties:
cacheCapacity:
type: string
cachePath:
type: string
local:
properties:
directory:
type: string
type: object
oss:
properties:
bucket:
type: string
endpoint:
type: string
region:
type: string
root:
type: string
secretName:
type: string
type: object
s3:
properties:
bucket:
Expand Down
10 changes: 5 additions & 5 deletions charts/greptimedb-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ image:
# The image pull policy for the controller
imagePullPolicy: IfNotPresent
# The image tag
tag: 0.1.0-alpha.15
tag: 0.1.0-alpha.16
# The image pull secrets.
pullSecrets: []

Expand All @@ -26,11 +26,11 @@ replicas: 1
# Default resources for greptimedb operator
resources:
limits:
cpu: 500m
memory: 128Mi
cpu: 200m
memory: 256Mi
requests:
cpu: 250m
memory: 64Mi
cpu: 100m
memory: 128Mi

rbac:
# install Role Based Access Control
Expand Down
2 changes: 1 addition & 1 deletion charts/greptimedb/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: greptimedb
description: A Helm chart for deploying GreptimeDB cluster in Kubernetes
type: application
version: 0.1.1-alpha.14
version: 0.1.1-alpha.15
appVersion: 0.3.2
10 changes: 10 additions & 0 deletions charts/greptimedb/templates/cluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ spec:
storageClassName: {{ .Values.datanode.storage.storageClassName }}
storageSize: {{ .Values.datanode.storage.storageSize }}
storageRetainPolicy: {{ .Values.datanode.storage.storageRetainPolicy }}
{{- if .Values.datanode.storage.walDir }}
walDir: {{ .Values.datanode.storage.walDir }}
{{- end }}
{{- if (and .Values.prometheusMonitor (eq .Values.prometheusMonitor.enabled true ))}}
prometheusMonitor: {{- toYaml .Values.prometheusMonitor | nindent 4 }}
{{- end }}
Expand All @@ -67,6 +70,13 @@ spec:
{{- else if .Values.storage.local }}
local:
directory: {{ .Values.storage.local.directory }}
{{- else if .Values.storage.oss }}
oss:
bucket: {{ .Values.storage.oss.bucket }}
region: {{ .Values.storage.oss.region }}
root: {{ .Values.storage.oss.root }}
secretName: {{ .Values.storage.oss.secretName }}
endpoint: {{ .Values.storage.oss.endpoint }}
{{- else }}
{}
{{- end }}
Loading