From a4e2ad8414d92e420a62e52b893fdf2aef52a8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 7 Oct 2021 14:01:03 +0200 Subject: [PATCH 01/13] Add label app.kubernetes.io/name --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 1 + .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd.yaml | 1 + .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 1 + .../templates/configmap-otel-collector.yaml | 1 + .../templates/configmap-otel-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 + .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 + .../templates/pdb-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/secret.yaml | 1 + .../templates/securityContextContraints.yaml | 1 + helm-charts/splunk-otel-collector/templates/service.yaml | 1 + helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 18c9b9b8ed..fad19003f6 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -7,6 +7,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index db2080d2cb..4b726567ea 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -7,6 +7,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index 18aa04c772..bdefdf86af 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -11,6 +11,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 1565e7d291..c9ef36a7cb 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -11,6 +11,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index 549cd95ff3..ff62d80806 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index cf8f0cc5dc..babb5ad420 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index 6d64ce2c2a..b884428262 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index 3660715d88..2d5d597670 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index f06848ab63..4a5e8ade98 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index 724d5d9d94..5702db1e0e 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -9,6 +9,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index a526afa6d0..c49f50191a 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -9,6 +9,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 44b5c33352..36422b5326 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -9,6 +9,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 5f7f14b570..0128526007 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -9,6 +9,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index ecd245f447..17a818215e 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index bb9a8c9fb6..b442813cd8 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -8,6 +8,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 6f2488d3eb..d6091cebf4 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -9,6 +9,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index 9c4e29c4ec..db0aa9d877 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -14,6 +14,7 @@ metadata: chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 7a6e515d524969ae0288962be4128248e8501d69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 7 Oct 2021 14:03:42 +0200 Subject: [PATCH 02/13] Add label app.kubernetes.io/instance --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 1 + .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd.yaml | 1 + .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 1 + .../templates/configmap-otel-collector.yaml | 1 + .../templates/configmap-otel-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 + .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 + .../templates/pdb-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/secret.yaml | 1 + .../templates/securityContextContraints.yaml | 1 + helm-charts/splunk-otel-collector/templates/service.yaml | 1 + helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index fad19003f6..6954935873 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -8,6 +8,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index 4b726567ea..48b357ad65 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -8,6 +8,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index bdefdf86af..23f4bc266a 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -12,6 +12,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index c9ef36a7cb..509dee9181 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -12,6 +12,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index ff62d80806..3baf5d4a12 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index babb5ad420..dd953beadf 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index b884428262..7209db969e 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index 2d5d597670..15b68b49fa 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 4a5e8ade98..370c7aebcd 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index 5702db1e0e..18ebfb7403 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -10,6 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index c49f50191a..1cb8d8cbf2 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -10,6 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 36422b5326..10ddb0fd6a 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -10,6 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 0128526007..28ac260ff0 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -10,6 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index 17a818215e..ec83571b9b 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index b442813cd8..6a9dfa6dd2 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -9,6 +9,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index d6091cebf4..842cde4425 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -10,6 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index db0aa9d877..cc69ab68e3 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -15,6 +15,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 9428614c57d1a02766ac4a67b11d6aba940ba652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 7 Oct 2021 14:15:19 +0200 Subject: [PATCH 03/13] Add label app.kubernetes.io/part-of --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 1 + .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd.yaml | 1 + .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 1 + .../templates/configmap-otel-collector.yaml | 1 + .../templates/configmap-otel-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 + .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 + .../templates/pdb-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/secret.yaml | 1 + .../templates/securityContextContraints.yaml | 1 + helm-charts/splunk-otel-collector/templates/service.yaml | 1 + helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 6954935873..014e74904a 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -9,6 +9,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index 48b357ad65..94b0f07ed3 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -9,6 +9,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index 23f4bc266a..6dd406179c 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -13,6 +13,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 509dee9181..053a8a658f 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -13,6 +13,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index 3baf5d4a12..6a346e00bc 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index dd953beadf..cfbea467cb 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index 7209db969e..b7cf62da77 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index 15b68b49fa..b4100cefd9 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 370c7aebcd..59b6083b0b 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index 18ebfb7403..fcc0bb298b 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -11,6 +11,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 1cb8d8cbf2..07582e6d5f 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -11,6 +11,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 10ddb0fd6a..8ff008a808 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -11,6 +11,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 28ac260ff0..f35f8fa464 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -11,6 +11,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index ec83571b9b..6c1ee724d6 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index 6a9dfa6dd2..cca812e76e 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -10,6 +10,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 842cde4425..0dc404dd18 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -11,6 +11,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index cc69ab68e3..6ba7ccc6b3 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -16,6 +16,7 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/part-of: {{ .Release.Service }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 8bed347c83ed83c4a1f86e2c4853ae0fd3422607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 7 Oct 2021 14:18:10 +0200 Subject: [PATCH 04/13] Add label app.kubernetes.io/component --- .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 + .../templates/pdb-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/service.yaml | 1 + 5 files changed, 5 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index fcc0bb298b..5024c7d162 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/component: otel-collector {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 07582e6d5f..ab83c3408a 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/component: otel-k8s-cluster-receiver {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 8ff008a808..51173028db 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/component: otel-collector spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index f35f8fa464..9cefe217d4 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/component: otel-k8s-cluster-receiver spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 0dc404dd18..890399878d 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/component: otel-collector {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} From 0fe7dbbd56b4314815a16cfa301ba772159dc582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Tue, 12 Oct 2021 10:14:12 +0200 Subject: [PATCH 05/13] Add label app.kubernetes.io/managed-by --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 1 + .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd.yaml | 1 + .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 1 + .../templates/configmap-otel-collector.yaml | 1 + .../templates/configmap-otel-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 + .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 + .../templates/pdb-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/secret.yaml | 1 + .../templates/securityContextContraints.yaml | 1 + helm-charts/splunk-otel-collector/templates/service.yaml | 1 + helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 014e74904a..30aad54789 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index 94b0f07ed3..d82012fdf6 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -10,6 +10,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index 6dd406179c..76e10b67ca 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 053a8a658f..743e0219e5 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index 6a346e00bc..58a08b7e57 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index cfbea467cb..855cbcaf71 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index b7cf62da77..7980b5a140 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index b4100cefd9..42aea06c20 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 59b6083b0b..c960bb8725 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index 5024c7d162..c59972c303 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -13,6 +13,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index ab83c3408a..3c07b6693e 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -13,6 +13,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 51173028db..865ed9bcf6 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -13,6 +13,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 9cefe217d4..484e90083f 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -13,6 +13,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver + app.kubernetes.io/managed-by: {{ .Release.Service }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index 6c1ee724d6..524341275b 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index cca812e76e..5a0e74685a 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 890399878d..a9a127684d 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -13,6 +13,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index 6ba7ccc6b3..11389b0fbb 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -17,6 +17,7 @@ metadata: app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} + app.kubernetes.io/managed-by: {{ .Release.Service }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 70cb051e1c036513f52a63eb12fc43e9580fb77a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Tue, 12 Oct 2021 10:17:51 +0200 Subject: [PATCH 06/13] Add label helm.sh/chart --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 1 + .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 1 + .../splunk-otel-collector/templates/configmap-fluentd.yaml | 1 + .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 1 + .../templates/configmap-otel-collector.yaml | 1 + .../templates/configmap-otel-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 + .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 + .../templates/pdb-k8s-cluster-receiver.yaml | 1 + helm-charts/splunk-otel-collector/templates/secret.yaml | 1 + .../templates/securityContextContraints.yaml | 1 + helm-charts/splunk-otel-collector/templates/service.yaml | 1 + helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 30aad54789..841ddc17db 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index d82012fdf6..fe8c9306cc 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -11,6 +11,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index 76e10b67ca..fdbd092728 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -15,6 +15,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 743e0219e5..520787e3a8 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -15,6 +15,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index 58a08b7e57..ee184ee075 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index 855cbcaf71..dcb2d8a96c 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index 7980b5a140..98d9d42ee1 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index 42aea06c20..894866e73c 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index c960bb8725..383aa8cb8b 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index c59972c303..d5c5ad14ce 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 3c07b6693e..3b27c359e8 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 865ed9bcf6..86b9b16128 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 484e90083f..70d8eb9136 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index 524341275b..7b90f81aa2 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index 5a0e74685a..f306813ffa 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index a9a127684d..8767aa9065 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index 11389b0fbb..7520ed8904 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -18,6 +18,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 35eb883338c80ebaf46ab79718676ff237439e01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Tue, 12 Oct 2021 10:40:37 +0200 Subject: [PATCH 07/13] Add label app.kubernetes.io/version based on tag --- helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 + .../splunk-otel-collector/templates/deployment-collector.yaml | 1 + .../templates/deployment-k8s-cluster-receiver.yaml | 1 + 3 files changed, 3 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 383aa8cb8b..fc92cfcdce 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -12,6 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/version: {{ .Values.image.fluentd.tag }} helm.sh/chart: {{ .Chart.Name }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index d5c5ad14ce..da3f1aa029 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} helm.sh/chart: {{ .Chart.Name }} {{- if .Values.otelCollector.annotations }} annotations: diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 3b27c359e8..3d95b4c913 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -14,6 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} + app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} helm.sh/chart: {{ .Chart.Name }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: From 2ff9e0db07933100c2230f78ab1947be23253e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 14 Oct 2021 11:23:46 +0200 Subject: [PATCH 08/13] Set helm.sh/chart to chart name and version As recommended by Helm: > helm.sh/chart: > This should be the chart name and version: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}. https://helm.sh/docs/chart_best_practices/labels/#standard-labels --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 2 +- .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 2 +- .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 2 +- .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 2 +- .../splunk-otel-collector/templates/configmap-fluentd.yaml | 2 +- .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 2 +- .../templates/configmap-otel-collector.yaml | 2 +- .../templates/configmap-otel-k8s-cluster-receiver.yaml | 2 +- helm-charts/splunk-otel-collector/templates/daemonset.yaml | 2 +- .../splunk-otel-collector/templates/deployment-collector.yaml | 2 +- .../templates/deployment-k8s-cluster-receiver.yaml | 2 +- helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 2 +- .../templates/pdb-k8s-cluster-receiver.yaml | 2 +- helm-charts/splunk-otel-collector/templates/secret.yaml | 2 +- .../templates/securityContextContraints.yaml | 2 +- helm-charts/splunk-otel-collector/templates/service.yaml | 2 +- helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 841ddc17db..2a7dff4fe4 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index fe8c9306cc..e331bd920c 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -11,7 +11,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index fdbd092728..406b312105 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 520787e3a8..6206fdc103 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index ee184ee075..ccf00fe081 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index dcb2d8a96c..7ccda102b8 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index 98d9d42ee1..831d2164a4 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index 894866e73c..ef6a265c04 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index fc92cfcdce..90e5a72249 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -13,7 +13,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/version: {{ .Values.image.fluentd.tag }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index da3f1aa029..2803ca5045 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 3d95b4c913..7e7d55b408 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -15,7 +15,7 @@ metadata: app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 86b9b16128..b30c6c0596 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 70d8eb9136..768366cc5d 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index 7b90f81aa2..84aa99640e 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index f306813ffa..b82eca7bf4 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 8767aa9065..92e903ac2f 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -14,7 +14,7 @@ metadata: app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index 7520ed8904..bf7295932d 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -18,7 +18,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 5f664ddc20ba1f598762e8821ac26994034b4873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 14 Oct 2021 11:59:50 +0200 Subject: [PATCH 09/13] Remove label app.kubernetes.io/part-of --- helm-charts/splunk-otel-collector/templates/clusterRole.yaml | 1 - .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 1 - .../splunk-otel-collector/templates/configmap-fluentd-cri.yaml | 1 - .../splunk-otel-collector/templates/configmap-fluentd-json.yaml | 1 - .../splunk-otel-collector/templates/configmap-fluentd.yaml | 1 - .../splunk-otel-collector/templates/configmap-otel-agent.yaml | 1 - .../templates/configmap-otel-collector.yaml | 1 - .../templates/configmap-otel-k8s-cluster-receiver.yaml | 1 - helm-charts/splunk-otel-collector/templates/daemonset.yaml | 1 - .../splunk-otel-collector/templates/deployment-collector.yaml | 1 - .../templates/deployment-k8s-cluster-receiver.yaml | 1 - helm-charts/splunk-otel-collector/templates/pdb-collector.yaml | 1 - .../templates/pdb-k8s-cluster-receiver.yaml | 1 - helm-charts/splunk-otel-collector/templates/secret.yaml | 1 - .../templates/securityContextContraints.yaml | 1 - helm-charts/splunk-otel-collector/templates/service.yaml | 1 - helm-charts/splunk-otel-collector/templates/serviceAccount.yaml | 1 - 17 files changed, 17 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 2a7dff4fe4..8586c300e4 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -9,7 +9,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} rules: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index e331bd920c..a63cf589eb 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -9,7 +9,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} roleRef: diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index 406b312105..d87d08ca5c 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -13,7 +13,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 6206fdc103..202184a417 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -13,7 +13,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index ccf00fe081..fae57d76bf 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index 7ccda102b8..96e99e1611 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index 831d2164a4..23996fa182 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index ef6a265c04..0fb5b1e096 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index 90e5a72249..f688d324b7 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/version: {{ .Values.image.fluentd.tag }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index 2803ca5045..2eade45641 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -11,7 +11,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 7e7d55b408..70fca1d4ea 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -11,7 +11,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index b30c6c0596..04aa58b6d8 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -11,7 +11,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index 768366cc5d..dbd09eeb0a 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -11,7 +11,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-k8s-cluster-receiver app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index 84aa99640e..840b118cd8 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} type: Opaque diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index b82eca7bf4..0d47c4264c 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -10,7 +10,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} users: diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 92e903ac2f..7d00a390de 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -11,7 +11,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/component: otel-collector app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index bf7295932d..0fa282471f 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -16,7 +16,6 @@ metadata: heritage: {{ .Release.Service }} app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Service }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.serviceAccount.annotations }} From 05c7928e5deb9862b6df9f12dcbd242d06bd1128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 14 Oct 2021 11:55:47 +0200 Subject: [PATCH 10/13] Define common labels in _helpers.tpl --- .../splunk-otel-collector/templates/_helpers.tpl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index ece2100618..0e7cfd8202 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -247,3 +247,14 @@ Create an identifier for multiline logs configuration. {{- end }} {{- $key | trimSuffix "_" }} {{- end -}} + +{{/* +Common labels shared by all Kubernetes objects in this chart. +*/}} +{{- define "splunk-otel-collector.commonLabels" -}} +app.kubernetes.io/name: {{ include "splunk-otel-collector.name" . }} +helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +app.kubernetes.io/instance: {{ .Release.Name }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end -}} From 1915c858584d2f1dbb80e61502e14d09b52543ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Thu, 14 Oct 2021 12:12:16 +0200 Subject: [PATCH 11/13] Replace individual labels with common labels * app.kubernetes.io/name * app.kubernetes.io/managed-by * app.kubernetes.io/instance * app.kubernetes.io/version * helm.sh/chart --- .../splunk-otel-collector/templates/clusterRole.yaml | 5 +---- .../splunk-otel-collector/templates/clusterRoleBinding.yaml | 5 +---- .../templates/configmap-fluentd-cri.yaml | 5 +---- .../templates/configmap-fluentd-json.yaml | 5 +---- .../splunk-otel-collector/templates/configmap-fluentd.yaml | 5 +---- .../templates/configmap-otel-agent.yaml | 5 +---- .../templates/configmap-otel-collector.yaml | 5 +---- .../templates/configmap-otel-k8s-cluster-receiver.yaml | 5 +---- helm-charts/splunk-otel-collector/templates/daemonset.yaml | 6 +----- .../templates/deployment-collector.yaml | 6 +----- .../templates/deployment-k8s-cluster-receiver.yaml | 6 +----- .../splunk-otel-collector/templates/pdb-collector.yaml | 5 +---- .../templates/pdb-k8s-cluster-receiver.yaml | 5 +---- helm-charts/splunk-otel-collector/templates/secret.yaml | 5 +---- .../templates/securityContextContraints.yaml | 5 +---- helm-charts/splunk-otel-collector/templates/service.yaml | 5 +---- .../splunk-otel-collector/templates/serviceAccount.yaml | 5 +---- 17 files changed, 17 insertions(+), 71 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml index 8586c300e4..0e96cd07de 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRole.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRole.yaml @@ -3,14 +3,11 @@ kind: ClusterRole metadata: name: {{ template "splunk-otel-collector.fullname" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} rules: {{- if eq .Values.distro "openshift" }} - apiGroups: diff --git a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml index a63cf589eb..3ca4cd188a 100644 --- a/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml +++ b/helm-charts/splunk-otel-collector/templates/clusterRoleBinding.yaml @@ -3,14 +3,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: {{ template "splunk-otel-collector.fullname" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml index d87d08ca5c..72e7f8e6fb 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-cri.yaml @@ -7,14 +7,11 @@ kind: ConfigMap metadata: name: {{ template "splunk-otel-collector.fullname" . }}-fluentd-cri labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: source.containers.parse.conf: |- diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml index 202184a417..4c21cf7f13 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd-json.yaml @@ -7,14 +7,11 @@ kind: ConfigMap metadata: name: {{ template "splunk-otel-collector.fullname" . }}-fluentd-json labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: source.containers.parse.conf: |- @type json diff --git a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml index fae57d76bf..146e825351 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-fluentd.yaml @@ -4,14 +4,11 @@ kind: ConfigMap metadata: name: {{ template "splunk-otel-collector.fullname" . }}-fluentd labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: fluent.conf: |- @include system.conf diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml index 96e99e1611..b57d18429c 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-agent.yaml @@ -4,14 +4,11 @@ kind: ConfigMap metadata: name: {{ template "splunk-otel-collector.fullname" . }}-otel-agent labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: relay: | {{- $config := include "splunk-otel-collector.otelAgentConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml index 23996fa182..7c7a89717c 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-collector.yaml @@ -4,14 +4,11 @@ kind: ConfigMap metadata: name: {{ template "splunk-otel-collector.fullname" . }}-otel-collector labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: relay: | {{- $config := include "splunk-otel-collector.otelCollectorConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml index 0fb5b1e096..35b5094b71 100644 --- a/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/configmap-otel-k8s-cluster-receiver.yaml @@ -4,14 +4,11 @@ kind: ConfigMap metadata: name: {{ template "splunk-otel-collector.fullname" . }}-otel-k8s-cluster-receiver labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: relay: | {{- $config := include "splunk-otel-collector.otelK8sClusterReceiverConfig" . | fromYaml }} diff --git a/helm-charts/splunk-otel-collector/templates/daemonset.yaml b/helm-charts/splunk-otel-collector/templates/daemonset.yaml index f688d324b7..0ef007b912 100644 --- a/helm-charts/splunk-otel-collector/templates/daemonset.yaml +++ b/helm-charts/splunk-otel-collector/templates/daemonset.yaml @@ -4,15 +4,11 @@ kind: DaemonSet metadata: name: {{ template "splunk-otel-collector.fullname" . }}-agent labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/version: {{ .Values.image.fluentd.tag }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if and (eq (include "splunk-otel-collector.logsEnabled" .) "true") .Values.fluentd.enabled }} engine: fluentd {{- end }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml index 2eade45641..e55fa4c83e 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-collector.yaml @@ -4,17 +4,13 @@ kind: Deployment metadata: name: {{ template "splunk-otel-collector.fullname" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} component: otel-collector chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: otel-collector - app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.otelCollector.annotations }} annotations: {{- toYaml .Values.otelCollector.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml index 70fca1d4ea..1247a20d04 100644 --- a/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/deployment-k8s-cluster-receiver.yaml @@ -4,17 +4,13 @@ kind: Deployment metadata: name: {{ template "splunk-otel-collector.fullname" . }}-k8s-cluster-receiver labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} component: otel-k8s-cluster-receiver chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: otel-k8s-cluster-receiver - app.kubernetes.io/managed-by: {{ .Release.Service }} - app.kubernetes.io/version: {{ .Values.image.otelcol.tag }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.otelK8sClusterReceiver.annotations }} annotations: {{- toYaml .Values.otelK8sClusterReceiver.annotations | nindent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml index 04aa58b6d8..a842934b98 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-collector.yaml @@ -4,16 +4,13 @@ kind: PodDisruptionBudget metadata: name: {{ template "splunk-otel-collector.fullname" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} component: otel-collector chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: otel-collector - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml index dbd09eeb0a..8dcc81f7e9 100644 --- a/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml +++ b/helm-charts/splunk-otel-collector/templates/pdb-k8s-cluster-receiver.yaml @@ -4,16 +4,13 @@ kind: PodDisruptionBudget metadata: name: {{ template "splunk-otel-collector.fullname" . }}-otel-k8s-cluster-receiver labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} component: otel-k8s-cluster-receiver chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: otel-k8s-cluster-receiver - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} spec: selector: matchLabels: diff --git a/helm-charts/splunk-otel-collector/templates/secret.yaml b/helm-charts/splunk-otel-collector/templates/secret.yaml index 840b118cd8..3d97a53e45 100644 --- a/helm-charts/splunk-otel-collector/templates/secret.yaml +++ b/helm-charts/splunk-otel-collector/templates/secret.yaml @@ -4,14 +4,11 @@ kind: Secret metadata: name: {{ template "splunk-otel-collector.secret" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} type: Opaque data: {{- if (eq (include "splunk-otel-collector.splunkO11yEnabled" .) "true") }} diff --git a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml index 0d47c4264c..287ba0c8b0 100644 --- a/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml +++ b/helm-charts/splunk-otel-collector/templates/securityContextContraints.yaml @@ -4,14 +4,11 @@ apiVersion: security.openshift.io/v1 metadata: name: {{ template "splunk-otel-collector.serviceAccountName" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} users: - system:serviceaccount:{{ .Release.Namespace }}:{{ template "splunk-otel-collector.serviceAccountName" . }} priority: 10 diff --git a/helm-charts/splunk-otel-collector/templates/service.yaml b/helm-charts/splunk-otel-collector/templates/service.yaml index 7d00a390de..9991a3fb3b 100644 --- a/helm-charts/splunk-otel-collector/templates/service.yaml +++ b/helm-charts/splunk-otel-collector/templates/service.yaml @@ -4,16 +4,13 @@ kind: Service metadata: name: {{ template "splunk-otel-collector.fullname" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} component: otel-collector chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/component: otel-collector - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- with .Values.service.annotations }} annotations: {{ toYaml . | trim | indent 4 }} diff --git a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml index 0fa282471f..6938f0c2fe 100644 --- a/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml +++ b/helm-charts/splunk-otel-collector/templates/serviceAccount.yaml @@ -10,14 +10,11 @@ kind: ServiceAccount metadata: name: {{ template "splunk-otel-collector.serviceAccountName" . }} labels: + {{- include "splunk-otel-collector.commonLabels" . | nindent 4 }} app: {{ template "splunk-otel-collector.name" . }} chart: {{ template "splunk-otel-collector.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} - app.kubernetes.io/name: {{ template "splunk-otel-collector.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} {{- if .Values.serviceAccount.annotations }} annotations: {{- toYaml .Values.serviceAccount.annotations | nindent 4 }} From 02cbdae0995dffe0455a948e74083aba5e72268f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Fri, 15 Oct 2021 09:31:01 +0200 Subject: [PATCH 12/13] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c327f59fbd..f8a9b9855b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). to the end of the list. Applying this change in an EC2 or Azure environment may change the `host.name` dimension and the resource ID dimension on some MTSes, possibly causing detectors to fire. +- Add recommended Kubernetes labels (#217) ## [0.36.2] - 2021-10-08 From 2f90216d3848f0b6b809fa99840e7f8a0998eb4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Lindh=C3=A9?= Date: Fri, 15 Oct 2021 09:31:41 +0200 Subject: [PATCH 13/13] make render --- rendered/manifests/agent-only/clusterRole.yaml | 5 +++++ rendered/manifests/agent-only/clusterRoleBinding.yaml | 5 +++++ rendered/manifests/agent-only/configmap-fluentd-cri.yaml | 5 +++++ rendered/manifests/agent-only/configmap-fluentd-json.yaml | 5 +++++ rendered/manifests/agent-only/configmap-fluentd.yaml | 5 +++++ rendered/manifests/agent-only/configmap-otel-agent.yaml | 5 +++++ .../agent-only/configmap-otel-k8s-cluster-receiver.yaml | 5 +++++ rendered/manifests/agent-only/daemonset.yaml | 7 ++++++- .../agent-only/deployment-k8s-cluster-receiver.yaml | 8 +++++++- rendered/manifests/agent-only/secret.yaml | 5 +++++ rendered/manifests/agent-only/serviceAccount.yaml | 5 +++++ rendered/manifests/gateway-only/clusterRole.yaml | 5 +++++ rendered/manifests/gateway-only/clusterRoleBinding.yaml | 5 +++++ .../manifests/gateway-only/configmap-otel-collector.yaml | 5 +++++ rendered/manifests/gateway-only/deployment-collector.yaml | 8 +++++++- rendered/manifests/gateway-only/secret.yaml | 5 +++++ rendered/manifests/gateway-only/service.yaml | 6 ++++++ rendered/manifests/gateway-only/serviceAccount.yaml | 5 +++++ rendered/manifests/logs-only/clusterRole.yaml | 5 +++++ rendered/manifests/logs-only/clusterRoleBinding.yaml | 5 +++++ rendered/manifests/logs-only/configmap-fluentd-cri.yaml | 5 +++++ rendered/manifests/logs-only/configmap-fluentd-json.yaml | 5 +++++ rendered/manifests/logs-only/configmap-fluentd.yaml | 5 +++++ rendered/manifests/logs-only/configmap-otel-agent.yaml | 5 +++++ rendered/manifests/logs-only/daemonset.yaml | 7 ++++++- rendered/manifests/logs-only/secret.yaml | 5 +++++ rendered/manifests/logs-only/serviceAccount.yaml | 5 +++++ rendered/manifests/metrics-only/clusterRole.yaml | 5 +++++ rendered/manifests/metrics-only/clusterRoleBinding.yaml | 5 +++++ rendered/manifests/metrics-only/configmap-otel-agent.yaml | 5 +++++ .../metrics-only/configmap-otel-k8s-cluster-receiver.yaml | 5 +++++ rendered/manifests/metrics-only/daemonset.yaml | 7 ++++++- .../metrics-only/deployment-k8s-cluster-receiver.yaml | 8 +++++++- rendered/manifests/metrics-only/secret.yaml | 5 +++++ rendered/manifests/metrics-only/serviceAccount.yaml | 5 +++++ rendered/manifests/traces-only/clusterRole.yaml | 5 +++++ rendered/manifests/traces-only/clusterRoleBinding.yaml | 5 +++++ rendered/manifests/traces-only/configmap-otel-agent.yaml | 5 +++++ rendered/manifests/traces-only/daemonset.yaml | 7 ++++++- rendered/manifests/traces-only/secret.yaml | 5 +++++ rendered/manifests/traces-only/serviceAccount.yaml | 5 +++++ 41 files changed, 216 insertions(+), 7 deletions(-) diff --git a/rendered/manifests/agent-only/clusterRole.yaml b/rendered/manifests/agent-only/clusterRole.yaml index 8847a6b9a6..e40094ec63 100644 --- a/rendered/manifests/agent-only/clusterRole.yaml +++ b/rendered/manifests/agent-only/clusterRole.yaml @@ -5,6 +5,11 @@ kind: ClusterRole metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/clusterRoleBinding.yaml b/rendered/manifests/agent-only/clusterRoleBinding.yaml index 83d8ec94ef..deee00a717 100644 --- a/rendered/manifests/agent-only/clusterRoleBinding.yaml +++ b/rendered/manifests/agent-only/clusterRoleBinding.yaml @@ -5,6 +5,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml index 198ae1a177..a6324169fe 100644 --- a/rendered/manifests/agent-only/configmap-fluentd-cri.yaml +++ b/rendered/manifests/agent-only/configmap-fluentd-cri.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-fluentd-cri labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/configmap-fluentd-json.yaml b/rendered/manifests/agent-only/configmap-fluentd-json.yaml index e42f4e1a67..931b2ab89f 100644 --- a/rendered/manifests/agent-only/configmap-fluentd-json.yaml +++ b/rendered/manifests/agent-only/configmap-fluentd-json.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-fluentd-json labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/configmap-fluentd.yaml b/rendered/manifests/agent-only/configmap-fluentd.yaml index ccdf2d72b2..6f83539fab 100644 --- a/rendered/manifests/agent-only/configmap-fluentd.yaml +++ b/rendered/manifests/agent-only/configmap-fluentd.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-fluentd labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/configmap-otel-agent.yaml b/rendered/manifests/agent-only/configmap-otel-agent.yaml index 1b6a265f60..9d5bf0fc67 100644 --- a/rendered/manifests/agent-only/configmap-otel-agent.yaml +++ b/rendered/manifests/agent-only/configmap-otel-agent.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml index 2bc17eaaa6..48fc53a725 100644 --- a/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/agent-only/configmap-otel-k8s-cluster-receiver.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-k8s-cluster-receiver labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/daemonset.yaml b/rendered/manifests/agent-only/daemonset.yaml index 6fd971ae12..26baacdd84 100644 --- a/rendered/manifests/agent-only/daemonset.yaml +++ b/rendered/manifests/agent-only/daemonset.yaml @@ -5,6 +5,11 @@ kind: DaemonSet metadata: name: default-splunk-otel-collector-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default @@ -23,7 +28,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 51921f8718ecd04b0b4460ae64f90a96e656feceace1262cf3a137423b12aaaa + checksum/config: 60d3139aecc5764b3b9f05479265a8031e7f2f61d5b3e79cc68fbaa7513c9125 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml index 591f7e004a..ad88bdbf97 100644 --- a/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/agent-only/deployment-k8s-cluster-receiver.yaml @@ -5,11 +5,17 @@ kind: Deployment metadata: name: default-splunk-otel-collector-k8s-cluster-receiver labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.36.2 release: default heritage: Helm + app.kubernetes.io/component: otel-k8s-cluster-receiver spec: replicas: 1 selector: @@ -24,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: d1121e7fcacdcd3fd90468b9aa670939aeb3676e07725e88a78b4763e40dbea9 + checksum/config: 71a8baf6fdef370ae33a02825ede3c05579c49ae5a99251d22c5295948f71f2b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/rendered/manifests/agent-only/secret.yaml b/rendered/manifests/agent-only/secret.yaml index dab19d6a72..4054af9250 100644 --- a/rendered/manifests/agent-only/secret.yaml +++ b/rendered/manifests/agent-only/secret.yaml @@ -5,6 +5,11 @@ kind: Secret metadata: name: splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/agent-only/serviceAccount.yaml b/rendered/manifests/agent-only/serviceAccount.yaml index 066b72512a..3f956c46a1 100644 --- a/rendered/manifests/agent-only/serviceAccount.yaml +++ b/rendered/manifests/agent-only/serviceAccount.yaml @@ -5,6 +5,11 @@ kind: ServiceAccount metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/gateway-only/clusterRole.yaml b/rendered/manifests/gateway-only/clusterRole.yaml index 8847a6b9a6..e40094ec63 100644 --- a/rendered/manifests/gateway-only/clusterRole.yaml +++ b/rendered/manifests/gateway-only/clusterRole.yaml @@ -5,6 +5,11 @@ kind: ClusterRole metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/gateway-only/clusterRoleBinding.yaml b/rendered/manifests/gateway-only/clusterRoleBinding.yaml index 83d8ec94ef..deee00a717 100644 --- a/rendered/manifests/gateway-only/clusterRoleBinding.yaml +++ b/rendered/manifests/gateway-only/clusterRoleBinding.yaml @@ -5,6 +5,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/gateway-only/configmap-otel-collector.yaml b/rendered/manifests/gateway-only/configmap-otel-collector.yaml index c7e48322d2..f43318b283 100644 --- a/rendered/manifests/gateway-only/configmap-otel-collector.yaml +++ b/rendered/manifests/gateway-only/configmap-otel-collector.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/gateway-only/deployment-collector.yaml b/rendered/manifests/gateway-only/deployment-collector.yaml index 9740e2e02d..63f056171b 100644 --- a/rendered/manifests/gateway-only/deployment-collector.yaml +++ b/rendered/manifests/gateway-only/deployment-collector.yaml @@ -5,11 +5,17 @@ kind: Deployment metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.36.2 release: default heritage: Helm + app.kubernetes.io/component: otel-collector spec: replicas: 3 selector: @@ -24,7 +30,7 @@ spec: component: otel-collector release: default annotations: - checksum/config: 3217fdd65d970829babbacd162049ad76cf1f3c5a48a183edf4f1961a5912467 + checksum/config: 99817e28e0152b32b7d3b8a2d8a8222422c4ba70eabe7020b0f6895b66a11417 spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/rendered/manifests/gateway-only/secret.yaml b/rendered/manifests/gateway-only/secret.yaml index dab19d6a72..4054af9250 100644 --- a/rendered/manifests/gateway-only/secret.yaml +++ b/rendered/manifests/gateway-only/secret.yaml @@ -5,6 +5,11 @@ kind: Secret metadata: name: splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/gateway-only/service.yaml b/rendered/manifests/gateway-only/service.yaml index b64424a211..44de5cdf8f 100644 --- a/rendered/manifests/gateway-only/service.yaml +++ b/rendered/manifests/gateway-only/service.yaml @@ -5,11 +5,17 @@ kind: Service metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector component: otel-collector chart: splunk-otel-collector-0.36.2 release: default heritage: Helm + app.kubernetes.io/component: otel-collector spec: type: ClusterIP ports: diff --git a/rendered/manifests/gateway-only/serviceAccount.yaml b/rendered/manifests/gateway-only/serviceAccount.yaml index 066b72512a..3f956c46a1 100644 --- a/rendered/manifests/gateway-only/serviceAccount.yaml +++ b/rendered/manifests/gateway-only/serviceAccount.yaml @@ -5,6 +5,11 @@ kind: ServiceAccount metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/clusterRole.yaml b/rendered/manifests/logs-only/clusterRole.yaml index 8847a6b9a6..e40094ec63 100644 --- a/rendered/manifests/logs-only/clusterRole.yaml +++ b/rendered/manifests/logs-only/clusterRole.yaml @@ -5,6 +5,11 @@ kind: ClusterRole metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/clusterRoleBinding.yaml b/rendered/manifests/logs-only/clusterRoleBinding.yaml index 83d8ec94ef..deee00a717 100644 --- a/rendered/manifests/logs-only/clusterRoleBinding.yaml +++ b/rendered/manifests/logs-only/clusterRoleBinding.yaml @@ -5,6 +5,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/configmap-fluentd-cri.yaml b/rendered/manifests/logs-only/configmap-fluentd-cri.yaml index 198ae1a177..a6324169fe 100644 --- a/rendered/manifests/logs-only/configmap-fluentd-cri.yaml +++ b/rendered/manifests/logs-only/configmap-fluentd-cri.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-fluentd-cri labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/configmap-fluentd-json.yaml b/rendered/manifests/logs-only/configmap-fluentd-json.yaml index e42f4e1a67..931b2ab89f 100644 --- a/rendered/manifests/logs-only/configmap-fluentd-json.yaml +++ b/rendered/manifests/logs-only/configmap-fluentd-json.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-fluentd-json labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/configmap-fluentd.yaml b/rendered/manifests/logs-only/configmap-fluentd.yaml index ccdf2d72b2..6f83539fab 100644 --- a/rendered/manifests/logs-only/configmap-fluentd.yaml +++ b/rendered/manifests/logs-only/configmap-fluentd.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-fluentd labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/configmap-otel-agent.yaml b/rendered/manifests/logs-only/configmap-otel-agent.yaml index d4785c4802..37938dc702 100644 --- a/rendered/manifests/logs-only/configmap-otel-agent.yaml +++ b/rendered/manifests/logs-only/configmap-otel-agent.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/daemonset.yaml b/rendered/manifests/logs-only/daemonset.yaml index 8f2b8e2940..7f9b0624b8 100644 --- a/rendered/manifests/logs-only/daemonset.yaml +++ b/rendered/manifests/logs-only/daemonset.yaml @@ -5,6 +5,11 @@ kind: DaemonSet metadata: name: default-splunk-otel-collector-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default @@ -23,7 +28,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 778f27dfec219b4e13f09cafa850f51b3772ab5c07852da710f99f9bd3e7f485 + checksum/config: 65a8be8d2186f5e9d42c05ecdde2d99626572d7f7180f643a57d8e01d0380e1e spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/logs-only/secret.yaml b/rendered/manifests/logs-only/secret.yaml index dab19d6a72..4054af9250 100644 --- a/rendered/manifests/logs-only/secret.yaml +++ b/rendered/manifests/logs-only/secret.yaml @@ -5,6 +5,11 @@ kind: Secret metadata: name: splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/logs-only/serviceAccount.yaml b/rendered/manifests/logs-only/serviceAccount.yaml index 066b72512a..3f956c46a1 100644 --- a/rendered/manifests/logs-only/serviceAccount.yaml +++ b/rendered/manifests/logs-only/serviceAccount.yaml @@ -5,6 +5,11 @@ kind: ServiceAccount metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/metrics-only/clusterRole.yaml b/rendered/manifests/metrics-only/clusterRole.yaml index 8847a6b9a6..e40094ec63 100644 --- a/rendered/manifests/metrics-only/clusterRole.yaml +++ b/rendered/manifests/metrics-only/clusterRole.yaml @@ -5,6 +5,11 @@ kind: ClusterRole metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/metrics-only/clusterRoleBinding.yaml b/rendered/manifests/metrics-only/clusterRoleBinding.yaml index 83d8ec94ef..deee00a717 100644 --- a/rendered/manifests/metrics-only/clusterRoleBinding.yaml +++ b/rendered/manifests/metrics-only/clusterRoleBinding.yaml @@ -5,6 +5,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/metrics-only/configmap-otel-agent.yaml b/rendered/manifests/metrics-only/configmap-otel-agent.yaml index 866ecc2488..5b6c65b335 100644 --- a/rendered/manifests/metrics-only/configmap-otel-agent.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-agent.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml index 2bc17eaaa6..48fc53a725 100644 --- a/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-only/configmap-otel-k8s-cluster-receiver.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-k8s-cluster-receiver labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/metrics-only/daemonset.yaml b/rendered/manifests/metrics-only/daemonset.yaml index 5230d3bf1b..a0137226bc 100644 --- a/rendered/manifests/metrics-only/daemonset.yaml +++ b/rendered/manifests/metrics-only/daemonset.yaml @@ -5,6 +5,11 @@ kind: DaemonSet metadata: name: default-splunk-otel-collector-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default @@ -22,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: e2e2b7c254278fdf9c8a9db509098560a2f318a70e5d2c2201ed7d611161b978 + checksum/config: dcdc5ca667bf7450e852932fad0bbb145e823d8ed327965c5670552217f491a9 spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml index 591f7e004a..ad88bdbf97 100644 --- a/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml +++ b/rendered/manifests/metrics-only/deployment-k8s-cluster-receiver.yaml @@ -5,11 +5,17 @@ kind: Deployment metadata: name: default-splunk-otel-collector-k8s-cluster-receiver labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector component: otel-k8s-cluster-receiver chart: splunk-otel-collector-0.36.2 release: default heritage: Helm + app.kubernetes.io/component: otel-k8s-cluster-receiver spec: replicas: 1 selector: @@ -24,7 +30,7 @@ spec: component: otel-k8s-cluster-receiver release: default annotations: - checksum/config: d1121e7fcacdcd3fd90468b9aa670939aeb3676e07725e88a78b4763e40dbea9 + checksum/config: 71a8baf6fdef370ae33a02825ede3c05579c49ae5a99251d22c5295948f71f2b spec: serviceAccountName: default-splunk-otel-collector nodeSelector: diff --git a/rendered/manifests/metrics-only/secret.yaml b/rendered/manifests/metrics-only/secret.yaml index dab19d6a72..4054af9250 100644 --- a/rendered/manifests/metrics-only/secret.yaml +++ b/rendered/manifests/metrics-only/secret.yaml @@ -5,6 +5,11 @@ kind: Secret metadata: name: splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/metrics-only/serviceAccount.yaml b/rendered/manifests/metrics-only/serviceAccount.yaml index 066b72512a..3f956c46a1 100644 --- a/rendered/manifests/metrics-only/serviceAccount.yaml +++ b/rendered/manifests/metrics-only/serviceAccount.yaml @@ -5,6 +5,11 @@ kind: ServiceAccount metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/traces-only/clusterRole.yaml b/rendered/manifests/traces-only/clusterRole.yaml index 8847a6b9a6..e40094ec63 100644 --- a/rendered/manifests/traces-only/clusterRole.yaml +++ b/rendered/manifests/traces-only/clusterRole.yaml @@ -5,6 +5,11 @@ kind: ClusterRole metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/traces-only/clusterRoleBinding.yaml b/rendered/manifests/traces-only/clusterRoleBinding.yaml index 83d8ec94ef..deee00a717 100644 --- a/rendered/manifests/traces-only/clusterRoleBinding.yaml +++ b/rendered/manifests/traces-only/clusterRoleBinding.yaml @@ -5,6 +5,11 @@ apiVersion: rbac.authorization.k8s.io/v1 metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/traces-only/configmap-otel-agent.yaml b/rendered/manifests/traces-only/configmap-otel-agent.yaml index c5a66d1deb..db108e634c 100644 --- a/rendered/manifests/traces-only/configmap-otel-agent.yaml +++ b/rendered/manifests/traces-only/configmap-otel-agent.yaml @@ -5,6 +5,11 @@ kind: ConfigMap metadata: name: default-splunk-otel-collector-otel-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/traces-only/daemonset.yaml b/rendered/manifests/traces-only/daemonset.yaml index 35735a13e2..b9c835e12b 100644 --- a/rendered/manifests/traces-only/daemonset.yaml +++ b/rendered/manifests/traces-only/daemonset.yaml @@ -5,6 +5,11 @@ kind: DaemonSet metadata: name: default-splunk-otel-collector-agent labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default @@ -22,7 +27,7 @@ spec: app: splunk-otel-collector release: default annotations: - checksum/config: 16e127a372cceaa9f9d836ba5c046bedb7045b4ad9150443234137db58fd62b4 + checksum/config: 97b72bac9de79ee49d241f1d6aa738c2ca2614b637d0df1daec7d5ff7dd9155c spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet diff --git a/rendered/manifests/traces-only/secret.yaml b/rendered/manifests/traces-only/secret.yaml index dab19d6a72..4054af9250 100644 --- a/rendered/manifests/traces-only/secret.yaml +++ b/rendered/manifests/traces-only/secret.yaml @@ -5,6 +5,11 @@ kind: Secret metadata: name: splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default diff --git a/rendered/manifests/traces-only/serviceAccount.yaml b/rendered/manifests/traces-only/serviceAccount.yaml index 066b72512a..3f956c46a1 100644 --- a/rendered/manifests/traces-only/serviceAccount.yaml +++ b/rendered/manifests/traces-only/serviceAccount.yaml @@ -5,6 +5,11 @@ kind: ServiceAccount metadata: name: default-splunk-otel-collector labels: + app.kubernetes.io/name: splunk-otel-collector + helm.sh/chart: splunk-otel-collector-0.36.2 + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/instance: default + app.kubernetes.io/version: "" app: splunk-otel-collector chart: splunk-otel-collector-0.36.2 release: default