From 86eb21b29fde9b1ad534e2b988039b607c820db7 Mon Sep 17 00:00:00 2001 From: Adam H Griffith Date: Thu, 15 Feb 2024 11:40:08 -0700 Subject: [PATCH 1/2] opentelemetry chart changes opentelemetry.io/* API objects only defined if opentelemetryCollector variable specified. --- resources/chart/templates/opentelemetry.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chart/templates/opentelemetry.yml b/resources/chart/templates/opentelemetry.yml index ef7b41d..c2c9726 100644 --- a/resources/chart/templates/opentelemetry.yml +++ b/resources/chart/templates/opentelemetry.yml @@ -1,5 +1,5 @@ -{{- if ne .Release.Namespace "local"}} +{{- if and (ne .Release.Namespace "local") .Values.opentelemetryCollector }} --- From 3be86bcfc0a13b0ba6b75dc2d861ad3a75dceb7d Mon Sep 17 00:00:00 2001 From: Adam H Griffith Date: Thu, 15 Feb 2024 11:40:42 -0700 Subject: [PATCH 2/2] Chart variable opentelemetryCollector var now '' for all envs. --- resources/chart/vars/local/values.yml | 4 ---- resources/chart/vars/values.yml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/chart/vars/local/values.yml b/resources/chart/vars/local/values.yml index 89e37b2..142ae12 100644 --- a/resources/chart/vars/local/values.yml +++ b/resources/chart/vars/local/values.yml @@ -14,7 +14,3 @@ portalDebug: 'True' portalEndpoint: 'portal.minikube.test:30008' # portalReplicaCount is the replica count for the Portal deployment portalReplicaCount: 1 - -# opentelemetryLocalEndpoint gives the uri for the local opentelemetry collector -# in the same namespace -opentelemetryCollector: "" diff --git a/resources/chart/vars/values.yml b/resources/chart/vars/values.yml index b371bb0..7281efc 100644 --- a/resources/chart/vars/values.yml +++ b/resources/chart/vars/values.yml @@ -20,4 +20,4 @@ globusRedirectURIScheme: 'https' portalPort: '5050' # opentelemetryCollector gives the uri for the opentelemetry collector -opentelemetryCollector: "https://otel-collector.telemetry.slateci.io:443" +opentelemetryCollector: ''