diff --git a/charts/jaeger-opentelemetry/Chart.yaml b/charts/jaeger-opentelemetry/Chart.yaml index e4358319..fd26122e 100644 --- a/charts/jaeger-opentelemetry/Chart.yaml +++ b/charts/jaeger-opentelemetry/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.0 +version: 0.2.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml index 3d2ba743..58dca58c 100644 --- a/charts/jaeger-opentelemetry/templates/ConfigMap.yaml +++ b/charts/jaeger-opentelemetry/templates/ConfigMap.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Release.Name }}-config - namespace: opentelemetry + namespace: {{ .Release.Namespace | default "opentelemetry" }} labels: {{- include "optl-label" . | nindent 3 }} data: diff --git a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml index 957e252d..4b9b8dd6 100644 --- a/charts/jaeger-opentelemetry/templates/StatefulSet.yaml +++ b/charts/jaeger-opentelemetry/templates/StatefulSet.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ .Release.Name }}-jaeger-all-in-one - namespace: opentelemetry + namespace: {{ .Release.Namespace | default "opentelemetry" }} labels: {{- include "stateful label" . | nindent 3 }} spec: diff --git a/charts/jaeger-opentelemetry/templates/deployment.yaml b/charts/jaeger-opentelemetry/templates/deployment.yaml index 60316ae7..b1d38516 100644 --- a/charts/jaeger-opentelemetry/templates/deployment.yaml +++ b/charts/jaeger-opentelemetry/templates/deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Release.Name }}-optl-deployment - namespace: opentelemetry + namespace: {{ .Release.Namespace | default "opentelemetry" }} labels: {{- include "deployment-optl label" . | nindent 3 }} spec: @@ -14,7 +14,7 @@ spec: template: metadata: name: {{ .Release.Name }}-optl - namespace: opentelemetry + namespace: {{ .Release.Namespace | default "opentelemetry" }}} labels: {{- include "deployment-optl label" . | nindent 7 }} spec: diff --git a/charts/jaeger-opentelemetry/templates/ingress.yaml b/charts/jaeger-opentelemetry/templates/ingress.yaml index a297f934..633081dd 100644 --- a/charts/jaeger-opentelemetry/templates/ingress.yaml +++ b/charts/jaeger-opentelemetry/templates/ingress.yaml @@ -23,6 +23,7 @@ metadata: annotations: {{- toYaml . | nindent 4 }} {{- end }} + namespace: {{ .Release.Namespace | default "opentelemetry" }} spec: {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} ingressClassName: {{ .Values.ingress.className }} diff --git a/charts/jaeger-opentelemetry/templates/service.yaml b/charts/jaeger-opentelemetry/templates/service.yaml index 7b8f7dc3..9b07a8c1 100644 --- a/charts/jaeger-opentelemetry/templates/service.yaml +++ b/charts/jaeger-opentelemetry/templates/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ .Release.Name }}-optl - namespace: opentelemetry + namespace: {{ .Release.Namespace | default "opentelemetry" }} labels: app: opentelemetry component: otel-collector @@ -22,8 +22,8 @@ spec: apiVersion: v1 kind: Service metadata: - name: {{ .Release.Name }}-jaeger-headless - namespace: opentelemetry + name: jaeger-headless + namespace: {{ .Release.Namespace | default "opentelemetry" }} labels: app: opentelemetry component: optl-collector @@ -43,7 +43,7 @@ apiVersion: v1 kind: Service metadata: name: {{ .Release.Name }}-jaeger-query - namespace: opentelemetry + namespace: {{ .Release.Namespace | default "opentelemetry" }} labels: app: opentelemetry component: optl-collector diff --git a/charts/jaeger-opentelemetry/values.yaml b/charts/jaeger-opentelemetry/values.yaml index 56d58780..ee939f37 100644 --- a/charts/jaeger-opentelemetry/values.yaml +++ b/charts/jaeger-opentelemetry/values.yaml @@ -131,3 +131,5 @@ ingress: #- secretName: chart-example-tls # hosts: # - chart-example.local + +namespace: "" \ No newline at end of file