diff --git a/deploy/eck-stack/charts/eck-agent/templates/elastic-agent.yaml b/deploy/eck-stack/charts/eck-agent/templates/elastic-agent.yaml index 9017e5bb8b..a7a76eca43 100644 --- a/deploy/eck-stack/charts/eck-agent/templates/elastic-agent.yaml +++ b/deploy/eck-stack/charts/eck-agent/templates/elastic-agent.yaml @@ -3,6 +3,7 @@ apiVersion: agent.k8s.elastic.co/v1alpha1 kind: Agent metadata: name: {{ include "elasticagent.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "elasticagent.labels" $ | nindent 4 }} annotations: diff --git a/deploy/eck-stack/charts/eck-apm-server/templates/apmserver.yaml b/deploy/eck-stack/charts/eck-apm-server/templates/apmserver.yaml index f3dd5ba969..f748ae7676 100644 --- a/deploy/eck-stack/charts/eck-apm-server/templates/apmserver.yaml +++ b/deploy/eck-stack/charts/eck-apm-server/templates/apmserver.yaml @@ -3,6 +3,7 @@ apiVersion: apm.k8s.elastic.co/v1 kind: ApmServer metadata: name: {{ include "apm-server.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "apm-server.labels" . | nindent 4 }} annotations: diff --git a/deploy/eck-stack/charts/eck-beats/templates/beats.yaml b/deploy/eck-stack/charts/eck-beats/templates/beats.yaml index a70ac9a631..1f2c4fce47 100644 --- a/deploy/eck-stack/charts/eck-beats/templates/beats.yaml +++ b/deploy/eck-stack/charts/eck-beats/templates/beats.yaml @@ -3,6 +3,7 @@ apiVersion: beat.k8s.elastic.co/v1beta1 kind: Beat metadata: name: {{ include "beat.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "beat.labels" . | nindent 4 }} annotations: diff --git a/deploy/eck-stack/charts/eck-elasticsearch/templates/elasticsearch.yaml b/deploy/eck-stack/charts/eck-elasticsearch/templates/elasticsearch.yaml index 4a4d7465b7..f59ffadc26 100644 --- a/deploy/eck-stack/charts/eck-elasticsearch/templates/elasticsearch.yaml +++ b/deploy/eck-stack/charts/eck-elasticsearch/templates/elasticsearch.yaml @@ -3,6 +3,7 @@ apiVersion: elasticsearch.k8s.elastic.co/v1 kind: Elasticsearch metadata: name: {{ include "elasticsearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "elasticsearch.labels" . | nindent 4 }} annotations: diff --git a/deploy/eck-stack/charts/eck-elasticsearch/templates/ingress.yaml b/deploy/eck-stack/charts/eck-elasticsearch/templates/ingress.yaml index 99aa181319..d4a1ab2fb5 100644 --- a/deploy/eck-stack/charts/eck-elasticsearch/templates/ingress.yaml +++ b/deploy/eck-stack/charts/eck-elasticsearch/templates/ingress.yaml @@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ include "elasticsearch.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "elasticsearch.labels" . | nindent 4 }} {{- with .Values.ingress.labels }} diff --git a/deploy/eck-stack/charts/eck-enterprise-search/templates/enterprisesearch.yaml b/deploy/eck-stack/charts/eck-enterprise-search/templates/enterprisesearch.yaml index af224e350f..42c81f3d7f 100644 --- a/deploy/eck-stack/charts/eck-enterprise-search/templates/enterprisesearch.yaml +++ b/deploy/eck-stack/charts/eck-enterprise-search/templates/enterprisesearch.yaml @@ -3,6 +3,7 @@ apiVersion: enterprisesearch.k8s.elastic.co/v1 kind: EnterpriseSearch metadata: name: {{ include "eck-enterprise-search.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "eck-enterprise-search.labels" . | nindent 4 }} {{- with .Values.labels }} diff --git a/deploy/eck-stack/charts/eck-fleet-server/templates/fleet-server.yaml b/deploy/eck-stack/charts/eck-fleet-server/templates/fleet-server.yaml index 2eb3b0d3c4..aaaf956006 100644 --- a/deploy/eck-stack/charts/eck-fleet-server/templates/fleet-server.yaml +++ b/deploy/eck-stack/charts/eck-fleet-server/templates/fleet-server.yaml @@ -3,6 +3,7 @@ apiVersion: agent.k8s.elastic.co/v1alpha1 kind: Agent metadata: name: {{ include "fleet-server.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "fleet-server.labels" . | nindent 4 }} annotations: diff --git a/deploy/eck-stack/charts/eck-kibana/templates/ingress.yaml b/deploy/eck-stack/charts/eck-kibana/templates/ingress.yaml index 171463c033..b5c3355ef9 100644 --- a/deploy/eck-stack/charts/eck-kibana/templates/ingress.yaml +++ b/deploy/eck-stack/charts/eck-kibana/templates/ingress.yaml @@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ include "kibana.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "kibana.labels" . | nindent 4 }} {{- with .Values.ingress.labels }} diff --git a/deploy/eck-stack/charts/eck-kibana/templates/kibana.yaml b/deploy/eck-stack/charts/eck-kibana/templates/kibana.yaml index 2d07efaa2e..d51dd9a9bf 100644 --- a/deploy/eck-stack/charts/eck-kibana/templates/kibana.yaml +++ b/deploy/eck-stack/charts/eck-kibana/templates/kibana.yaml @@ -3,6 +3,7 @@ apiVersion: kibana.k8s.elastic.co/v1 kind: Kibana metadata: name: {{ include "kibana.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "kibana.labels" . | nindent 4 }} annotations: diff --git a/deploy/eck-stack/charts/eck-logstash/templates/logstash.yaml b/deploy/eck-stack/charts/eck-logstash/templates/logstash.yaml index 8ba52ef660..0e70aea780 100644 --- a/deploy/eck-stack/charts/eck-logstash/templates/logstash.yaml +++ b/deploy/eck-stack/charts/eck-logstash/templates/logstash.yaml @@ -3,6 +3,7 @@ apiVersion: logstash.k8s.elastic.co/v1alpha1 kind: Logstash metadata: name: {{ include "logstash.fullname" . }} + namespace: {{ .Release.Namespace }} labels: {{- include "logstash.labels" . | nindent 4 }} annotations: