Merge pull request #308 from alanjino/main

helm chart changes with evn variables of OTEL
intelops · Jan 19, 2024 · 3609c66 · 3609c66
2 parents b94c692 + 9581513
commit 3609c66
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 2 deletions.
diff --git a/charts/agent/Chart.yaml b/charts/agent/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: 1.1.10
+version: 1.1.11
 
 # 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/agent/templates/deployment.yaml b/charts/agent/templates/deployment.yaml
@@ -75,6 +75,12 @@ spec:
             value: "{{ .Values.schedule.kubepreupgradeInterval }}"
           - name: TRIVY_INTERVAL
             value: "{{ .Values.schedule.trivyInterval }}"
+          - name: IS_OPTEL_ENABLED
+            value: "{{ .Values.opentelemetry.isEnabled }}"
+          - name : OPTEL_URL
+            value: {{ .Values.opentelemetry.url }}
+          - name : APPLICATION_NAME
+            value : {{ .Values.opentelemetry.appName }}
           {{- if .Values.persistence.enabled }}  
           volumeMounts:
           - name: data
@@ -115,6 +121,12 @@ spec:
             {{- end }}
           - name: NATS_ADDRESS
             value: {{ .Values.nats.host }}
+          - name: IS_OPTEL_ENABLED
+            value: "{{ .Values.opentelemetry.isEnabled }}"
+          - name : OPTEL_URL
+            value: {{ .Values.opentelemetry.url }}
+          - name : APPLICATION_NAME
+            value : {{ .Values.opentelemetry.appName }}
           {{- if .Values.git_bridge.persistence.enabled }}  
           volumeMounts:
           - name: data
@@ -156,6 +168,12 @@ spec:
             {{- end }}
           - name: NATS_ADDRESS
             value: {{ .Values.nats.host }}
+          - name: IS_OPTEL_ENABLED
+            value: "{{ .Values.opentelemetry.isEnabled }}"
+          - name : OPTEL_URL
+            value: {{ .Values.opentelemetry.url }}
+          - name : APPLICATION_NAME
+            value : {{ .Values.opentelemetry.appName }}
           {{- if .Values.container_bridge.persistence.enabled }}  
           volumeMounts:
           - name: data

diff --git a/charts/agent/values.yaml b/charts/agent/values.yaml
@@ -44,6 +44,8 @@ service:
   type: ClusterIP
   port: 80
 
+
+
 git_bridge:
   enabled: false
   image:
@@ -87,6 +89,7 @@ git_bridge:
 
 
 
+
 container_bridge:
   enabled: false
   image:
@@ -128,6 +131,7 @@ container_bridge:
     #    hosts:
     #      - chart-example.local
 
+
 ingress:
   enabled: false
   annotations: {}
@@ -182,6 +186,11 @@ schedule:
   kubepreupgradeInterval: "@every 22h"
   trivyInterval: "@every 24h"
 
+opentelemetry:
+  isEnabled: false
+  url: "otelcollector.local"
+  appName: "kubviz"
+
 clusterName: "kubviz"
 nats:
   host: kubviz-client-nats 

diff --git a/charts/client/Chart.yaml b/charts/client/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: 1.1.15
+version: 1.1.16
 
 # 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/client/templates/deployment.yaml b/charts/client/templates/deployment.yaml
@@ -139,6 +139,12 @@ spec:
             value: "{{ .Values.ttl.ttlInterval }}"
           - name: TTL_UNIT
             value: {{ .Values.ttl.ttlUnit }}
+          - name: IS_OPTEL_ENABLED
+            value: "{{ .Values.opentelemetry.isEnabled }}"
+          - name : OPTEL_URL
+            value: {{ .Values.opentelemetry.url }}
+          - name : APPLICATION_NAME
+            value : {{ .Values.opentelemetry.appName }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/client/values.yaml b/charts/client/values.yaml
@@ -168,3 +168,9 @@ migration:
 ttl:
   ttlInterval: "1"
   ttlUnit: MONTH
+
+opentelemetry:
+  isEnabled: false
+  url: "otelcollector.local"
+  appName: "kubviz"
+