Skip to content

Commit 80a3ff4

Browse files
authored
helm fixes for distributed mode (#1031)
* fixes for distributed mode * add placeholder for fluent bit values
1 parent 6d3632a commit 80a3ff4

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

helm/templates/ingestor-statefulset.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,9 @@ spec:
5454
apiVersion: v1
5555
fieldPath: metadata.name
5656
{{- end }}
57-
{{- range $secret := .Values.parseable.s3ModeSecret }}
57+
58+
{{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
59+
{{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
5860
{{- range $key := $secret.keys }}
5961
{{- $envPrefix := $secret.prefix | default "" | upper }}
6062
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -65,7 +67,10 @@ spec:
6567
key: {{ $key }}
6668
{{- end }}
6769
{{- end }}
68-
{{- range $secret := .Values.parseable.blobModeSecret }}
70+
{{- end }}
71+
72+
{{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
73+
{{- range $secret := .Values.parseable.blobModeSecret.secrets }}
6974
{{- range $key := $secret.keys }}
7075
{{- $envPrefix := $secret.prefix | default "" | upper }}
7176
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -76,6 +81,7 @@ spec:
7681
key: {{ $key }}
7782
{{- end }}
7883
{{- end }}
84+
{{- end }}
7985
- name: P_MODE
8086
value: "ingest"
8187
ports:

helm/templates/querier-statefulset.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,15 @@ spec:
5252
fieldRef:
5353
apiVersion: v1
5454
fieldPath: metadata.name
55+
- name: P_MODE
56+
value: "query"
5557
{{- range $key, $value := .Values.parseable.env }}
5658
- name: {{ $key }}
5759
value: {{ tpl $value $ | quote }}
5860
{{- end }}
59-
{{- range $secret := .Values.parseable.s3ModeSecret }}
61+
62+
{{- if and .Values.parseable.s3ModeSecret .Values.parseable.s3ModeSecret.enabled }}
63+
{{- range $secret := .Values.parseable.s3ModeSecret.secrets }}
6064
{{- range $key := $secret.keys }}
6165
{{- $envPrefix := $secret.prefix | default "" | upper }}
6266
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -67,13 +71,10 @@ spec:
6771
key: {{ $key }}
6872
{{- end }}
6973
{{- end }}
70-
- name: P_MODE
71-
value: "query"
72-
{{- if .Values.parseable.persistence.querier.enabled }}
73-
- name: P_HOT_TIER_DIR
74-
value: "/parseable/hot-tier"
7574
{{- end }}
76-
{{- range $secret := .Values.parseable.blobModeSecret }}
75+
76+
{{- if and .Values.parseable.blobModeSecret .Values.parseable.blobModeSecret.enabled }}
77+
{{- range $secret := .Values.parseable.blobModeSecret.secrets }}
7778
{{- range $key := $secret.keys }}
7879
{{- $envPrefix := $secret.prefix | default "" | upper }}
7980
{{- $envKey := $key | upper | replace "." "_" | replace "-" "_" }}
@@ -84,6 +85,7 @@ spec:
8485
key: {{ $key }}
8586
{{- end }}
8687
{{- end }}
88+
{{- end }}
8789
ports:
8890
- containerPort: 8000
8991
{{- with .Values.readinessProbe }}

helm/values.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,7 @@ vector:
297297
fluent-bit:
298298
enabled: true
299299
kind: DaemonSet
300+
serverHost: parseable.parseable.svc.cluster.local
300301
replicaCount: 1
301302
image:
302303
repository: parseable/fluent-bit
@@ -382,7 +383,7 @@ fluent-bit:
382383
[OUTPUT]
383384
Name parseable
384385
Match kube.*
385-
Server_Host parseable.parseable.svc.cluster.local
386+
Server_Host {{ .Values.serverHost }}
386387
Username admin
387388
Password admin
388389
Server_Port 80
@@ -392,7 +393,7 @@ fluent-bit:
392393
[OUTPUT]
393394
Name parseable
394395
Match k8s_events
395-
Server_Host parseable.parseable.svc.cluster.local
396+
Server_Host {{ .Values.serverHost }}
396397
Server_Port 80
397398
Username admin
398399
Password admin

0 commit comments

Comments
 (0)