Merge #86

86: Add annotations to templates r=alallema a=Thearas

# Pull Request

## What does this PR do?

Implement #66 . I add `annotations` to pvc, svc and serviceAccount.

I saw that no one had done this issue and I just had the time😊. I am a beginner in Helm, if there is a mistake, please feel free to point out.

PTAL `@eskombro` 


Co-authored-by: Thearas <[email protected]>
Co-authored-by: Thearas <[email protected]>

Author: bors[bot]

charts/meilisearch/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v0.23.0"
 description: A Helm chart for the Meilisearch search engine
 name: meilisearch
-version: 0.1.18
+version: 0.1.19
 icon: https://res.cloudinary.com/meilisearch/image/upload/v1597822872/Logo/logo_img.svg
 home: https://github.com/meilisearch/meilisearch-kubernetes/charts
 maintainers:

charts/meilisearch/README.md

@@ -58,6 +58,8 @@ helm uninstall <your-service-name>
 | | |
 | `image.pullPolicy`               | MeiliSearch image pull policy                                  | `IfNotPresent`
 | | |
+| `serviceAccount.annotations`     | Additional annotations for service account                     | `{}`
+| | |
 | `ingress.enabled`                | Enable ingress controller resource                             | `false`
 | | |
 | `ingress.annotations`            | Ingress annotations                                            | `{}`
@@ -72,6 +74,8 @@ helm uninstall <your-service-name>
 | | |
 | `service.type`                   | Kubernetes Service type                                        | `7700`
 | | |
+| `service.annotations`            | Additional annotations for service                             | `{}`
+| | |
 | `persistence.enabled`            | Enable persistence using PVC                                   | `false`
 | | |
 | `persistence.accessMode`         | PVC Access Mode                                                | `ReadWriteOnce`
@@ -80,6 +84,8 @@ helm uninstall <your-service-name>
 | | |
 | `persistence.size`               | PVC Storage Request                                            | `10Gi`
 | | |
+| `persistence.annotations`        | Additional annotations for PVC                                 | `{}`
+| | |
 | `resources`                      | Resources allocation (Requests and Limits)                     | `{}`
 | | |
 | `tolerations`                    | Tolerations for pod assignment                                 | `[]`

charts/meilisearch/templates/pvc.yaml

@@ -11,6 +11,10 @@ metadata:
     {{- with .Values.customLabels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- with .Values.persistence.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

charts/meilisearch/templates/service.yaml

@@ -10,6 +10,10 @@ metadata:
     {{- with .Values.customLabels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/meilisearch/templates/serviceaccount.yaml

@@ -10,3 +10,7 @@ metadata:
     {{- with .Values.customLabels }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{ toYaml . | nindent 4 }}
+  {{- end }}

charts/meilisearch/values.yaml

@@ -30,13 +30,17 @@ environment:
   # secret. Otherwise the below value of MEILI_MASTER_KEY will be used instead.
   # MEILI_MASTER_KEY:
 
+serviceAccount:
+  annotations: {}
+
 podAnnotations: {}
 
 customLabels: {}
 
 service:
   type: ClusterIP
   port: 7700
+  annotations: {}
 
 container:
   containerPort: 7700
@@ -65,6 +69,7 @@ persistence:
   ##
   # storageClass: "-"
   size: 10Gi
+  annotations: {}
   volume:
     name: data
     mountPath: /data.ms