Skip to content

Commit e7a1f6c

Browse files
authored
Merge branch 'main' into main
2 parents fb4a932 + 9bc3f27 commit e7a1f6c

File tree

178 files changed

+1972
-491
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+1972
-491
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TMP_DIRECTORY = ./tmp
2-
CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf opentelemetry-kube-stack opentelemetry-target-allocator
2+
CHARTS ?= opentelemetry-collector opentelemetry-operator opentelemetry-demo opentelemetry-ebpf opentelemetry-kube-stack opentelemetry-target-allocator opentelemetry-ebpf-instrumentationopentelemetry-ebpf-instrumentation
33
OPERATOR_APP_VERSION ?= "$(shell cat ./charts/opentelemetry-operator/Chart.yaml | sed -nr 's/appVersion: ([0-9]+\.[0-9]+\.[0-9]+)/\1/p')"
44

55
.PHONY: generate-examples

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OpenTelemetry Helm Charts
22

3-
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
3+
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
44
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/opentelemetry-helm)](https://artifacthub.io/packages/search?repo=opentelemetry-helm)
55

66
This repository contains [Helm](https://helm.sh/) charts for OpenTelemetry project.
@@ -38,6 +38,13 @@ The chart can be used to install [OpenTelemetry Operator](https://github.com/ope
3838
in a Kubernetes cluster. More detailed documentation can be found in
3939
[OpenTelemetry Operator chart directory](./charts/opentelemetry-operator).
4040

41+
42+
### OpenTelemetry eBPF Instrumentation
43+
44+
The chart can be used to install [OpenTelemetry eBPF Instrumentation](https://github.com/open-telemetry/opentelemetry-ebpf-instrumentation)
45+
in a Kubernetes cluster. More detailed documentation can be found in
46+
[OpenTelemetry Operator chart directory](./charts/opentelemetry-ebpf-instrumentation).
47+
4148
## Contributing
4249

4350
See [CONTRIBUTING.md](./CONTRIBUTING.md).

charts/opentelemetry-collector/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.138.0
3+
version: 0.138.1
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrole.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.138.0
8+
helm.sh/chart: opentelemetry-collector-0.138.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.138.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/clusterrolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.138.0
8+
helm.sh/chart: opentelemetry-collector-0.138.1
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
1111
app.kubernetes.io/version: "0.138.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.138.0
9+
helm.sh/chart: opentelemetry-collector-0.138.1
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.138.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.138.0
9+
helm.sh/chart: opentelemetry-collector-0.138.1
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.138.0"
@@ -26,7 +26,7 @@ spec:
2626
template:
2727
metadata:
2828
annotations:
29-
checksum/config: ae723df5ba6f4d83ef399f6c4de248364913f44b16c7cc44aacdcd904337068c
29+
checksum/config: 3fdb7e9482f11f60ac4a82c488d7b1f70d9ebecd0a13c287d74c5beb2192f61f
3030

3131
labels:
3232
app.kubernetes.io/name: opentelemetry-collector

charts/opentelemetry-collector/examples/alternate-config/rendered/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.138.0
9+
helm.sh/chart: opentelemetry-collector-0.138.1
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.138.0"

charts/opentelemetry-collector/examples/alternate-config/rendered/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.138.0
9+
helm.sh/chart: opentelemetry-collector-0.138.1
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.138.0"

charts/opentelemetry-collector/examples/custom-metrics-hpa/rendered/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.138.0
9+
helm.sh/chart: opentelemetry-collector-0.138.1
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
1212
app.kubernetes.io/version: "0.138.0"

0 commit comments

Comments
 (0)