From 69d85ba2898a528aeb6c8d0283426de440957be8 Mon Sep 17 00:00:00 2001 From: krisztianfekete Date: Wed, 23 Aug 2023 09:06:12 +0200 Subject: [PATCH] switch to namespaceOverride, bump chart version --- .../opentelemetry-collector/templates/_helpers.tpl | 12 ++++++------ charts/opentelemetry-collector/values.schema.json | 2 +- charts/opentelemetry-collector/values.yaml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl index b48b1eb05..04a19f102 100644 --- a/charts/opentelemetry-collector/templates/_helpers.tpl +++ b/charts/opentelemetry-collector/templates/_helpers.tpl @@ -159,12 +159,12 @@ Compute InternalTrafficPolicy on Service creation {{- end -}} {{/* -Specify namespace +Allow the release namespace to be overridden */}} {{- define "opentelemetry-collector.namespace" -}} -{{- if .Values.namespace -}} -{{- .Values.namespace -}} -{{- else -}} -{{- .Release.Namespace -}} -{{- end -}} + {{- if .Values.namespaceOverride -}} + {{- .Values.namespaceOverride -}} + {{- else -}} + {{- .Release.Namespace -}} + {{- end -}} {{- end -}} diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json index a2dd939e1..a169dd0a2 100644 --- a/charts/opentelemetry-collector/values.schema.json +++ b/charts/opentelemetry-collector/values.schema.json @@ -35,7 +35,7 @@ "type": "string", "enum": ["daemonset", "deployment", "statefulset", ""] }, - "namespace": { + "namespaceOverride": { "type": "string", "description": "Name of the namespace to deploy the resources into." }, diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index dc193d26b..b9583a82e 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -9,7 +9,7 @@ fullnameOverride: "" mode: "" # Specify which namespace should be used to deploy the resources into -namespace: "" +namespaceOverride: "" # Handles basic configuration of components that # also require k8s modifications to work correctly.