Skip to content

Commit d6893d5

Browse files
Cloud-Architect-EmmaGemini
andcommitted
fix(opentelemetry-collector): use valid regexp syntax in hostmetrics mount point excludes
Updates hostMetrics preset regex anchors and bumps chart version to clear merge conflicts. Co-authored-by: Gemini <gemini@google.com> Signed-off-by: Emmanuela Opurum <emmanuela_prince@yahoo.com>
1 parent f6f37d2 commit d6893d5

110 files changed

Lines changed: 486 additions & 482 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.
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: v2
22
name: opentelemetry-collector
3-
version: 0.158.0
43
description: OpenTelemetry Collector Helm chart for Kubernetes
54
type: application
65
home: https://opentelemetry.io/
@@ -9,7 +8,11 @@ sources:
98
- https://github.com/open-telemetry/opentelemetry-collector-contrib
109
maintainers:
1110
- name: dmitryax
11+
email: dmitryax@gmail.com
1212
- name: jaronoff97
13+
email: jaronoff97@gmail.com
1314
- name: TylerHelmuth
15+
email: tyHelmuth@gmail.com
1416
icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
15-
appVersion: 0.153.0
17+
version: 0.158.1
18+
appVersion: 0.153.0

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.158.0
8+
helm.sh/chart: opentelemetry-collector-0.158.1
99
app.kubernetes.io/name: opentelemetry-collector
10-
app.kubernetes.io/instance: example
10+
app.kubernetes.io/instance: opentelemetry-collector
1111
app.kubernetes.io/version: "0.153.0"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/part-of: opentelemetry-collector

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
labels:
8-
helm.sh/chart: opentelemetry-collector-0.158.0
8+
helm.sh/chart: opentelemetry-collector-0.158.1
99
app.kubernetes.io/name: opentelemetry-collector
10-
app.kubernetes.io/instance: example
10+
app.kubernetes.io/instance: opentelemetry-collector
1111
app.kubernetes.io/version: "0.153.0"
1212
app.kubernetes.io/managed-by: Helm
1313
app.kubernetes.io/part-of: opentelemetry-collector
1414
app.kubernetes.io/component: standalone-collector
1515
roleRef:
1616
apiGroup: rbac.authorization.k8s.io
1717
kind: ClusterRole
18-
name: example-opentelemetry-collector
18+
name: opentelemetry-collector
1919
subjects:
2020
- kind: ServiceAccount
21-
name: example-opentelemetry-collector
21+
name: opentelemetry-collector
2222
namespace: default

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: v1
44
kind: ConfigMap
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
@@ -19,23 +19,23 @@ spec:
1919
selector:
2020
matchLabels:
2121
app.kubernetes.io/name: opentelemetry-collector
22-
app.kubernetes.io/instance: example
22+
app.kubernetes.io/instance: opentelemetry-collector
2323
component: standalone-collector
2424
strategy:
2525
type: RollingUpdate
2626
template:
2727
metadata:
2828
annotations:
29-
checksum/config: 75b5706cf1daf9056fc7ce4aff83c6731b6d77d09fed6b0ec0688a66eebc6fe3
29+
checksum/config: fb58e6138676c7952967f28d42ac0143d649aa4a97a330e6d2d2a73f09200809
3030

3131
labels:
3232
app.kubernetes.io/name: opentelemetry-collector
33-
app.kubernetes.io/instance: example
33+
app.kubernetes.io/instance: opentelemetry-collector
3434
component: standalone-collector
3535

3636
spec:
3737

38-
serviceAccountName: example-opentelemetry-collector
38+
serviceAccountName: opentelemetry-collector
3939
automountServiceAccountToken: true
4040
securityContext:
4141
{}
@@ -119,7 +119,7 @@ spec:
119119
volumes:
120120
- name: opentelemetry-collector-configmap
121121
configMap:
122-
name: example-opentelemetry-collector
122+
name: opentelemetry-collector
123123
items:
124124
- key: relay
125125
path: relay.yaml

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: v1
44
kind: Service
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
@@ -45,6 +45,6 @@ spec:
4545
protocol: TCP
4646
selector:
4747
app.kubernetes.io/name: opentelemetry-collector
48-
app.kubernetes.io/instance: example
48+
app.kubernetes.io/instance: opentelemetry-collector
4949
component: standalone-collector
5050
internalTrafficPolicy: Cluster

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: v1
44
kind: ServiceAccount
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: v1
44
kind: ConfigMap
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: apps/v1
44
kind: Deployment
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
@@ -18,23 +18,23 @@ spec:
1818
selector:
1919
matchLabels:
2020
app.kubernetes.io/name: opentelemetry-collector
21-
app.kubernetes.io/instance: example
21+
app.kubernetes.io/instance: opentelemetry-collector
2222
component: standalone-collector
2323
strategy:
2424
type: RollingUpdate
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/config: b95153069c2c640b14f2a34551f5af0c56a5fe86d612e1c22e943a6aba841e14
28+
checksum/config: 03c2b72a23f727e186add8b13bf705eedb83387f8acbaa6f72cce3e68c90c1eb
2929

3030
labels:
3131
app.kubernetes.io/name: opentelemetry-collector
32-
app.kubernetes.io/instance: example
32+
app.kubernetes.io/instance: opentelemetry-collector
3333
component: standalone-collector
3434

3535
spec:
3636

37-
serviceAccountName: example-opentelemetry-collector
37+
serviceAccountName: opentelemetry-collector
3838
automountServiceAccountToken: true
3939
securityContext:
4040
{}
@@ -118,7 +118,7 @@ spec:
118118
volumes:
119119
- name: opentelemetry-collector-configmap
120120
configMap:
121-
name: example-opentelemetry-collector
121+
name: opentelemetry-collector
122122
items:
123123
- key: relay
124124
path: relay.yaml

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
apiVersion: autoscaling/v2
44
kind: HorizontalPodAutoscaler
55
metadata:
6-
name: example-opentelemetry-collector
6+
name: opentelemetry-collector
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-collector-0.158.0
9+
helm.sh/chart: opentelemetry-collector-0.158.1
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
11+
app.kubernetes.io/instance: opentelemetry-collector
1212
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
@@ -17,7 +17,7 @@ spec:
1717
scaleTargetRef:
1818
apiVersion: apps/v1
1919
kind: Deployment
20-
name: example-opentelemetry-collector
20+
name: opentelemetry-collector
2121
minReplicas: 1
2222
maxReplicas: 10
2323
behavior:

0 commit comments

Comments
 (0)