Skip to content

Commit fe991e3

Browse files
meili-bors[bot]MannerManbrunoocasali
authored
Merge #247
247: Add namespace metadata option in templates r=brunoocasali a=MannerMan 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. # Pull Request ## Related issue Possibly a fix for #230 ## What does this PR do? - Sets the namespace key in metadata for all kubernetes manifests ## PR checklist Please check if your PR fulfills the following requirements: - [ x ] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)? - [ x ] Have you read the contributing guidelines? - [ x ] Have you made sure that the title is accurate and descriptive of the changes? Co-authored-by: Oscar <[email protected]> Co-authored-by: Bruno Casali <[email protected]> Co-authored-by: brunoocasali <[email protected]>
2 parents 2ff5e8e + 31fea6c commit fe991e3

10 files changed

+15
-1
lines changed

Diff for: charts/meilisearch/templates/configmap.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: ConfigMap
33
metadata:
44
name: {{ include "meilisearch.fullname" . }}-environment
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
{{- include "meilisearch.labels" . | nindent 4 }}
78
data:

Diff for: charts/meilisearch/templates/ingress.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ apiVersion: extensions/v1beta1
1212
kind: Ingress
1313
metadata:
1414
name: {{ $fullName }}
15+
namespace: {{ .Release.Namespace }}
1516
labels:
1617
{{- include "meilisearch.labels" . | nindent 4 }}
1718
{{- with .Values.ingress.annotations }}

Diff for: charts/meilisearch/templates/master-key-secret.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: v1
44
kind: Secret
55
metadata:
66
name: {{ template "secretMasterKeyName" . }}
7+
namespace: {{ .Release.Namespace }}
78
labels:
89
{{- include "meilisearch.labels" . | nindent 4 }}
910
data:

Diff for: charts/meilisearch/templates/pvc.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ kind: PersistentVolumeClaim
44
apiVersion: v1
55
metadata:
66
name: {{ include "meilisearch.fullname" . }}
7+
namespace: {{ .Release.Namespace }}
78
labels:
89
{{- include "meilisearch.labels" . | nindent 4 }}
910
{{- with .Values.persistence.annotations }}

Diff for: charts/meilisearch/templates/service.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: Service
33
metadata:
44
name: {{ include "meilisearch.fullname" . }}
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
{{- include "meilisearch.labels" . | nindent 4 }}
78
{{- with .Values.service.annotations }}

Diff for: charts/meilisearch/templates/serviceMonitor.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: monitoring.coreos.com/v1
33
kind: ServiceMonitor
44
metadata:
55
name: {{ include "meilisearch.fullname" . }}
6+
namespace: {{ .Release.Namespace }}
67
labels:
78
{{- include "meilisearch.labels" . | nindent 4 }}
89
{{- with .Values.serviceMonitor.additionalLabels }}

Diff for: charts/meilisearch/templates/serviceaccount.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apiVersion: v1
33
kind: ServiceAccount
44
metadata:
55
name: {{ template "meilisearch.fullname" . }}
6+
namespace: {{ .Release.Namespace }}
67
labels:
78
{{- include "meilisearch.labels" . | nindent 4 }}
89
{{- with .Values.serviceAccount.annotations }}

Diff for: charts/meilisearch/templates/statefulset.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: apps/v1
22
kind: StatefulSet
33
metadata:
44
name: {{ include "meilisearch.fullname" . }}
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
{{- include "meilisearch.labels" . | nindent 4 }}
78
spec:

Diff for: charts/meilisearch/templates/tests/test-connection.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
name: {{ include "meilisearch.fullname" . | lower }}-test-connection
5+
namespace: {{ .Release.Namespace }}
56
labels:
67
app.kubernetes.io/name: {{ include "meilisearch.name" . }}
78
helm.sh/chart: {{ include "meilisearch.chart" . }}

Diff for: manifests/meilisearch.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ apiVersion: v1
44
kind: ServiceAccount
55
metadata:
66
name: meilisearch
7+
namespace: default
78
labels:
89
app.kubernetes.io/name: meilisearch
910
app.kubernetes.io/instance: meilisearch
@@ -16,6 +17,7 @@ apiVersion: v1
1617
kind: ConfigMap
1718
metadata:
1819
name: meilisearch-environment
20+
namespace: default
1921
labels:
2022
app.kubernetes.io/name: meilisearch
2123
app.kubernetes.io/instance: meilisearch
@@ -31,6 +33,7 @@ apiVersion: v1
3133
kind: Service
3234
metadata:
3335
name: meilisearch
36+
namespace: default
3437
labels:
3538
app.kubernetes.io/name: meilisearch
3639
app.kubernetes.io/instance: meilisearch
@@ -53,6 +56,7 @@ apiVersion: apps/v1
5356
kind: StatefulSet
5457
metadata:
5558
name: meilisearch
59+
namespace: default
5660
labels:
5761
app.kubernetes.io/name: meilisearch
5862
app.kubernetes.io/instance: meilisearch
@@ -75,7 +79,7 @@ spec:
7579
app.kubernetes.io/component: search-engine
7680
app.kubernetes.io/part-of: meilisearch
7781
annotations:
78-
checksum/config: e34c2feaa89da8539b9da7d9ae7e5b060bf0b69bd75fc0e58bbaacc351ae98dc
82+
checksum/config: 6e27e29db250c424570b2bd640c2a03aa4ae86e332990b6b26c67e41a073d0f0
7983
spec:
8084
serviceAccountName: meilisearch
8185
securityContext:
@@ -141,6 +145,7 @@ apiVersion: v1
141145
kind: Pod
142146
metadata:
143147
name: meilisearch-test-connection
148+
namespace: default
144149
labels:
145150
app.kubernetes.io/name: meilisearch
146151
app.kubernetes.io/instance: meilisearch

0 commit comments

Comments
 (0)