From 78a2d4e78f75c6cc3aa153d270f1e0a72c9a3d27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98ystein=20Thuen?=
 <44778126+OysteinThuen@users.noreply.github.com>
Date: Wed, 11 Dec 2024 12:21:08 +0100
Subject: [PATCH] Add env var OTEL_EXPORTER_OTLP_ENDPOINT (#71)

* Add env var OTEL_EXPORTER_OTLP_ENDPOINT

* ELVIA_ENVIRONMENT
---
 elvia-deployment/Chart.yaml                  |  2 +-
 elvia-deployment/templates/deployment.yaml   |  6 ++++++
 elvia-statefulset/Chart.yaml                 |  2 +-
 elvia-statefulset/templates/statefulset.yaml |  8 +++++++-
 iss-deployment/Chart.yaml                    |  2 +-
 iss-deployment/templates/deployment.yaml     | 12 +++++++++++-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/elvia-deployment/Chart.yaml b/elvia-deployment/Chart.yaml
index c392179..de691b4 100644
--- a/elvia-deployment/Chart.yaml
+++ b/elvia-deployment/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.23.3
+version: 0.23.4
 
 # 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/elvia-deployment/templates/deployment.yaml b/elvia-deployment/templates/deployment.yaml
index 09fd678..f10ebc7 100644
--- a/elvia-deployment/templates/deployment.yaml
+++ b/elvia-deployment/templates/deployment.yaml
@@ -244,6 +244,12 @@ spec:
           value: {{ required "Missing .Values.namespace" $.Values.namespace }}
         - name: ELVIA_APPLICATION_NAME
           value: {{ required "Missing .Values.name" $.Values.name }}
+        - name: ELVIA_ENVIRONMENT
+          value: {{ required "Missing .Values.environment" .Values.environment }}
+        - name: OTEL_EXPORTER_OTLP_PROTOCOL
+          value: grpc
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: http://otel-collector.monitoring.svc.cluster.local:4317
         {{- with $.Values.env }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/elvia-statefulset/Chart.yaml b/elvia-statefulset/Chart.yaml
index cbc3d97..52e8c11 100644
--- a/elvia-statefulset/Chart.yaml
+++ b/elvia-statefulset/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.9.3
+version: 0.9.4
 
 # 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/elvia-statefulset/templates/statefulset.yaml b/elvia-statefulset/templates/statefulset.yaml
index 79cc11e..c8bf3b9 100644
--- a/elvia-statefulset/templates/statefulset.yaml
+++ b/elvia-statefulset/templates/statefulset.yaml
@@ -67,7 +67,13 @@ spec:
         - name: ELVIA_APPLICATION_NAMESPACE
           value: {{ required "Missing .Values.namespace" .Values.namespace }}
         - name: ELVIA_APPLICATION_NAME
-          value: {{ required "Missing .Values.namespace" .Values.name }}
+          value: {{ required "Missing .Values.name" .Values.name }}
+        - name: ELVIA_ENVIRONMENT
+          value: {{ required "Missing .Values.environment" .Values.environment }}
+        - name: OTEL_EXPORTER_OTLP_PROTOCOL
+          value: grpc
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: http://otel-collector.monitoring.svc.cluster.local:4317
         {{- with .Values.env }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
diff --git a/iss-deployment/Chart.yaml b/iss-deployment/Chart.yaml
index 38eb232..b2980ce 100644
--- a/iss-deployment/Chart.yaml
+++ b/iss-deployment/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.4.2
+version: 0.4.3
 
 # 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/iss-deployment/templates/deployment.yaml b/iss-deployment/templates/deployment.yaml
index 414606e..480e075 100644
--- a/iss-deployment/templates/deployment.yaml
+++ b/iss-deployment/templates/deployment.yaml
@@ -76,8 +76,18 @@ spec:
             name: {{ required "Missing $envFromValue.name" $envFromValue.name }}
         {{- end }}
         {{- end }}
-        {{- with .Values.env }}
         env:
+        - name: ELVIA_APPLICATION_NAMESPACE
+          value: {{ required "Missing .Values.namespace" .Values.namespace }}
+        - name: ELVIA_APPLICATION_NAME
+          value: {{ required "Missing .Values.name" .Values.name }}
+        - name: ELVIA_ENVIRONMENT
+          value: {{ required "Missing .Values.environment" .Values.environment }}
+        - name: OTEL_EXPORTER_OTLP_PROTOCOL
+          value: grpc
+        - name: OTEL_EXPORTER_OTLP_ENDPOINT
+          value: http://otel-collector.monitoring.svc.cluster.local:4317
+        {{- with .Values.env }}
           {{- toYaml . | nindent 8 }}
         {{- end }}
         image: {{ include "image" . }}