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

Add option to skip ConfigMap check #1208

Merged
merged 1 commit into from
Sep 30, 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
1 change: 1 addition & 0 deletions charts/beyla/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ eBPF-based autoinstrumentation HTTP, HTTP2 and gRPC services, as well as network
| config.create | bool | `true` | set to true, to use the below default configurations |
| config.data | object | `{"attributes":{"kubernetes":{"enable":true},"select":{"beyla_network_flow_bytes":{"include":["k8s.src.owner.type","k8s.dst.owner.type","direction"]}}},"filter":{"application":{"client":{"not_match":"{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}"},"server":{"not_match":"{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}"}},"network":{"k8s_dst_owner_name":{"not_match":"{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}"},"k8s_src_owner_name":{"not_match":"{kube*,*jaeger-agent*,*prometheus*,*promtail*,*grafana-agent*}"}}},"prometheus_export":{"path":"/metrics","port":9090}}` | default value of beyla configuration |
| config.name | string | `""` | |
| config.skipConfigMapCheck | bool | `false` | set to true, to skip the check around the ConfigMap creation |
| dnsPolicy | string | `"ClusterFirstWithHostNet"` | Determines how DNS resolution is handled for that pod. If `.Values.preset` is set to `network` or `.Values.config.data.network` is enabled, Beyla requires `hostNetwork` access, causing cluster service DNS resolution to fail. It is recommended not to change this if Beyla sends traces and metrics to Grafana components via k8s service. |
| env | object | `{}` | extra environment variables |
| envValueFrom | object | `{}` | extra environment variables to be set from resources such as k8s configMaps/secrets |
Expand Down
2 changes: 2 additions & 0 deletions charts/beyla/templates/configmap.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{{- if not .Values.config.skipConfigMapCheck }}
{{- if and (not .Values.config.create) (eq .Values.config.name "") }}
{{- fail "if .Values.config.name is not set, then .Values.config.create should be set to true to use default configuration" }}
{{- end }}
{{- end }}
{{- if and (.Values.config.create) (eq .Values.config.name "") }}
apiVersion: v1
kind: ConfigMap
Expand Down
2 changes: 2 additions & 0 deletions charts/beyla/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ dnsPolicy: ClusterFirstWithHostNet
## 3. enables kubernetes attribute
## Note: The default configuration is used if config.create=true and config.name=""
config:
# -- set to true, to skip the check around the ConfigMap creation
skipConfigMapCheck: false
# -- set to true, to use the below default configurations
create: true
## -- Provide the name of the external configmap containing the beyla configuration.
Expand Down
Loading