Skip to content

chore: Update envVar configuration to support custom envs #4272

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

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion operations/pyroscope/helm/pyroscope/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: pyroscope
description: 🔥 horizontally-scalable, highly-available, multi-tenant continuous profiling aggregation system
home: https://grafana.com/oss/pyroscope/
type: application
version: 1.14.1
version: 1.14.1-1
appVersion: 1.14.0
dependencies:
- name: grafana-agent
Expand Down
2 changes: 2 additions & 0 deletions operations/pyroscope/helm/pyroscope/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@
| pyroscope.components | object | `{}` | |
| pyroscope.config | string | The config depends on other values been set, details can be found in [`values.yaml`](./values.yaml) | Contains Pyroscope's configuration as a string. |
| pyroscope.dnsPolicy | string | `"ClusterFirst"` | |
| pyroscope.disableSelfProfile | bool | `true` | |
| pyroscope.extraArgs."log.level" | string | `"debug"` | |
| pyroscope.extraEnvFrom | list | `[]` | Environment variables from secrets or configmaps to add to the pods |
| pyroscope.extraEnvVars | object | `{}` | |
| pyroscope.extraCustomEnvVars | object | `{}` | Additional custom environment variables to add to the Pyroscope pods |
| pyroscope.extraLabels | object | `{}` | |
| pyroscope.extraVolumeMounts | list | `[]` | |
| pyroscope.extraVolumes | list | `[]` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ spec:
imagePullPolicy: {{ $values.image.pullPolicy }}
args:
- "-target={{ $component }}"
- "-self-profiling.disable-push=true"
- "-self-profiling.disable-push={{ .Values.pyroscope.disableSelfProfile }}"
- "-server.http-listen-port={{ $values.service.port }}"
- "-memberlist.cluster-label={{ .Release.Namespace }}-{{ include "pyroscope.fullname" .}}"
- "-memberlist.join=dns+{{ include "pyroscope.fullname" .}}-memberlist.{{ .Release.Namespace }}.svc{{ .Values.pyroscope.cluster_domain }}:{{ .Values.pyroscope.memberlist.port }}"
Expand All @@ -95,6 +95,9 @@ spec:
{{- end }}
{{- end }}
{{- end }}
{{- with $values.extraCustomEnvVars }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with $values.extraEnvFrom }}
envFrom:
{{- toYaml . | nindent 12 }}
Expand Down
10 changes: 10 additions & 0 deletions operations/pyroscope/helm/pyroscope/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
pyroscope:
replicaCount: 1

# -- Enable or disable Self profile push, useful to test
disableSelfProfile: true

# -- Kubernetes cluster domain suffix for DNS discovery
cluster_domain: .cluster.local.

Expand All @@ -25,6 +28,13 @@ pyroscope:
# The following environment variables are set by the Helm chart.
# JAEGER_AGENT_HOST: jaeger-agent.jaeger.svc.cluster.local.

extraCustomEnvVars: {}
# The following environment variables raw form.
# - name: MY_NODE_NAME
# valueFrom:
# fieldRef:
# fieldPath: spec.nodeName

# -- Environment variables from secrets or configmaps to add to the pods
extraEnvFrom: []

Expand Down