revert changes on jaeger-operator

Signed-off-by: Reza J. Bavaghoush <rzjfr@yahoo.com>
jaegertracing · Oct 8, 2024 · e2f628d · e2f628d
1 parent d911f65
commit e2f628d
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 31 deletions.
diff --git a/charts/jaeger-operator/templates/_helpers.tpl b/charts/jaeger-operator/templates/_helpers.tpl
@@ -47,14 +47,3 @@ 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 -}}
diff --git a/charts/jaeger-operator/templates/certificate.yaml b/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: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   dnsNames:
-  - "{{ 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"
+  - "{{ 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"
   issuerRef:
     {{- if .Values.certs.issuer.create }}
     kind: Issuer

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

diff --git a/charts/jaeger-operator/templates/issuer.yaml b/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: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   selfSigned: {}
 {{- end }}
diff --git a/charts/jaeger-operator/templates/jaeger.yaml b/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 .Values.jaeger.namespace (include "jaeger-operator.namespace" .) }}
+  namespace: {{ default .Release.Namespace .Values.jaeger.namespace }}
 {{- with .Values.jaeger.spec }}
 spec:
 {{ toYaml . | indent 2}}

diff --git a/charts/jaeger-operator/templates/mutating-webhook.yaml b/charts/jaeger-operator/templates/mutating-webhook.yaml
@@ -7,14 +7,13 @@ metadata:
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
   name: jaeger-operator-mutating-webhook-configuration
-  namespace: {{ include "jaeger-operator.namespace" . }}
 webhooks:
 - admissionReviewVersions:
   - v1
   clientConfig:
     service:
       name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
-      namespace: {{ include "jaeger-operator.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /mutate-v1-deployment
   failurePolicy: Ignore
   name: deployment.sidecar-injector.jaegertracing.io
@@ -40,7 +39,7 @@ webhooks:
   clientConfig:
     service:
       name: {{ default "jaeger-operator-webhook-service" .Values.webhooks.service.name }}
-      namespace: {{ include "jaeger-operator.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /mutate-jaegertracing-io-v1-jaeger
   failurePolicy: Fail
   name: mjaeger.kb.io

diff --git a/charts/jaeger-operator/templates/psp.yaml b/charts/jaeger-operator/templates/psp.yaml
@@ -3,7 +3,6 @@ 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:

diff --git a/charts/jaeger-operator/templates/role-binding.yaml b/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: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 subjects:
 - kind: ServiceAccount
-  namespace: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   name: {{ include "jaeger-operator.serviceAccountName" . }}
 roleRef:
   kind: {{ if .Values.rbac.clusterRole }}Cluster{{ end }}Role

diff --git a/charts/jaeger-operator/templates/role.yaml b/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: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 rules:

diff --git a/charts/jaeger-operator/templates/service-account.yaml b/charts/jaeger-operator/templates/service-account.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "jaeger-operator.serviceAccountName" . }}
-  namespace: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
   labels:
 {{ include "jaeger-operator.labels" . | indent 4 }}
 {{- if .Values.serviceAccount.annotations }}

diff --git a/charts/jaeger-operator/templates/service.yaml b/charts/jaeger-operator/templates/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "jaeger-operator.fullname" . }}-metrics
-  namespace: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.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: {{ include "jaeger-operator.namespace" . }}
+  namespace: {{ .Release.Namespace }}
 {{- if .Values.webhooks.service.annotations }}
   annotations:
 {{ toYaml .Values.webhooks.service.annotations | indent 4 }}

diff --git a/charts/jaeger-operator/templates/validating-webhook.yaml b/charts/jaeger-operator/templates/validating-webhook.yaml
@@ -5,14 +5,13 @@ 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: {{ include "jaeger-operator.namespace" . }}
+      namespace: {{ .Release.Namespace }}
       path: /validate-jaegertracing-io-v1-jaeger
   failurePolicy: Fail
   name: vjaeger.kb.io

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