Skip to content

Commit d85ab0a

Browse files
authored
Merge branch 'main' into trivy-scan
2 parents 58f5ec2 + 94e513a commit d85ab0a

253 files changed

Lines changed: 6093 additions & 678 deletions

File tree

Some content is hidden

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

charts/opentelemetry-collector/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.141.0
3+
version: 0.142.0
44
description: OpenTelemetry Collector Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/
@@ -12,4 +12,4 @@ maintainers:
1212
- name: jaronoff97
1313
- name: TylerHelmuth
1414
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
15-
appVersion: 0.141.0
15+
appVersion: 0.142.0
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
mode: daemonset
2+
3+
image:
4+
repository: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s"
5+
6+
command:
7+
name: "otelcol-k8s"
8+
9+
presets:
10+
clusterMetrics:
11+
enabled: true
12+
13+
resources:
14+
limits:
15+
cpu: 100m
16+
memory: 200M

charts/opentelemetry-collector/ci/preset-clustermetrics-values.yaml renamed to charts/opentelemetry-collector/ci/preset-clustermetrics-mode-deployment-values.yaml

File renamed without changes.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ClusterRole
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.141.0
8+
helm.sh/chart: opentelemetry-collector-0.142.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.141.0"
11+
app.kubernetes.io/version: "0.142.0"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/part-of: opentelemetry-collector
1414
app.kubernetes.io/component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ kind: ClusterRoleBinding
55
metadata:
66
name: example-opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.141.0
8+
helm.sh/chart: opentelemetry-collector-0.142.0
99
app.kubernetes.io/name: opentelemetry-collector
1010
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.141.0"
11+
app.kubernetes.io/version: "0.142.0"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/part-of: opentelemetry-collector
1414
app.kubernetes.io/component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.141.0
9+
helm.sh/chart: opentelemetry-collector-0.142.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.141.0"
12+
app.kubernetes.io/version: "0.142.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.141.0
9+
helm.sh/chart: opentelemetry-collector-0.142.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.141.0"
12+
app.kubernetes.io/version: "0.142.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector
@@ -26,7 +26,7 @@ spec:
2626
template:
2727
metadata:
2828
annotations:
29-
checksum/config: 1fac098ef66331c929b206b59f4299ac1283c71192f129b483d149c7dfb62ebc
29+
checksum/config: d36fa54030c7cee2413dfa158ab500ba4ee4df148306b1a3a68007457de15030
3030

3131
labels:
3232
app.kubernetes.io/name: opentelemetry-collector
@@ -47,7 +47,7 @@ spec:
4747
- --config=/conf/relay.yaml
4848
securityContext:
4949
{}
50-
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.141.0"
50+
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.142.0"
5151
imagePullPolicy: IfNotPresent
5252
ports:
5353

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.141.0
9+
helm.sh/chart: opentelemetry-collector-0.142.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.141.0"
12+
app.kubernetes.io/version: "0.142.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.141.0
9+
helm.sh/chart: opentelemetry-collector-0.142.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.141.0"
12+
app.kubernetes.io/version: "0.142.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: example-opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.141.0
9+
helm.sh/chart: opentelemetry-collector-0.142.0
1010
app.kubernetes.io/name: opentelemetry-collector
1111
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.141.0"
12+
app.kubernetes.io/version: "0.142.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector

0 commit comments

Comments
 (0)