Merge branch 'main' into bump-meilisearch-v0.23.0

Author: alallema

CONTRIBUTING.md

@@ -2,12 +2,23 @@
 
 First of all, thank you for contributing to MeiliSearch! The goal of this document is to provide everything you need to know in order to contribute to MeiliSearch and its different integrations.
 
+- [Hacktoberfest](#hacktoberfest)
 - [Assumptions](#assumptions)
 - [How to Contribute](#how-to-contribute)
 - [Development Workflow](#development-workflow)
 - [Git Guidelines](#git-guidelines)
 - [Release Process (for internal team only)](#release-process-for-internal-team-only)
 
+## Hacktoberfest
+
+It's [Hacktoberfest month](https://blog.meilisearch.com/contribute-hacktoberfest-2021/)! 🥳
+
+🚀 If your PR gets accepted it will count into your participation to Hacktoberfest!
+
+✅ To be accepted it has either to have been merged, approved or tagged with the `hacktoberfest-accepted` label.
+
+🧐 Don't forget to check the [quality standards](https://hacktoberfest.digitalocean.com/resources/qualitystandards)! Low-quality PRs might get marked as `spam` or `invalid`, and will not count toward your participation in Hacktoberfest.
+
 ## Assumptions
 
 1. **You're familiar with [GitHub](https://github.com) and the [Pull Request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-requests)(PR) workflow.**
@@ -19,7 +30,7 @@ First of all, thank you for contributing to MeiliSearch! The goal of this docume
 1. Make sure that the contribution you want to make is explained or detailed in a GitHub issue! Find an [existing issue](https://github.com/meilisearch/meilisearch-kubernetes/issues/) or [open a new one](https://github.com/meilisearch/meilisearch-kubernetes/issues/new).
 2. Once done, [fork the meilisearch-kubernetes repository](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) in your own GitHub account. Ask a maintainer if you want your issue to be checked before making a PR.
 3. [Create a new Git branch](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-and-deleting-branches-within-your-repository).
-4. Review the [Development Workflow](#workflow) section that describes the steps to maintain the repository.
+4. Review the [Development Workflow](#development-workflow) section that describes the steps to maintain the repository.
 5. Make the changes on your branch.
 6. [Submit the branch as a PR](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) pointing to the `main` branch of the main meilisearch-kubernetes repository. A maintainer should comment and/or review your Pull Request within a few days. Although depending on the circumstances, it may take longer.<br>
  We do not enforce a naming convention for the PRs, but **please use something descriptive of your changes**, having in mind that the title of your PR will be automatically added to the next [release changelog](https://github.com/meilisearch/meilisearch-kubernetes/releases/).

charts/meilisearch/templates/configmap.yaml

@@ -7,6 +7,9 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 data:
   {{- range $key, $value := .Values.environment }}
   {{ $key }}: {{ $value | quote}}

charts/meilisearch/templates/ingress.yaml

@@ -10,6 +10,9 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 {{- with .Values.ingress.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}

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

@@ -10,10 +10,13 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 data:
   {{- if $secret }}
   MEILI_MASTER_KEY: {{ $secret.data.MEILI_MASTER_KEY }} 
   {{ else }}
   MEILI_MASTER_KEY: {{ randAlphaNum 20 | b64enc }}
   {{- end }}
-{{ end }}
+{{ end }}

charts/meilisearch/templates/pvc.yaml

@@ -8,6 +8,9 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

charts/meilisearch/templates/service.yaml

@@ -7,6 +7,9 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/meilisearch/templates/serviceaccount.yaml

@@ -7,3 +7,6 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}

charts/meilisearch/templates/statefulset.yaml

@@ -7,6 +7,9 @@ metadata:
     helm.sh/chart: {{ include "meilisearch.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
+    {{- with .Values.customLabels }}
+      {{- toYaml . | nindent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   serviceName: {{ template "meilisearch.fullname" . }}
@@ -19,6 +22,9 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "meilisearch.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
+        {{- with .Values.customLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}

charts/meilisearch/values.yaml

@@ -32,6 +32,8 @@ environment:
 
 podAnnotations: {}
 
+customLabels: {}
+
 service:
   type: ClusterIP
   port: 7700