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
2 changes: 1 addition & 1 deletion apps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ appsInfo:
chartName: trivy-operator
otel:
title: OpenTelemetry Operator
appVersion: 0.151.0
appVersion: 0.152.0
repo: https://github.com/open-telemetry/opentelemetry-operator
maintainers: Grafana labs
relatedLinks:
Expand Down
2 changes: 1 addition & 1 deletion chart/chart-index/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies:
repository: https://oauth2-proxy.github.io/manifests
- name: opentelemetry-operator
alias: otel-operator
version: 0.113.1
version: 0.114.0
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
- name: policy-reporter
version: 3.7.4
Expand Down
4 changes: 2 additions & 2 deletions charts/otel-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 0.151.0
appVersion: 0.152.0
description: OpenTelemetry Operator Helm chart for Kubernetes
home: https://opentelemetry.io/
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
Expand All @@ -12,4 +12,4 @@ name: opentelemetry-operator
sources:
- https://github.com/open-telemetry/opentelemetry-operator
type: application
version: 0.113.1
version: 0.114.0
Original file line number Diff line number Diff line change
Expand Up @@ -2482,6 +2482,8 @@ spec:
items:
type: string
type: array
denyFSAccessThroughSMs:
type: boolean
denyNamespaces:
items:
type: string
Expand Down
4 changes: 4 additions & 0 deletions charts/otel-operator/crds/crd-opentelemetrycollector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3367,6 +3367,8 @@ spec:
type: object
prometheusCR:
properties:
denyFSAccessThroughSMs:
type: boolean
enabled:
type: boolean
podMonitorSelector:
Expand Down Expand Up @@ -8306,6 +8308,8 @@ spec:
items:
type: string
type: array
denyFSAccessThroughSMs:
type: boolean
denyNamespaces:
items:
type: string
Expand Down
8 changes: 8 additions & 0 deletions charts/otel-operator/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- --enable-leader-election
{{- end }}
- --health-probe-addr=:{{ .Values.manager.ports.healthzPort }}
{{- if .Values.manager.ports.pprofPort }}
- --pprof-addr=:{{ .Values.manager.ports.pprofPort }}
{{- end }}
{{- if or .Values.admissionWebhooks.create .Values.admissionWebhooks.secretName }}
- --webhook-port={{ .Values.manager.ports.webhookPort }}
{{- end }}
Expand Down Expand Up @@ -121,6 +124,11 @@ spec:
name: manager
imagePullPolicy: {{ .Values.manager.image.imagePullPolicy }}
ports:
{{- if .Values.manager.ports.pprofPort }}
- containerPort: {{ .Values.manager.ports.pprofPort }}
name: pprof
protocol: TCP
{{- end }}
- containerPort: {{ .Values.manager.ports.metricsPort }}
name: metrics
protocol: TCP
Expand Down
8 changes: 8 additions & 0 deletions charts/otel-operator/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,14 @@
"examples": [
8081
]
},
"pprofPort": {
"type": "integer",
"default": 0,
"title": "The pprofPort Schema",
"examples": [
6060
]
}
},
"examples": [
Expand Down
4 changes: 3 additions & 1 deletion charts/otel-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ manager:
imagePullPolicy: IfNotPresent
collectorImage:
repository: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s
tag: 0.151.0
tag: 0.152.1
opampBridgeImage:
repository: ""
tag: ""
Expand Down Expand Up @@ -112,6 +112,8 @@ manager:
metricsPort: 8443
webhookPort: 9443
healthzPort: 8081
# Expose optionally a port for pprof profiling
# pprofPort: 6060
## Metrics server configuration
## The operator uses controller-runtime built-in auth for the metrics server
metrics:
Expand Down
Loading