refactor: use the rqlite helm chart (#1)

hstreamdb · Apr 8, 2024 · c373ab7 · c373ab7
1 parent 0f7ead2
commit c373ab7
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git a/charts/hstreamdb/Chart.lock b/charts/hstreamdb/Chart.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: rqlite
+  repository: https://rqlite.github.io/helm-charts
+  version: 1.7.0
+digest: sha256:154165408ed6ee455f9bd7b0c29dfadf613b31e24c5c1178b2f9d4e47fa12d43
+generated: "2024-04-03T16:44:36.635842+08:00"
diff --git a/charts/hstreamdb/Chart.yaml b/charts/hstreamdb/Chart.yaml
@@ -23,3 +23,8 @@ version: 0.3.0
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 appVersion: "latest"
+
+dependencies:
+  - name: rqlite
+    version: "^1.7.0"
+    repository: https://rqlite.github.io/helm-charts
diff --git a/charts/hstreamdb/charts/rqlite-1.7.0.tgz b/charts/hstreamdb/charts/rqlite-1.7.0.tgz
diff --git a/charts/hstreamdb/templates/_helpers.tpl b/charts/hstreamdb/templates/_helpers.tpl
@@ -71,22 +71,16 @@ Below are custom templates for hstreamdb.
 Create volumeClaimTemplate for hstore.
 */}}
 {{- define "hstreamdb.hstore.volumeClaimTemplate" -}}
-{{- $globalStorageClassName := default "standard" .Values.storageClassName }}
+{{- if .Values.storageClassName }}
 spec:
-  storageClassName: {{ print $globalStorageClassName }}
+  storageClassName: {{ .Values.storageClassName }}
   resources:
     requests:
       storage: {{ .Values.hstore.storage }}
-{{- end }}
-
-{{/*
-Create volumeClaimTemplate for hmeta.
-*/}}
-{{- define "hstreamdb.hmeta.volumeClaimTemplate" -}}
-{{- $globalStorageClassName := default "standard" .Values.storageClassName }}
+{{- else }}
 spec:
-  storageClassName: {{ print $globalStorageClassName }}
   resources:
     requests:
-      storage: {{ .Values.hmeta.storage }}
+      storage: {{ .Values.hstore.storage }}
+{{- end }}
 {{- end }}
diff --git a/charts/hstreamdb/templates/hstreamdb.yaml b/charts/hstreamdb/templates/hstreamdb.yaml
@@ -9,6 +9,10 @@ spec:
     {{- with .Values.clusterConfig }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
+  rqlite:
+    host: {{ include "hstreamdb.fullname" . }}-{{ .Values.rqlite.nameOverride }}
+    port: {{ default 80 .Values.rqlite.service.port }}
+    namespace: {{ .Release.Namespace | quote }}
   hserver:
     image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
     imagePullPolicy: {{ .Values.image.pullPolicy }}
@@ -53,13 +57,6 @@ spec:
       {{- if .Values.adminServer.container }}
       {{- toYaml .Values.adminServer.container | nindent 6 }}
       {{- end }}
-  hmeta:
-    image: rqlite/rqlite:{{ .Values.hmeta.rqlite.version }}
-    imagePullPolicy: {{ .Values.image.pullPolicy }}
-    replicas: {{ .Values.hmeta.replicaCount }}
-    container:
-      name: {{ .Values.hmeta.name }}
-    volumeClaimTemplate: {{ include "hstreamdb.hmeta.volumeClaimTemplate" . | indent 6 }}
   {{- if .Values.console.enabled }}
   console:
     image: {{ .Values.console.image }}

diff --git a/charts/hstreamdb/values.yaml b/charts/hstreamdb/values.yaml
@@ -31,7 +31,7 @@ hserver:
   replicaCount: 3
   container:
 
-storageClassName: "standard"
+storageClassName:
 
 hstore:
   # Name of the hstore component.
@@ -47,14 +47,13 @@ adminServer:
   replicaCount: 1
   container:
 
-hmeta:
-  # Name of the hmeta component.
-  name: hmeta
+rqlite:
+  # Override the name of the rqlite component to prevent potential conflicts.
+  # You don't need to change this value in most cases.
+  nameOverride: internal-rqlite
   replicaCount: 3
-  # Storage size for PVC requests. Must be set.
-  storage: 1Gi
-  rqlite:
-    version: 7.21.4
+  persistence:
+    size: 1Gi
 
 console:
   enabled: false

diff --git a/examples/kafka-mode/values.yaml b/examples/kafka-mode/values.yaml
@@ -0,0 +1,2 @@
+clusterConfig:
+  kafkaMode: true