Skip to content

Commit 3322b29

Browse files
authored
Merge branch 'main' into feat/pvc-existing
2 parents a22e169 + 258704d commit 3322b29

File tree

7 files changed

+46
-20
lines changed

7 files changed

+46
-20
lines changed

.github/workflows/tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
fi
6262
6363
- name: Create kind cluster
64-
uses: helm/kind-action@v1.4.0
64+
uses: helm/kind-action@v1.5.0
6565
if: steps.list-changed.outputs.changed == 'true'
6666

6767
- name: Run chart-testing (install)

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<h4 align="center">
88
<a href="https://github.com/meilisearch/meilisearch">Meilisearch</a> |
99
<a href="https://docs.meilisearch.com">Documentation</a> |
10-
<a href="https://slack.meilisearch.com">Slack</a> |
10+
<a href="https://discord.meilisearch.com">Discord</a> |
1111
<a href="https://www.meilisearch.com">Website</a> |
1212
<a href="https://blog.meilisearch.com">Blog</a> |
1313
<a href="https://docs.meilisearch.com/faq">FAQ</a>
@@ -92,7 +92,7 @@ helm uninstall <your-service-name>
9292

9393
## 🤖 Compatibility with Meilisearch
9494

95-
This chart only guarantees the compatibility with the [version v0.29.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.29.0).
95+
This chart only guarantees the compatibility with the [version v0.30.0 of Meilisearch](https://github.com/meilisearch/meilisearch/releases/tag/v0.30.0).
9696

9797
## ⚙️ Development Workflow and Contributing
9898

charts/meilisearch/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v1
2-
appVersion: "v0.29.0"
2+
appVersion: "v0.30.0"
33
description: A Helm chart for the Meilisearch search engine
44
name: meilisearch
5-
version: 0.1.44
5+
version: 0.1.47
66
icon: https://res.cloudinary.com/meilisearch/image/upload/v1597822872/Logo/logo_img.svg
77
home: https://github.com/meilisearch/meilisearch-kubernetes/charts
88
maintainers:

charts/meilisearch/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ helm uninstall <your-service-name>
110110
| | |
111111
| `volumeMounts` | Additional volumes to mount on pod | `[]`
112112
| | |
113+
| `containers` | Additional containers for pod | `[]`
114+
| | |
113115
| `tolerations` | Tolerations for pod assignment | `[]`
114116
| | |
115117
| `nodeSelector` | Node labels for pod assignment | `{}`

charts/meilisearch/templates/statefulset.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,13 @@ spec:
6767
- name: http
6868
containerPort: {{ .Values.container.containerPort }}
6969
protocol: TCP
70+
startupProbe:
71+
httpGet:
72+
path: /health
73+
port: http
74+
periodSeconds: {{ .Values.startupProbe.periodSeconds }}
75+
initialDelaySeconds: {{ .Values.startupProbe.InitialDelaySeconds }}
76+
failureThreshold: {{ .Values.startupProbe.failureThreshold }}
7077
livenessProbe:
7178
httpGet:
7279
path: /health
@@ -81,6 +88,9 @@ spec:
8188
initialDelaySeconds: {{ .Values.readinessProbe.InitialDelaySeconds }}
8289
resources:
8390
{{ toYaml .Values.resources | indent 12 }}
91+
{{- if .Values.containers }}
92+
{{ toYaml .Values.containers | nindent 8 }}
93+
{{- end }}
8494
{{- with .Values.nodeSelector }}
8595
nodeSelector:
8696
{{ toYaml . | indent 8 }}

charts/meilisearch/values.yaml

+12-5
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,22 @@
44

55
replicaCount: 1
66

7+
startupProbe:
8+
periodSeconds: 1
9+
InitialDelaySeconds: 1
10+
failureThreshold: 60
11+
712
readinessProbe:
8-
periodSeconds: 60
9-
InitialDelaySeconds: 60
13+
periodSeconds: 10
14+
InitialDelaySeconds: 0
1015

1116
livenessProbe:
12-
periodSeconds: 60
13-
InitialDelaySeconds: 60
17+
periodSeconds: 10
18+
InitialDelaySeconds: 0
1419

1520
image:
1621
repository: getmeili/meilisearch
17-
tag: v0.29.0
22+
tag: v0.30.0
1823
pullPolicy: IfNotPresent
1924
pullSecret:
2025

@@ -108,6 +113,8 @@ volumes: []
108113

109114
volumeMounts: []
110115

116+
containers: []
117+
111118
nodeSelector: {}
112119

113120
tolerations: []

manifests/meilisearch.yaml

+17-10
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app.kubernetes.io/name: meilisearch
99
app.kubernetes.io/instance: meilisearch
10-
app.kubernetes.io/version: "v0.29.0"
10+
app.kubernetes.io/version: "v0.30.0"
1111
app.kubernetes.io/component: search-engine
1212
app.kubernetes.io/part-of: meilisearch
1313
---
@@ -19,7 +19,7 @@ metadata:
1919
labels:
2020
app.kubernetes.io/name: meilisearch
2121
app.kubernetes.io/instance: meilisearch
22-
app.kubernetes.io/version: "v0.29.0"
22+
app.kubernetes.io/version: "v0.30.0"
2323
app.kubernetes.io/component: search-engine
2424
app.kubernetes.io/part-of: meilisearch
2525
data:
@@ -34,7 +34,7 @@ metadata:
3434
labels:
3535
app.kubernetes.io/name: meilisearch
3636
app.kubernetes.io/instance: meilisearch
37-
app.kubernetes.io/version: "v0.29.0"
37+
app.kubernetes.io/version: "v0.30.0"
3838
app.kubernetes.io/component: search-engine
3939
app.kubernetes.io/part-of: meilisearch
4040
spec:
@@ -56,7 +56,7 @@ metadata:
5656
labels:
5757
app.kubernetes.io/name: meilisearch
5858
app.kubernetes.io/instance: meilisearch
59-
app.kubernetes.io/version: "v0.29.0"
59+
app.kubernetes.io/version: "v0.30.0"
6060
app.kubernetes.io/component: search-engine
6161
app.kubernetes.io/part-of: meilisearch
6262
spec:
@@ -71,14 +71,14 @@ spec:
7171
labels:
7272
app.kubernetes.io/name: meilisearch
7373
app.kubernetes.io/instance: meilisearch
74-
app.kubernetes.io/version: "v0.29.0"
74+
app.kubernetes.io/version: "v0.30.0"
7575
app.kubernetes.io/component: search-engine
7676
app.kubernetes.io/part-of: meilisearch
7777
spec:
7878
serviceAccountName: meilisearch
7979
containers:
8080
- name: meilisearch
81-
image: "getmeili/meilisearch:v0.29.0"
81+
image: "getmeili/meilisearch:v0.30.0"
8282
imagePullPolicy: IfNotPresent
8383
envFrom:
8484
- configMapRef:
@@ -87,18 +87,25 @@ spec:
8787
- name: http
8888
containerPort: 7700
8989
protocol: TCP
90+
startupProbe:
91+
httpGet:
92+
path: /health
93+
port: http
94+
periodSeconds: 1
95+
initialDelaySeconds: 1
96+
failureThreshold: 60
9097
livenessProbe:
9198
httpGet:
9299
path: /health
93100
port: http
94-
periodSeconds: 60
95-
initialDelaySeconds: 60
101+
periodSeconds: 10
102+
initialDelaySeconds: 0
96103
readinessProbe:
97104
httpGet:
98105
path: /health
99106
port: http
100-
periodSeconds: 60
101-
initialDelaySeconds: 60
107+
periodSeconds: 10
108+
initialDelaySeconds: 0
102109
resources:
103110
{}
104111
---

0 commit comments

Comments
 (0)