From b7e46013264006585d551630377ebfbadb2b5406 Mon Sep 17 00:00:00 2001
From: Adam Lehechka <42357034+alehechka@users.noreply.github.com>
Date: Thu, 17 Aug 2023 16:43:05 -0500
Subject: [PATCH] OpenTelemetry Environment Variable from ConfigMap variable
 (#23)

* add conditional otel env variables in deployment.yaml

* add changelog and v0.7.2 bump

* remove conditional otel hostname env var

* change changelog entry
---
 charts/microservice/CHANGELOG.md              | 6 ++++++
 charts/microservice/Chart.yaml                | 2 +-
 charts/microservice/templates/deployment.yaml | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/charts/microservice/CHANGELOG.md b/charts/microservice/CHANGELOG.md
index a0ce550..7ef4cde 100644
--- a/charts/microservice/CHANGELOG.md
+++ b/charts/microservice/CHANGELOG.md
@@ -19,6 +19,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [v0.7.2] - 2023-08-16
+
+### Fixed
+
+- OpenTelemetry environment variables to reference ConfigMap variable (https://github.com/lockerstock/helm-charts/pull/23).
+
 ## [v0.7.1] - 2023-07-28
 
 ### Fixed
diff --git a/charts/microservice/Chart.yaml b/charts/microservice/Chart.yaml
index 4cf2f35..b7e43b4 100644
--- a/charts/microservice/Chart.yaml
+++ b/charts/microservice/Chart.yaml
@@ -20,7 +20,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: 'v0.7.1'
+version: 'v0.7.2'
 
 # 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/microservice/templates/deployment.yaml b/charts/microservice/templates/deployment.yaml
index f089895..61b8afa 100644
--- a/charts/microservice/templates/deployment.yaml
+++ b/charts/microservice/templates/deployment.yaml
@@ -77,7 +77,10 @@ spec:
 
             {{- if .Values.deployment.opentelemetry.enabled }}
             - name: OTEL_EXPORTER_OTLP_ENDPOINT
-              value: k8s-app-opentelemetry:4317
+              valueFrom:
+                configMapKeyRef:
+                  name: otel-collector-routing
+                  key: grpcAddress
             {{- end }}
 
             {{- if .Values.deployment.cache.enabled }}