Skip to content

Commit 98641fa

Browse files
authored
[opentelemetry-kube-stack] Make hostNetwork and shareProcessNamespace optional (#1452)
1 parent c60fe23 commit 98641fa

File tree

19 files changed

+23
-25
lines changed

19 files changed

+23
-25
lines changed

charts/opentelemetry-kube-stack/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-kube-stack
3-
version: 0.3.4
3+
version: 0.3.5
44
description: |
55
OpenTelemetry Quickstart chart for Kubernetes.
66
Installs an operator and collector for an easy way to get started with Kubernetes observability.

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/bridge.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: OpAMPBridge
55
metadata:
66
name: example
77
labels:
8-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
8+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
99
app.kubernetes.io/version: "0.107.0"
1010
app.kubernetes.io/managed-by: Helm
1111
release: "example"

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/collector.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-cluster-stats
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
9+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1010
app.kubernetes.io/version: "0.107.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"
@@ -135,8 +135,6 @@ spec:
135135
replicas: 1
136136
imagePullPolicy: IfNotPresent
137137
upgradeStrategy: automatic
138-
hostNetwork: false
139-
shareProcessNamespace: false
140138
terminationGracePeriodSeconds: 30
141139
resources:
142140
limits:
@@ -189,7 +187,7 @@ metadata:
189187
name: example-daemon
190188
namespace: default
191189
labels:
192-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
190+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
193191
app.kubernetes.io/version: "0.107.0"
194192
app.kubernetes.io/managed-by: Helm
195193
release: "example"
@@ -589,8 +587,6 @@ spec:
589587
- otlp
590588
imagePullPolicy: IfNotPresent
591589
upgradeStrategy: automatic
592-
hostNetwork: false
593-
shareProcessNamespace: false
594590
terminationGracePeriodSeconds: 30
595591
resources:
596592
limits:

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/hooks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ spec:
6262
- -c
6363
- |
6464
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
65-
-l helm.sh/chart=opentelemetry-kube-stack-0.3.4
65+
-l helm.sh/chart=opentelemetry-kube-stack-0.3.5

charts/opentelemetry-kube-stack/examples/cloud-demo/rendered/instrumentation.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: Instrumentation
55
metadata:
66
name: example
77
labels:
8-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
8+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
99
app.kubernetes.io/version: "0.107.0"
1010
app.kubernetes.io/managed-by: Helm
1111
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/collector.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: example-daemon
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
9+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1010
app.kubernetes.io/version: "0.107.0"
1111
app.kubernetes.io/managed-by: Helm
1212
release: "example"
@@ -294,8 +294,6 @@ spec:
294294
- otlp
295295
imagePullPolicy: IfNotPresent
296296
upgradeStrategy: automatic
297-
hostNetwork: false
298-
shareProcessNamespace: false
299297
terminationGracePeriodSeconds: 30
300298
resources:
301299
limits:

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-api-server/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-apiserver
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-controller-manager
99
jobLabel: kube-controller-manager
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-controller-manager/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-controller-manager
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-dns
99
jobLabel: kube-dns
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-dns/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-dns
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-etcd
99
jobLabel: kube-etcd
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-etcd/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-etcd
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-proxy
99
jobLabel: kube-proxy
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-proxy/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-proxy
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
labels:
88
app: opentelemetry-kube-stack-kube-scheduler
99
jobLabel: kube-scheduler
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/exporters/kube-scheduler/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
namespace: default
88
labels:
99
app: opentelemetry-kube-stack-kube-scheduler
10-
helm.sh/chart: opentelemetry-kube-stack-0.3.4
10+
helm.sh/chart: opentelemetry-kube-stack-0.3.5
1111
app.kubernetes.io/version: "0.107.0"
1212
app.kubernetes.io/managed-by: Helm
1313
release: "example"

charts/opentelemetry-kube-stack/examples/prometheus-otel/rendered/hooks.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ spec:
6262
- -c
6363
- |
6464
kubectl delete instrumentations,opampbridges,opentelemetrycollectors \
65-
-l helm.sh/chart=opentelemetry-kube-stack-0.3.4
65+
-l helm.sh/chart=opentelemetry-kube-stack-0.3.5

charts/opentelemetry-kube-stack/templates/collector.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ spec:
3535
{{- end }}
3636
imagePullPolicy: {{ $collector.image.pullPolicy }}
3737
upgradeStrategy: {{ $collector.upgradeStrategy }}
38+
{{- if $collector.hostNetwork }}
3839
hostNetwork: {{ $collector.hostNetwork }}
40+
{{- end }}
41+
{{- if $collector.shareProcessNamespace }}
3942
shareProcessNamespace: {{ $collector.shareProcessNamespace }}
43+
{{- end }}
4044
{{- if $collector.priorityClassName }}
4145
priorityClassName: {{ $collector.priorityClassName }}
4246
{{- end }}

0 commit comments

Comments
 (0)