Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix(tracing): Add missing default env variables to services #55

Merged
merged 1 commit into from
Jul 11, 2023
+0 −10
Merged

🐛 fix(tracing): Add missing default env variables to services #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions chart/templates/ad-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ spec:
value: {{ quote .Values.adService.deployment.container.env.USER_AUTH_SERVICE_ADDRESS }}
- name: JAEGER_SERVICE_NAME
value: {{quote (printf "unguard-%s" .Values.adService.name) }}
{{if .Values.tracing.enabled}}
MfCrizz marked this conversation as resolved.
Show resolved Hide resolved
- name: JAEGER_AGENT_HOST
value: {{ quote (printf "%s-%s" .Values.jaeger.name .Values.adService.deployment.container.env.JAEGER_AGENT_HOST) }}
- name: JAEGER_SAMPLER_TYPE
Expand All @@ -75,4 +74,3 @@ spec:
value: {{ quote .Values.adService.deployment.container.env.JAEGER_SAMPLER_PARAM }}
- name: JAEGER_DISABLED
value: {{ quote .Values.adService.deployment.container.env.JAEGER_DISABLED }}
{{end}}
2 changes: 0 additions & 2 deletions chart/templates/frontend.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ spec:
value: {{ quote .Values.frontend.deployment.container.env.MEMBERSHIP_SERVICE_BASE_PATH }}
- name: STATUS_SERVICE_BASE_PATH
value: {{ quote .Values.frontend.deployment.container.env.STATUS_SERVICE_BASE_PATH }}
{{if .Values.tracing.enabled}}
- name: JAEGER_SERVICE_NAME
value: {{quote (printf "unguard-%s" .Values.frontend.name) }}
- name: JAEGER_AGENT_HOST
Expand All @@ -90,4 +89,3 @@ spec:
value: {{ quote .Values.frontend.deployment.container.env.JAEGER_SAMPLER_PARAM }}
- name: JAEGER_DISABLED
value: {{ quote .Values.frontend.deployment.container.env.JAEGER_DISABLED }}
{{end}}
MfCrizz marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 0 additions & 2 deletions chart/templates/microblog-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ spec:
value: {{ quote .Values.microblogService.deployment.container.env.REDIS_SERVICE_ADDRESS }}
- name: USER_AUTH_SERVICE_ADDRESS
value: {{ quote .Values.microblogService.deployment.container.env.USER_AUTH_SERVICE_ADDRESS }}
{{if .Values.tracing.enabled}}
MfCrizz marked this conversation as resolved.
Show resolved Hide resolved
- name: OPENTRACING_JAEGER_ENABLED
value: {{ quote .Values.microblogService.deployment.container.env.OPENTRACING_JAEGER_ENABLED }}
- name: JAEGER_SERVICE_NAME
Expand All @@ -74,4 +73,3 @@ spec:
value: {{ quote .Values.microblogService.deployment.container.env.JAEGER_SAMPLER_TYPE }}
- name: JAEGER_SAMPLER_PARAM
value: {{ quote .Values.microblogService.deployment.container.env.JAEGER_SAMPLER_PARAM }}
{{end}}
2 changes: 0 additions & 2 deletions chart/templates/proxy-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ spec:
env:
- name: SERVER_PORT
value: {{ quote .Values.proxyService.deployment.container.env.SERVER_PORT }}
{{if .Values.tracing.enabled}}
- name: OPENTRACING_JAEGER_ENABLED
value: {{ quote .Values.proxyService.deployment.container.env.OPENTRACING_JAEGER_ENABLED }}
- name: JAEGER_SERVICE_NAME
Expand All @@ -103,4 +102,3 @@ spec:
value: {{ quote .Values.proxyService.deployment.container.env.JAEGER_SAMPLER_TYPE }}
- name: JAEGER_SAMPLER_PARAM
value: {{ quote .Values.proxyService.deployment.container.env.JAEGER_SAMPLER_PARAM }}
{{end}}
2 changes: 0 additions & 2 deletions chart/templates/user-auth-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ spec:
key: {{ tpl .Values.userAuthService.deployment.container.env.MARIADB_PASSWORD.secretKeyRef.key . }}
- name: JAEGER_SERVICE_NAME
value: {{quote (printf "unguard-%s" .Values.userAuthService.name) }}
{{if .Values.tracing.enabled}}
- name: JAEGER_AGENT_HOST
value: {{quote (printf "%s-%s" .Values.jaeger.name .Values.userAuthService.deployment.container.env.JAEGER_AGENT_HOST) }}
- name: JAEGER_SAMPLER_TYPE
Expand All @@ -77,4 +76,3 @@ spec:
value: {{ quote .Values.userAuthService.deployment.container.env.JAEGER_SAMPLER_PARAM }}
- name: JAEGER_DISABLED
value: {{ quote .Values.userAuthService.deployment.container.env.JAEGER_DISABLED }}
{{end}}