feat: add possibility of overriting the namespace

charts/jaeger-operator/templates/_helpers.tpl

@@ -47,3 +47,14 @@ Create chart name and version as used by the chart label.
 app.kubernetes.io/name: {{ include "jaeger-operator.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+Determine Namespace based on the inputs
+*/}}
+{{- define "jaeger-operator.namespace" -}}
+{{- if .Values.namespaceOverride }}
+{{- .Values.namespaceOverride -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}

charts/jaeger-operator/templates/certificate.yaml

@@ -3,11 +3,11 @@ apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: {{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
 spec:
   dnsNames:
-  - "{{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}.{{ .Release.Namespace }}.svc"
-  - "{{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
+  - "{{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}.{{ include "jaeger-operator.namespace" . }}.svc"
+  - "{{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}.{{ include "jaeger-operator.namespace" . }}.svc.cluster.local"
   issuerRef:
     {{- if .Values.certs.issuer.create }}
     kind: Issuer

charts/jaeger-operator/templates/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 {{- with .Values.extraLabels }}

charts/jaeger-operator/templates/issuer.yaml

@@ -3,7 +3,7 @@ apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: {{ default "selfsigned-issuer" .Values.certs.issuer.name }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
 spec:
   selfSigned: {}
 {{- end }}

charts/jaeger-operator/templates/jaeger.yaml

@@ -3,7 +3,7 @@ apiVersion: jaegertracing.io/v1
 kind: Jaeger
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}-jaeger
-  namespace: {{ default .Release.Namespace .Values.jaeger.namespace }}
+  namespace: {{ default .Values.jaeger.namespace (include "jaeger-operator.namespace" .) }}
 {{- with .Values.jaeger.spec }}
 spec:
 {{ toYaml . | indent 2}}

charts/jaeger-operator/templates/mutating-webhook.yaml

@@ -13,7 +13,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "jaeger-operator.namespace" . }}
       path: /mutate-v1-deployment
   failurePolicy: Ignore
   name: deployment.sidecar-injector.jaegertracing.io
@@ -39,7 +39,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "jaeger-operator.namespace" . }}
       path: /mutate-jaegertracing-io-v1-jaeger
   failurePolicy: Fail
   name: mjaeger.kb.io

charts/jaeger-operator/templates/psp.yaml

@@ -3,6 +3,7 @@ apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}-operator-psp
+  namespace: {{ include "jaeger-operator.namespace" . }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 spec:

charts/jaeger-operator/templates/role-binding.yaml

@@ -3,12 +3,12 @@ kind: {{ if .Values.rbac.clusterRole }}Cluster{{ end }}RoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 subjects:
 - kind: ServiceAccount
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
   name: {{ include "jaeger-operator.serviceAccountName" . }}
 roleRef:
   kind: {{ if .Values.rbac.clusterRole }}Cluster{{ end }}Role

charts/jaeger-operator/templates/role.yaml

@@ -3,7 +3,7 @@ kind: {{ if .Values.rbac.clusterRole }}Cluster{{ end }}Role
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 rules:

charts/jaeger-operator/templates/service-account.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "jaeger-operator.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 {{- if .Values.serviceAccount.annotations }}

charts/jaeger-operator/templates/service.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}-metrics
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 {{- with .Values.serviceExtraLabels }}
@@ -33,7 +33,7 @@ metadata:
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
   name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "jaeger-operator.namespace" . }}
 {{- if .Values.webhooks.service.annotations }}
   annotations:
 {{ toYaml .Values.webhooks.service.annotations | indent 4 }}

charts/jaeger-operator/templates/validating-webhook.yaml

@@ -5,13 +5,14 @@ metadata:
   annotations:
     cert-manager.io/inject-ca-from: {{ default .Release.Namespace .Values.certs.certificate.namespace }}/{{ default "jaeger-operator-service-cert" .Values.certs.certificate.secretName }}
   name: jaeger-operator-validating-webhook-configuration
+  namespace: {{ include "jaeger-operator.namespace" . }}
 webhooks:
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
-      namespace: {{ .Release.Namespace }}
+      namespace: {{ include "jaeger-operator.namespace" . }}
       path: /validate-jaegertracing-io-v1-jaeger
   failurePolicy: Fail
   name: vjaeger.kb.io

charts/jaeger-operator/values.yaml

@@ -2,6 +2,8 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+namespaceOverride: ""
+
 image:
   repository: jaegertracing/jaeger-operator
   tag: 1.57.0

charts/jaeger/templates/_helpers.tpl

@@ -235,6 +235,17 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 
+{{/*
+Determine Namespace based on the inputs
+*/}}
+{{- define "jaeger.namespace" -}}
+{{- if .Values.namespaceOverride }}
+{{- .Values.namespaceOverride -}}
+{{- else -}}
+{{- .Release.Namespace -}}
+{{- end -}}
+{{- end -}}
+
 {{- define "cassandra.host" -}}
 {{- if .Values.provisionDataStore.cassandra -}}
 {{- if .Values.storage.cassandra.nameOverride }}

charts/jaeger/templates/agent-ds.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ template "jaeger.agent.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: agent

charts/jaeger/templates/agent-sa.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.agent.serviceAccountName" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: agent

charts/jaeger/templates/agent-svc.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "jaeger.agent.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: agent

charts/jaeger/templates/allinone-agent-svc.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "jaeger.agent.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: service-agent

charts/jaeger/templates/allinone-collector-svc.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "jaeger.collector.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: service-collector

charts/jaeger/templates/allinone-configmap.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "jaeger.fullname" . }}-sampling-strategies
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: all-in-one

charts/jaeger/templates/allinone-deploy.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "jaeger.fullname" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: all-in-one

charts/jaeger/templates/allinone-ing.yaml

@@ -4,6 +4,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ template "jaeger.query.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: all-in-one

charts/jaeger/templates/allinone-sa.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.fullname" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: all-in-one

charts/jaeger/templates/cassandra-schema-job.yaml

@@ -5,6 +5,7 @@ apiVersion: batch/v1
 kind: Job
 metadata:
   name: {{ include "jaeger.fullname" . }}-cassandra-schema
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: cassandra-schema

charts/jaeger/templates/cassandra-schema-sa.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.cassandraSchema.serviceAccountName" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: cassandra-schema

charts/jaeger/templates/cassandra-secret.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "jaeger.fullname" . }}-cassandra
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
 type: Opaque

charts/jaeger/templates/collector-configmap.yaml

@@ -3,11 +3,11 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "jaeger.fullname" . }}-sampling-strategies
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
 data:
   strategies.json: |-
 {{ tpl .Values.collector.samplingConfig . | indent 4 }}
 {{- end }}
-

charts/jaeger/templates/collector-deploy.yaml

@@ -3,6 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ template "jaeger.collector.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
@@ -38,7 +39,7 @@ spec:
       securityContext:
         {{- toYaml .Values.collector.podSecurityContext | nindent 8 }}
       serviceAccountName: {{ template "jaeger.collector.serviceAccountName" . }}
-      {{- include "collector.imagePullSecrets" . | nindent 6 }} 
+      {{- include "collector.imagePullSecrets" . | nindent 6 }}
       {{- if .Values.collector.initContainers }}
       initContainers:
         {{- toYaml .Values.collector.initContainers | nindent 8 }}

charts/jaeger/templates/collector-hpa.yaml

@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.hpa.apiVersion" ( dict "context" $ )
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "jaeger.collector.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector
@@ -22,22 +23,22 @@ spec:
         target:
           averageUtilization: {{ .Values.collector.autoscaling.targetMemoryUtilizationPercentage }}
           type: Utilization
-        {{- else }}            
+        {{- else }}
         targetAverageUtilization: {{ .Values.collector.autoscaling.targetMemoryUtilizationPercentage }}
-        {{- end }} 
+        {{- end }}
   {{- end }}
     - type: Resource
       resource:
         name: cpu
-        {{- if eq "autoscaling/v2" (include "common.capabilities.hpa.apiVersion" ( dict "context" $ )) }}        
+        {{- if eq "autoscaling/v2" (include "common.capabilities.hpa.apiVersion" ( dict "context" $ )) }}
         target:
           averageUtilization: {{ .Values.collector.autoscaling.targetCPUUtilizationPercentage | default 80 }}
           type: Utilization
-        {{- else }}    
+        {{- else }}
         targetAverageUtilization: {{ .Values.collector.autoscaling.targetCPUUtilizationPercentage | default 80 }}
         {{- end }}
   {{- with .Values.collector.autoscaling.behavior }}
   behavior:
     {{- toYaml . | nindent 4 }}
-  {{- end }}        
+  {{- end }}
 {{- end }}

charts/jaeger/templates/collector-ing.yaml

@@ -6,6 +6,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" $ }}
 kind: Ingress
 metadata:
   name: {{ template "jaeger.collector.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     {{- if .Values.collector.ingress.labels }}

charts/jaeger/templates/collector-sa.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ template "jaeger.collector.serviceAccountName" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector

charts/jaeger/templates/collector-servicemonitor.yaml

@@ -5,6 +5,8 @@ metadata:
   name: {{ template "jaeger.collector.name" . }}
   {{- if .Values.collector.serviceMonitor.namespace }}
   namespace: {{ .Values.collector.serviceMonitor.namespace }}
+  {{- else }}
+  namespace: {{ include "jaeger.namespace" . }}
   {{- end }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
@@ -36,7 +38,7 @@ spec:
       {{- end }}
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace }}
+      - {{ include "jaeger.namespace" . }}
   selector:
     matchLabels:
       app.kubernetes.io/component: collector

charts/jaeger/templates/collector-svc.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "jaeger.collector.name" . }}
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: collector

charts/jaeger/templates/elasticsearch-secret.yaml

@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "jaeger.fullname" . }}-elasticsearch
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
   annotations:

charts/jaeger/templates/es-index-cleaner-cronjob.yaml

@@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.cronjob.apiVersion" $ }}
 kind: CronJob
 metadata:
   name: {{ include "jaeger.fullname" . }}-es-index-cleaner
+  namespace: {{ include "jaeger.namespace" . }}
   labels:
     {{- include "jaeger.labels" . | nindent 4 }}
     app.kubernetes.io/component: es-index-cleaner