From b62b3be1e0c8a5622ba4922cdcd70e9b95a497a9 Mon Sep 17 00:00:00 2001 From: Povilas Versockas Date: Fri, 4 Nov 2022 17:10:56 +0200 Subject: [PATCH] [opentelemetry-collector] add support for hostnetworking in deployment and statefulset mode (#469) --- charts/opentelemetry-collector/Chart.yaml | 2 +- .../daemonset-and-deployment/rendered/configmap-agent.yaml | 2 +- .../daemonset-and-deployment/rendered/configmap.yaml | 2 +- .../daemonset-and-deployment/rendered/daemonset.yaml | 4 ++-- .../daemonset-and-deployment/rendered/deployment.yaml | 5 +++-- .../examples/daemonset-and-deployment/rendered/service.yaml | 2 +- .../daemonset-and-deployment/rendered/serviceaccount.yaml | 2 +- .../daemonset-collector-logs/rendered/configmap-agent.yaml | 2 +- .../daemonset-collector-logs/rendered/daemonset.yaml | 4 ++-- .../daemonset-collector-logs/rendered/serviceaccount.yaml | 2 +- .../daemonset-hostmetrics/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-hostmetrics/rendered/daemonset.yaml | 4 ++-- .../daemonset-hostmetrics/rendered/serviceaccount.yaml | 2 +- .../daemonset-lifecycle-hooks/rendered/configmap-agent.yaml | 2 +- .../daemonset-lifecycle-hooks/rendered/daemonset.yaml | 4 ++-- .../daemonset-lifecycle-hooks/rendered/serviceaccount.yaml | 2 +- .../examples/daemonset-only/rendered/configmap-agent.yaml | 2 +- .../examples/daemonset-only/rendered/daemonset.yaml | 4 ++-- .../examples/daemonset-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-only/rendered/configmap.yaml | 2 +- .../examples/deployment-only/rendered/deployment.yaml | 5 +++-- .../examples/deployment-only/rendered/service.yaml | 2 +- .../examples/deployment-only/rendered/serviceaccount.yaml | 2 +- .../examples/deployment-otlp-traces/rendered/configmap.yaml | 2 +- .../examples/deployment-otlp-traces/rendered/deployment.yaml | 5 +++-- .../examples/deployment-otlp-traces/rendered/service.yaml | 2 +- .../deployment-otlp-traces/rendered/serviceaccount.yaml | 2 +- .../rendered/deployment.yaml | 3 ++- .../deployment-use-existing-configMap/rendered/service.yaml | 2 +- .../rendered/serviceaccount.yaml | 2 +- .../statefulset-only/rendered/configmap-statefulset.yaml | 2 +- .../examples/statefulset-only/rendered/service.yaml | 2 +- .../examples/statefulset-only/rendered/serviceaccount.yaml | 2 +- .../examples/statefulset-only/rendered/statefulset.yaml | 3 ++- charts/opentelemetry-collector/templates/deployment.yaml | 1 + charts/opentelemetry-collector/templates/statefulset.yaml | 1 + 36 files changed, 49 insertions(+), 42 deletions(-) diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index f16d1f48d4e..d971c450e72 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.38.0 +version: 0.38.1 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml index ec5fa22b1e9..f0c804a5f24 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml index 2f9ca10edc2..410dfe12b7e 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml index 18e2cd66948..27a34af48e4 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 11a9fd4184175d2eb4e52bc682cf055078733eb65f0b03f2b078cfd5878390a2 + checksum/config: 121b2e20b43f8d9e543102992df109e234413ce1e22965b2d994b110e268e5f7 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml index 19187bfc758..aa8bd52f21a 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: f94c7c91bfcfdc9909d1f6f66a8e0745b40fa2bf47b8e06c1b70543f76e23b6d + checksum/config: 0a5b5160eaa851333d4899b3ab1fb7af7e7809bcb699e7e4bc28f72b66089359 labels: app.kubernetes.io/name: opentelemetry-collector @@ -90,3 +90,4 @@ spec: items: - key: relay path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml index 66091b364ec..b48371d47dd 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-and-deployment/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml index 3e7e707dab6..a2838aa8cae 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml index 102d25aeb67..78fe6992809 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 9427006d05d8910490e3c0b47d68560b26b4ffc7b0b187f3a0a6311fd662ea46 + checksum/config: 58c858528c96753355acc8877790044f6efb113b5fc2040d7242be36c36fb50e labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-collector-logs/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml index 60f7d149777..ec8f60bdbc4 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml index 00e2bc241ff..c711451af6a 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 225738cc1b94ac599f1191d046c7dfda6906100a0ccc82ea45567256038df545 + checksum/config: 704b808d333c1f446a6ddd2be3a4b58f995a8b9f6034c6041c385789db815c45 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-hostmetrics/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml index 8b7c113a0b7..97568efcc75 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml index 55078d212fa..678d9a51b1d 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 5ed851aee48db229b58958a46cf17659259d23cbe7c5b81fb696724264dd0ed2 + checksum/config: db257d6eb21cf75847a4f9e737c8e4745050b6f1b39f8aae83311f5bea757d76 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-lifecycle-hooks/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml index 8b7c113a0b7..97568efcc75 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/configmap-agent.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml index 892afb76e96..cf9dd74f84e 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/daemonset.yaml @@ -5,7 +5,7 @@ kind: DaemonSet metadata: name: example-opentelemetry-collector-agent labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -21,7 +21,7 @@ spec: template: metadata: annotations: - checksum/config: 5ed851aee48db229b58958a46cf17659259d23cbe7c5b81fb696724264dd0ed2 + checksum/config: db257d6eb21cf75847a4f9e737c8e4745050b6f1b39f8aae83311f5bea757d76 labels: app.kubernetes.io/name: opentelemetry-collector diff --git a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml index d2f2d46bf82..e2e1cb3237a 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml index 90f41564a4a..63f60693d20 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 46e0b8f6eaf1255fa54ff38b1c06f12c92166d32edaec5fdc8d13a8233697e32 + checksum/config: 6fb77bf13c269125234f9c8bf3290297d7f2c5b055f9da5d14f1e6ee3f1bb61c labels: app.kubernetes.io/name: opentelemetry-collector @@ -90,3 +90,4 @@ spec: items: - key: relay path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml index 66091b364ec..b48371d47dd 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml index c22f2002792..069708d934a 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/configmap.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml index d7a0f0c54ff..11fdae0d9ea 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -22,7 +22,7 @@ spec: template: metadata: annotations: - checksum/config: 84e025dfe2f3fcb80ecf58f51862f331b877143fb221f2b33555ec441ce78738 + checksum/config: 1b88f7493b035424082681737bff88758e85de357fd535083f9fb0e8dc392efa labels: app.kubernetes.io/name: opentelemetry-collector @@ -78,3 +78,4 @@ spec: items: - key: relay path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml index 4a56bbea727..59c7c940137 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-otlp-traces/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml index 28b9724b4cb..0cffd447d30 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/deployment.yaml @@ -5,7 +5,7 @@ kind: Deployment metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -91,3 +91,4 @@ spec: path: config.yaml name: custom-otel-collector-config name: custom-otelcol-configmap + hostNetwork: false diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml index 66091b364ec..b48371d47dd 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/deployment-use-existing-configMap/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml index 674ece13d48..249d7854e4c 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/configmap-statefulset.yaml @@ -5,7 +5,7 @@ kind: ConfigMap metadata: name: example-opentelemetry-collector-statefulset labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml index d66a5aca729..539ccb81b3b 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/service.yaml @@ -5,7 +5,7 @@ kind: Service metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml index d3c7d377350..874578d4583 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/serviceaccount.yaml @@ -5,7 +5,7 @@ kind: ServiceAccount metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" diff --git a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml index 359cb8d0569..850029ca4e8 100644 --- a/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml +++ b/charts/opentelemetry-collector/examples/statefulset-only/rendered/statefulset.yaml @@ -5,7 +5,7 @@ kind: StatefulSet metadata: name: example-opentelemetry-collector labels: - helm.sh/chart: opentelemetry-collector-0.38.0 + helm.sh/chart: opentelemetry-collector-0.38.1 app.kubernetes.io/name: opentelemetry-collector app.kubernetes.io/instance: example app.kubernetes.io/version: "0.63.1" @@ -92,3 +92,4 @@ spec: items: - key: relay path: relay.yaml + hostNetwork: false diff --git a/charts/opentelemetry-collector/templates/deployment.yaml b/charts/opentelemetry-collector/templates/deployment.yaml index ca20bd5a0e9..23fc52942a3 100644 --- a/charts/opentelemetry-collector/templates/deployment.yaml +++ b/charts/opentelemetry-collector/templates/deployment.yaml @@ -38,4 +38,5 @@ spec: {{- $podValues := deepCopy .Values }} {{- $podData := dict "Values" $podValues "configmapSuffix" "" "isAgent" false }} {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }} + hostNetwork: {{ .Values.hostNetwork }} {{- end }} diff --git a/charts/opentelemetry-collector/templates/statefulset.yaml b/charts/opentelemetry-collector/templates/statefulset.yaml index 1ba86b1f320..fc4815e22a3 100644 --- a/charts/opentelemetry-collector/templates/statefulset.yaml +++ b/charts/opentelemetry-collector/templates/statefulset.yaml @@ -34,6 +34,7 @@ spec: {{- $podValues := deepCopy .Values }} {{- $podData := dict "Values" $podValues "configmapSuffix" "-statefulset" "isAgent" false }} {{- include "opentelemetry-collector.pod" ($podData | mustMergeOverwrite (deepCopy .)) | nindent 6 }} + hostNetwork: {{ .Values.hostNetwork }} {{- with .Values.statefulset.volumeClaimTemplates }} volumeClaimTemplates: {{- toYaml . | nindent 2 }}