diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index ad81998..ef7a6a0 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -27,7 +27,7 @@ jobs: python-version: 3.7 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (lint) run: ct lint --config ct.yaml @@ -50,7 +50,7 @@ jobs: python-version: 3.7 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.4.0 + uses: helm/chart-testing-action@v2.6.0 - name: Run chart-testing (list-changed) id: list-changed diff --git a/README.md b/README.md index de88028..f7e714e 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,12 @@ **Meilisearch** is an open-source search engine. [Discover what Meilisearch is!](https://github.com/meilisearch/meilisearch) +--- + +### 🔥 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! + +--- + ## Table of Contents - [📖 Documentation](#-documentation) diff --git a/charts/meilisearch/Chart.yaml b/charts/meilisearch/Chart.yaml index 7fa25ac..e34d8aa 100644 --- a/charts/meilisearch/Chart.yaml +++ b/charts/meilisearch/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v1.4.0" description: A Helm chart for the Meilisearch search engine name: meilisearch -version: 0.2.7 +version: 0.2.8 icon: https://res.cloudinary.com/meilisearch/image/upload/v1597822872/Logo/logo_img.svg home: https://github.com/meilisearch/meilisearch-kubernetes/tree/main/charts/meilisearch maintainers: diff --git a/charts/meilisearch/templates/master-key-secret.yaml b/charts/meilisearch/templates/master-key-secret.yaml index 79bed3c..07f7ccb 100644 --- a/charts/meilisearch/templates/master-key-secret.yaml +++ b/charts/meilisearch/templates/master-key-secret.yaml @@ -1,15 +1,14 @@ {{- if eq (include "isProductionWithoutMasterKey" .) "true" }} -{{- $secretName := printf "%s-%s" (include "meilisearch.fullname" . ) "master-key" }} -{{- $secret := (lookup "v1" "Secret" .Release.Namespace $secretName) -}} +{{- $secret := (lookup "v1" "Secret" .Release.Namespace (include "secretMasterKeyName" .)) -}} apiVersion: v1 kind: Secret metadata: - name: {{ $secretName }} + name: {{ template "secretMasterKeyName" . }} labels: {{- include "meilisearch.labels" . | nindent 4 }} data: {{- if $secret }} - MEILI_MASTER_KEY: {{ $secret.data.MEILI_MASTER_KEY }} + MEILI_MASTER_KEY: {{ $secret.data.MEILI_MASTER_KEY }} {{ else }} MEILI_MASTER_KEY: {{ randAlphaNum 20 | b64enc }} {{- end }} diff --git a/charts/meilisearch/templates/serviceMonitor.yaml b/charts/meilisearch/templates/serviceMonitor.yaml index c33252d..62430dc 100644 --- a/charts/meilisearch/templates/serviceMonitor.yaml +++ b/charts/meilisearch/templates/serviceMonitor.yaml @@ -35,7 +35,7 @@ spec: {{- end }} {{- if or (.Values.environment.MEILI_MASTER_KEY) (.Values.auth.existingMasterKeySecret) (eq .Values.environment.MEILI_ENV "production") }} bearerTokenSecret: - name: meilisearch-master-key + name: {{ template "secretMasterKeyName" . }} key: MEILI_MASTER_KEY {{- end }} {{- if .Values.serviceMonitor.targetLabels }} diff --git a/ct.yaml b/ct.yaml index bb1175a..531c369 100644 --- a/ct.yaml +++ b/ct.yaml @@ -1,5 +1,5 @@ remote: origin chart-dirs: - charts -helm-extra-args: --timeout 600s +# helm-extra-args: --timeout 600s target-branch: main diff --git a/manifests/meilisearch.yaml b/manifests/meilisearch.yaml index 7559826..c4549e8 100644 --- a/manifests/meilisearch.yaml +++ b/manifests/meilisearch.yaml @@ -94,7 +94,7 @@ spec: app.kubernetes.io/component: search-engine app.kubernetes.io/part-of: meilisearch annotations: - checksum/config: fe89006beb14ca937e98a51d6dadf00eb3a1cc0263ad03d23a531be38b4eaf15 + checksum/config: 136a06ce32226c3ca55823dbc13dcbcea97ee3b44a9a459a0ec866a641eb92c0 spec: serviceAccountName: meilisearch securityContext: