Skip to content

Commit 0217078

Browse files
KyriosGN0Gemini
authored and
Cloud-Architect-Emma
committed
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 2b90c8f commit 0217078

105 files changed

Lines changed: 579 additions & 579 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.157.2
3+
version: 0.158.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.152.0
15+
appVersion: 0.153.0

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
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.157.2
8+
helm.sh/chart: opentelemetry-collector-0.158.0
99
app.kubernetes.io/name: opentelemetry-collector
10-
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.152.0"
10+
app.kubernetes.io/instance: opentelemetry-collector
11+
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

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

Lines changed: 6 additions & 6 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.157.2
8+
helm.sh/chart: opentelemetry-collector-0.158.0
99
app.kubernetes.io/name: opentelemetry-collector
10-
app.kubernetes.io/instance: example
11-
app.kubernetes.io/version: "0.152.0"
10+
app.kubernetes.io/instance: opentelemetry-collector
11+
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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-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: 7f9f403e6300750178b10254c3f82bef49d0dd5303ad6767592b20fac9b76d22
29+
checksum/config: 2d5c8ddcb6e12d07c5bef83acbaa10fd92d2c0bfae4fb400012315f914f45fb7
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
{}
@@ -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.152.0"
50+
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.153.0"
5151
imagePullPolicy: IfNotPresent
5252
ports:
5353

@@ -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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.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/deployment.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-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: 06d2923956fe527e471a771d078f7faa122e4db60c8337fe8272f57f6db6de2f
28+
checksum/config: d4a8a24b4d4d3f8d9b2cbfe4d25a680519d08fe024becd4b739327f62a1cf0e5
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
{}
@@ -46,7 +46,7 @@ spec:
4646
- --config=/conf/relay.yaml
4747
securityContext:
4848
{}
49-
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.152.0"
49+
image: "ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:0.153.0"
5050
imagePullPolicy: IfNotPresent
5151
ports:
5252

@@ -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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
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.157.2
9+
helm.sh/chart: opentelemetry-collector-0.158.0
1010
app.kubernetes.io/name: opentelemetry-collector
11-
app.kubernetes.io/instance: example
12-
app.kubernetes.io/version: "0.152.0"
11+
app.kubernetes.io/instance: opentelemetry-collector
12+
app.kubernetes.io/version: "0.153.0"
1313
app.kubernetes.io/managed-by: Helm
1414
app.kubernetes.io/part-of: opentelemetry-collector
1515
app.kubernetes.io/component: standalone-collector
1616
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)