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.

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

Support external tracing deployment #86

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions charts/athens-proxy/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ This will deploy a single Athens instance in the `athens` namespace with `disk`
| strategy.rollingUpdate.maxUnavailable | int | `1` | |
| strategy.type | string | `"Recreate"` | Using RollingUpdate requires a shared storage |
| tolerations | list | `[]` | see https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#scheduling |
| tracing.enabled | bool | `false` | Set ATHENS_TRACE_EXPORTER* environment variables to point to a tracing deployment. |
| tracing.type | string | `"jaeger"` | Value of ATHENS_TRACE_EXPORTER, supported values are "jaeger", "datadog", and "stackdriver". |
| tracing.url | string | `""` | Value of ATHENS_TRACE_EXPORTER_URL |
| upstreamProxy.enabled | bool | `false` | This is where you can set the URL for the upstream module repository. If 'enabled' is set to true, Athens will try to download modules from the upstream when it doesn't find them in its own storage. Here's a non-exhaustive list of options you can set here: - https://gocenter.io - https://proxy.golang.org |
| upstreamProxy.url | string | `"https://gocenter.io"` | |

Expand Down
6 changes: 6 additions & 0 deletions charts/athens-proxy/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,12 @@ spec:
- name: ATHENS_TRACE_EXPORTER
value: "jaeger"
{{- end }}
{{- if and .Values.tracing.enabled (not .Values.jaeger.enabled) }}
- name: ATHENS_TRACE_EXPORTER_URL
value: {{ .Values.tracing.url }}
- name: ATHENS_TRACE_EXPORTER
value: {{ .Values.tracing.type }}
{{- end }}
{{- if .Values.basicAuth.enabled }}
- name: BASIC_AUTH_USER
valueFrom:
Expand Down
8 changes: 8 additions & 0 deletions charts/athens-proxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,14 @@ jaeger:
# With default settings, it uses the jaeger-collector-http port of the jaeger service.
url: ""

tracing:
# -- Set ATHENS_TRACE_EXPORTER* environment variables to point to a tracing deployment.
enabled: false
# -- Value of ATHENS_TRACE_EXPORTER_URL
url: ""
# -- Value of ATHENS_TRACE_EXPORTER, supported values are "jaeger", "datadog", and "stackdriver".
type: "jaeger"

# -- Configuration for private git servers that will provide ssh and git config to athens in a ConfigMap
sshGitServers: []
## Private git servers over ssh
Expand Down