Skip to content

Commit 6aabc1e

Browse files
fixed some typos and mistakes in parsing for the config file
1 parent 3ebcaa2 commit 6aabc1e

File tree

5 files changed

+28
-32
lines changed

5 files changed

+28
-32
lines changed

deploy/charts/bloom/templates/config.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ metadata:
55
labels:
66
{{- include "bloom.labels" . | nindent 4 }}
77
data:
8-
config.cfg: |
8+
bloom.cfg: |
99
[server]
1010
11-
log_level = {{ .Values.bloom.server.log_level | default "error" }}
12-
inet = {{ .Values.bloom.server.inet | default "[::1]:8080" }}
11+
log_level = {{ .Values.bloom.server.log_level | default "error" | quote }}
12+
inet = {{ .Values.bloom.server.inet | default "[::1]:8080" | quote }}
1313
1414
1515
[control]
1616
17-
inet = {{ .Values.bloom.control.inet | default "[::1]:8811" }}
17+
inet = {{ .Values.bloom.control.inet | default "[::1]:8811" | quote }}
1818
tcp_timeout = {{ .Values.bloom.control.tcp_timeout | default "300" }}
1919
2020
2121
[proxy]
2222
2323
shard_default = {{ .Values.bloom.proxy.shard_default | default 0 }}
2424
25-
{{ range .Values.bloom.proxy.shards | required "At least one valis list entry is required" }}
25+
{{ range .Values.bloom.proxy.shards | required "At least one valid list entry is required" }}
2626
[[proxy.shard]]
2727
shard = {{ .shard }}
28-
host = {{ .host }}
28+
host = {{ .host | quote}}
2929
port = {{ .port }}
3030
{{end}}
3131
@@ -42,7 +42,7 @@ data:
4242
4343
[redis]
4444
45-
host = {{.Values.bloom.redis.host | default "redis.svc.cluster.local" }}
45+
host = {{.Values.bloom.redis.host | default "redis.svc.cluster.local" | quote }}
4646
port = {{.Values.bloom.redis.port | default 6379 }}
4747
4848
database = {{ .Values.bloom.redis.database |default 0 }}
@@ -53,4 +53,4 @@ data:
5353
connection_timeout_seconds = {{ .Values.bloom.redis.connection_timeout_seconds | default 1 }}
5454
5555
max_key_size = {{ .Values.bloom.redis.max_key_size | default 256000 }}
56-
max_key_expiration = {{ .Values.bloom.redis.max_key_expiration | default 2592000 }}
56+
max_key_expiration = {{ .Values.bloom.redis.max_key_expiration | default 2592000 | int}}

deploy/charts/bloom/templates/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ spec:
5656
{{- toYaml .Values.resources | nindent 12 }}
5757
volumeMounts:
5858
- mountPath: /etc/bloom.cfg
59-
name: config
6059
subPath: bloom.cfg
60+
name: config
6161
{{- with .Values.nodeSelector }}
6262
nodeSelector:
6363
{{- toYaml . | nindent 8 }}

deploy/charts/bloom/templates/ingress.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{{- $fullName := include "bloom.fullname" . -}}
22
{{- $labels := include "bloom.labels" . }}
3-
{{- $svcPort := .Values.service.port -}}
3+
{{- $svcPort := .Values.service.http.port -}}
44
{{- $kubeversion := .Capabilities.KubeVersion.GitVersion}}
55
{{ range .Values.bloom.proxy.shards }}
66
{{- if .ingress.enabled -}}
@@ -31,7 +31,7 @@ metadata:
3131
3232
spec:
3333
{{- if and .ingress.className (semverCompare ">=1.18-0" $kubeversion) }}
34-
ingressClassName: {{ .Values.ingress.className }}
34+
ingressClassName: {{ .ingress.className }}
3535
{{- end }}
3636
{{- if .ingress.tls }}
3737
tls:

deploy/charts/bloom/templates/service.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,5 @@ spec:
1111
targetPort: http
1212
protocol: TCP
1313
name: http
14-
- port: {{ .Values.service.control.port }}
15-
targetPort: control
16-
protocol: TCP
17-
name: control
1814
selector:
1915
{{- include "bloom.selectorLabels" . | nindent 4 }}

deploy/charts/bloom/values.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ image:
88
repository: valeriansaliou/bloom
99
pullPolicy: IfNotPresent
1010
# Overrides the image tag whose default is the chart appVersion.
11-
tag: ""
11+
tag:
1212

1313
imagePullSecrets: []
1414
nameOverride: ""
@@ -24,42 +24,42 @@ serviceAccount:
2424
name: ""
2525
bloom:
2626
server:
27-
log_level: "error"
28-
inet: "[::1]:8080"
27+
log_level: "debug"
28+
inet: "0.0.0.0:8080"
2929
control:
3030
tcp_timeout: 300
31-
inet: "[::1]:8811"
31+
inet: "0.0.0.0:8811"
3232
proxy:
3333
# -- sets the default shard if none is set in the request
3434
shard_default: 0
3535
shards:
3636
- shard: 0
37-
host: ""
38-
port: ""
37+
host: "someservice.namespace.svc.cluster.local"
38+
port: someport
3939
ingress:
4040
enabled: true
41-
className: ""
42-
annotations: { }
41+
className: "nginx"
42+
annotations:
4343
# kubernetes.io/ingress.class: nginx
44-
# kubernetes.io/tls-acme: "true"
44+
kubernetes.io/tls-acme: "true"
4545
hosts:
46-
- host: chart-example.local
46+
- host: service.example.com
4747
paths:
4848
- path: /
4949
pathType: ImplementationSpecific
50-
tls: [ ]
51-
# - secretName: chart-example-tls
52-
# hosts:
53-
# - chart-example.local
50+
tls:
51+
- secretName: chart-example-tls
52+
hosts:
53+
- service.example.com
5454
cache:
5555
ttl_default: 600
5656
executor_pool: 64
5757
disable_read: false
5858
disable_write: false
5959
compress_body: true
6060
redis:
61-
host:
62-
port:
61+
host: "redis.redis.svc.cluster.local"
62+
port: 6379
6363
database: 0
6464
pool_size: 80
6565
max_lifetime_seconds: 60
@@ -84,7 +84,7 @@ securityContext: {}
8484
service:
8585
type: ClusterIP
8686
http:
87-
port: 80
87+
port: 8080
8888
control:
8989
port: 8811
9090

0 commit comments

Comments
 (0)