[FIX] permitting jaeger host selection using variables (#11)

* [FIX] permitting select jaeger host using variables
orb-community · Mar 18, 2022 · 1bf6dda · 1bf6dda
1 parent 70f3462
commit 1bf6dda
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 17 deletions.
diff --git a/charts/orb/Chart.yaml b/charts/orb/Chart.yaml
@@ -10,7 +10,7 @@ name: orb
 description: Orb Observability Platform
 icon: https://avatars1.githubusercontent.com/u/13207490
 type: application
-version: 1.0.11
+version: 1.0.12
 appVersion: "0.9.0"
 home: https://getorb.io
 sources:

diff --git a/charts/orb/templates/adapter_mqtt-statefulstet.yaml b/charts/orb/templates/adapter_mqtt-statefulstet.yaml
@@ -183,8 +183,11 @@ spec:
               value:
                 {{ .Release.Name }}-envoy:{{ .Values.things.authGrpcPort }}
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: MF_MQTT_ADAPTER_MQTT_TARGET_HOST
               value: localhost
             - name: MF_MQTT_ADAPTER_MQTT_TARGET_PORT

diff --git a/charts/orb/templates/auth-deployment.yaml b/charts/orb/templates/auth-deployment.yaml
@@ -24,8 +24,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: MF_AUTH_DB
               value: {{ index .Values "postgresql-auth" "postgresqlDatabase" }}
             - name: MF_AUTH_DB_HOST

diff --git a/charts/orb/templates/fleet-deployment.yaml b/charts/orb/templates/fleet-deployment.yaml
@@ -25,8 +25,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: ORB_FLEET_DB
               value: {{ index .Values "postgresql-fleet" "postgresqlDatabase" }}
             - name: ORB_FLEET_DB_HOST

diff --git a/charts/orb/templates/policies-deployment.yaml b/charts/orb/templates/policies-deployment.yaml
@@ -25,8 +25,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: ORB_POLICIES_DB
               value: {{ index .Values "postgresql-policies" "postgresqlDatabase" }}
             - name: ORB_POLICIES_DB_HOST

diff --git a/charts/orb/templates/sinker-deployment.yaml b/charts/orb/templates/sinker-deployment.yaml
@@ -25,8 +25,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: ORB_SINKER_ES_URL
               value:
                 {{ .Release.Name }}-redis-streams-master:{{ .Values.sinker.redisESPort }}

diff --git a/charts/orb/templates/sinks-deployment.yaml b/charts/orb/templates/sinks-deployment.yaml
@@ -25,8 +25,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: ORB_SINKS_DB
               value: {{ index .Values "postgresql-sinks" "postgresqlDatabase" }}
             - name: ORB_SINKS_DB_HOST

diff --git a/charts/orb/templates/things-deployment.yaml b/charts/orb/templates/things-deployment.yaml
@@ -24,8 +24,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: MF_THINGS_AUTH_GRPC_PORT
               value: "{{ .Values.things.authGrpcPort }}"
             - name: MF_THINGS_AUTH_HTTP_PORT

diff --git a/charts/orb/templates/users-deployment.yaml b/charts/orb/templates/users-deployment.yaml
@@ -30,8 +30,11 @@ spec:
       containers:
         - env:
             - name: MF_JAEGER_URL
-              value:
-                {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ if not .Values.defaults.jaegerHost }}
+              value: {{ .Release.Name }}-jaeger-operator-jaeger-agent:{{ .Values.defaults.jaegerPort }}
+            {{ else }}
+              value: {{ .Values.defaults.jaegerHost }}:{{ .Values.defaults.jaegerPort }}
+            {{ end }}
             - name: MF_USERS_DB
               value: {{ index .Values "postgresql-users"  "postgresqlDatabase" }}
             - name: MF_USERS_DB_HOST

diff --git a/charts/orb/values.yaml b/charts/orb/values.yaml
@@ -18,6 +18,7 @@ defaults:
   replicaCount: 3
   natsPort: 4222
   jaegerPort: 6831
+  jaegerHost: ""
 
 smtp:
   port: 25