Skip to content
Draft
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
61 changes: 61 additions & 0 deletions helmfile.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ repositories:
url: https://istio-release.storage.googleapis.com/charts
- name: bitnami
url: https://charts.bitnami.com/bitnami
- name: open-telemetry
url: https://open-telemetry.github.io/opentelemetry-helm-charts
- name: cilium
url: https://helm.cilium.io/
- name: cloudfoundry-k8s
Expand Down Expand Up @@ -167,6 +169,65 @@ releases:
- syslogAgent:
certificateSecret: all-in-one-tls

- name: otel-collector
namespace: {{ .Values.systemNamespace }}
chart: open-telemetry/opentelemetry-collector
version: {{ .Values.charts.otelCollector.version }}
installed: {{ .Values.installOtelCollector }}
needs:
- {{ .Values.systemNamespace }}/base
values:
- mode: deployment
image:
repository: ghcr.io/cloudfoundry/k8s/otel-collector
tag: {{ .Values.charts.otelCollector.imageTag | quote }}
Comment on lines +181 to +183

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we must simply re-use the OS image, no additional configuration is required

command:
name: ""
ports:
jaeger-compact:
enabled: false
jaeger-thrift:
enabled: false
jaeger-grpc:
enabled: false
zipkin:
enabled: false
alternateConfig:
receivers:
otlp:
protocols:
grpc:
endpoint: 0.0.0.0:4317
http:
endpoint: 0.0.0.0:4318
processors:
batch: {}
memory_limiter:
check_interval: 5s
limit_percentage: 80
spike_limit_percentage: 25
extensions:
health_check:
endpoint: ${env:MY_POD_IP}:13133
exporters:
debug:
verbosity: detailed
service:
extensions: [health_check]
pipelines:
metrics:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [debug]
logs:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [debug]
traces:
receivers: [otlp]
processors: [memory_limiter, batch]
exporters: [debug]

- name: gorouter
namespace: {{ .Values.systemNamespace }}
chart: {{ .Values.charts.routing.url }}
Expand Down
1 change: 1 addition & 0 deletions values.yaml.gotmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ systemNamespace: "cf-system"
workloadsNamespace: "cf-workloads"

installOptionalComponents: {{ "INSTALL_OPTIONAL_COMPONENTS" | env | default "true" }}
installOtelCollector: {{ "INSTALL_OTEL_COLLECTOR" | env | default "false" }}
secrets:
dbPassword: {{ requiredEnv "DB_PASSWORD" }}
blobstorePassword: {{ requiredEnv "BLOBSTORE_PASSWORD" }}
Expand Down
5 changes: 5 additions & 0 deletions versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ charts:
nfsVolume:
url: cloudfoundry-k8s/nfs-volume
version: 7.69.0
otelCollector:
# renovate: dataSource=helm depName=opentelemetry-collector packageName=open-telemetry/opentelemetry-collector
version: 0.172.0
# renovate: dataSource=github-releases depName=cloudfoundry/otel-collector-release
imageTag: "0.11.10"
Comment on lines +48 to +49

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

policyAgent:
url: cloudfoundry-k8s/policy-agent
# renovate: dataSource=github-releases depName=cloudfoundry/k8s-policy-agent
Expand Down
Loading