Skip to content

Commit 994606e

Browse files
authored
Merge branch 'main' into bump-meilisearch-v1.5.0
2 parents 94916ec + 56b78ee commit 994606e

File tree

7 files changed

+10
-17
lines changed

7 files changed

+10
-17
lines changed

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
python-version: 3.7
2828

2929
- name: Set up chart-testing
30-
uses: helm/chart-testing-action@v2.4.0
30+
uses: helm/chart-testing-action@v2.6.0
3131

3232
- name: Run chart-testing (lint)
3333
run: ct lint --config ct.yaml
@@ -50,7 +50,7 @@ jobs:
5050
python-version: 3.7
5151

5252
- name: Set up chart-testing
53-
uses: helm/chart-testing-action@v2.4.0
53+
uses: helm/chart-testing-action@v2.6.0
5454

5555
- name: Run chart-testing (list-changed)
5656
id: list-changed

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@
2323

2424
**Meilisearch** is an open-source search engine. [Discover what Meilisearch is!](https://github.com/meilisearch/meilisearch)
2525

26-
---
27-
28-
### 🔥 On November 2nd, we are hosting our first-ever live demo and product updates for [Meilisearch Cloud](https://www.meilisearch.com/cloud?utm_campaign=oss&utm_source=github&utm_medium=meilisearch). Make sure to [register here](https://us06web.zoom.us/meeting/register/tZMlc-mqrjIsH912-HTRe-AaT-pp41bDe81a#/registration) and bring your questions for live Q&A!
29-
30-
---
31-
32-
## Table of Contents <!-- omit in toc -->
26+
## Table of Contents <!-- omit in TOC -->
3327

3428
- [📖 Documentation](#-documentation)
3529
- [⚡ Supercharge your Meilisearch experience](#-supercharge-your-meilisearch-experience)

charts/meilisearch/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: "v1.5.0"
33
description: A Helm chart for the Meilisearch search engine
44
name: meilisearch
5-
version: $new_k8s_version
5+
version: 0.3.0
66
icon: https://res.cloudinary.com/meilisearch/image/upload/v1597822872/Logo/logo_img.svg
77
home: https://github.com/meilisearch/meilisearch-kubernetes/tree/main/charts/meilisearch
88
maintainers:

charts/meilisearch/templates/master-key-secret.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{{- if eq (include "isProductionWithoutMasterKey" .) "true" }}
2-
{{- $secretName := printf "%s-%s" (include "meilisearch.fullname" . ) "master-key" }}
3-
{{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
2+
{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "secretMasterKeyName" .)) -}}
43
apiVersion: v1
54
kind: Secret
65
metadata:
7-
name: {{ $secretName }}
6+
name: {{ template "secretMasterKeyName" . }}
87
labels:
98
{{- include "meilisearch.labels" . | nindent 4 }}
109
data:
1110
{{- if $secret }}
12-
MEILI_MASTER_KEY: {{ $secret.data.MEILI_MASTER_KEY }}
11+
MEILI_MASTER_KEY: {{ $secret.data.MEILI_MASTER_KEY }}
1312
{{ else }}
1413
MEILI_MASTER_KEY: {{ randAlphaNum 20 | b64enc }}
1514
{{- end }}

charts/meilisearch/templates/serviceMonitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ spec:
3535
{{- end }}
3636
{{- if or (.Values.environment.MEILI_MASTER_KEY) (.Values.auth.existingMasterKeySecret) (eq .Values.environment.MEILI_ENV "production") }}
3737
bearerTokenSecret:
38-
name: meilisearch-master-key
38+
name: {{ template "secretMasterKeyName" . }}
3939
key: MEILI_MASTER_KEY
4040
{{- end }}
4141
{{- if .Values.serviceMonitor.targetLabels }}

ct.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
remote: origin
22
chart-dirs:
33
- charts
4-
helm-extra-args: --timeout 600s
4+
# helm-extra-args: --timeout 600s
55
target-branch: main

manifests/meilisearch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ spec:
7575
app.kubernetes.io/component: search-engine
7676
app.kubernetes.io/part-of: meilisearch
7777
annotations:
78-
checksum/config: fe89006beb14ca937e98a51d6dadf00eb3a1cc0263ad03d23a531be38b4eaf15
78+
checksum/config: 136a06ce32226c3ca55823dbc13dcbcea97ee3b44a9a459a0ec866a641eb92c0
7979
spec:
8080
serviceAccountName: meilisearch
8181
securityContext:

0 commit comments

Comments
 (0)