From 3fe30f80096e70679023517bde103dc615c78f56 Mon Sep 17 00:00:00 2001 From: Oscar Date: Mon, 27 Jan 2025 17:34:09 +0100 Subject: [PATCH 1/2] Add namespace metadata option in templates This sets the namespace key in metadata for all kubernetes manifests. The `.Release.Namespace` is a built-in variable in helm, that can be passed with` --namespace` on `install` or `template` step. If not set it defaults to `default`. *Why?* When using `helm install` with the `--namespace` argument the templates are applied into the chosen namespace. When using helm only as a template engine, in combination with GitOps tools like Flux, the namespace property must be set in the rendered manifests to be applied. For `--namespace` to have an effect when using `helm template`, it must be present like this in the templates. This change should not have any effect/change for `helm install` approach as far as I know. --- charts/meilisearch/templates/configmap.yaml | 1 + charts/meilisearch/templates/ingress.yaml | 1 + charts/meilisearch/templates/master-key-secret.yaml | 1 + charts/meilisearch/templates/pvc.yaml | 1 + charts/meilisearch/templates/service.yaml | 1 + charts/meilisearch/templates/serviceMonitor.yaml | 1 + charts/meilisearch/templates/serviceaccount.yaml | 1 + charts/meilisearch/templates/statefulset.yaml | 1 + charts/meilisearch/templates/tests/test-connection.yaml | 1 + 9 files changed, 9 insertions(+) diff --git a/charts/meilisearch/templates/configmap.yaml b/charts/meilisearch/templates/configmap.yaml index c8f7bcd..3e2d6ae 100644 --- a/charts/meilisearch/templates/configmap.yaml +++ b/charts/meilisearch/templates/configmap.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ include "meilisearch.fullname" . }}-environment + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} data: diff --git a/charts/meilisearch/templates/ingress.yaml b/charts/meilisearch/templates/ingress.yaml index 6f7069d..bbafc51 100644 --- a/charts/meilisearch/templates/ingress.yaml +++ b/charts/meilisearch/templates/ingress.yaml @@ -12,6 +12,7 @@ apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $fullName }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} {{- with .Values.ingress.annotations }} diff --git a/charts/meilisearch/templates/master-key-secret.yaml b/charts/meilisearch/templates/master-key-secret.yaml index 07f7ccb..1b08902 100644 --- a/charts/meilisearch/templates/master-key-secret.yaml +++ b/charts/meilisearch/templates/master-key-secret.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "secretMasterKeyName" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} data: diff --git a/charts/meilisearch/templates/pvc.yaml b/charts/meilisearch/templates/pvc.yaml index 293f8a7..09cec54 100644 --- a/charts/meilisearch/templates/pvc.yaml +++ b/charts/meilisearch/templates/pvc.yaml @@ -4,6 +4,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ include "meilisearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} {{- with .Values.persistence.annotations }} diff --git a/charts/meilisearch/templates/service.yaml b/charts/meilisearch/templates/service.yaml index b3eefd6..b4082d1 100644 --- a/charts/meilisearch/templates/service.yaml +++ b/charts/meilisearch/templates/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "meilisearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} {{- with .Values.service.annotations }} diff --git a/charts/meilisearch/templates/serviceMonitor.yaml b/charts/meilisearch/templates/serviceMonitor.yaml index 49181ec..f806b07 100644 --- a/charts/meilisearch/templates/serviceMonitor.yaml +++ b/charts/meilisearch/templates/serviceMonitor.yaml @@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "meilisearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} {{- with .Values.serviceMonitor.additionalLabels }} diff --git a/charts/meilisearch/templates/serviceaccount.yaml b/charts/meilisearch/templates/serviceaccount.yaml index de9b548..e4b43d2 100644 --- a/charts/meilisearch/templates/serviceaccount.yaml +++ b/charts/meilisearch/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ template "meilisearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} diff --git a/charts/meilisearch/templates/statefulset.yaml b/charts/meilisearch/templates/statefulset.yaml index 934af82..868bcc1 100644 --- a/charts/meilisearch/templates/statefulset.yaml +++ b/charts/meilisearch/templates/statefulset.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ include "meilisearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "meilisearch.labels" . | nindent 4 }} spec: diff --git a/charts/meilisearch/templates/tests/test-connection.yaml b/charts/meilisearch/templates/tests/test-connection.yaml index 06e77c6..ab3eeb3 100644 --- a/charts/meilisearch/templates/tests/test-connection.yaml +++ b/charts/meilisearch/templates/tests/test-connection.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: {{ include "meilisearch.fullname" . | lower }}-test-connection + namespace: {{ .Release.Namespace }} labels: app.kubernetes.io/name: {{ include "meilisearch.name" . }} helm.sh/chart: {{ include "meilisearch.chart" . }} From 31fea6ca812354c6bbcf4f4e81c3a7b0814b6d9e Mon Sep 17 00:00:00 2001 From: brunoocasali Date: Mon, 17 Feb 2025 12:43:08 +0000 Subject: [PATCH 2/2] [CI] Syncing Helm manifest --- manifests/meilisearch.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifests/meilisearch.yaml b/manifests/meilisearch.yaml index 4bcc8cc..6a4cefa 100644 --- a/manifests/meilisearch.yaml +++ b/manifests/meilisearch.yaml @@ -4,6 +4,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: meilisearch + namespace: default labels: app.kubernetes.io/name: meilisearch app.kubernetes.io/instance: meilisearch @@ -16,6 +17,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: meilisearch-environment + namespace: default labels: app.kubernetes.io/name: meilisearch app.kubernetes.io/instance: meilisearch @@ -31,6 +33,7 @@ apiVersion: v1 kind: Service metadata: name: meilisearch + namespace: default labels: app.kubernetes.io/name: meilisearch app.kubernetes.io/instance: meilisearch @@ -53,6 +56,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: meilisearch + namespace: default labels: app.kubernetes.io/name: meilisearch app.kubernetes.io/instance: meilisearch @@ -75,7 +79,7 @@ spec: app.kubernetes.io/component: search-engine app.kubernetes.io/part-of: meilisearch annotations: - checksum/config: e34c2feaa89da8539b9da7d9ae7e5b060bf0b69bd75fc0e58bbaacc351ae98dc + checksum/config: 6e27e29db250c424570b2bd640c2a03aa4ae86e332990b6b26c67e41a073d0f0 spec: serviceAccountName: meilisearch securityContext: @@ -141,6 +145,7 @@ apiVersion: v1 kind: Pod metadata: name: meilisearch-test-connection + namespace: default labels: app.kubernetes.io/name: meilisearch app.kubernetes.io/instance: meilisearch