From 5c260235048876cae342c4ded3b2d08d5621062b Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Thu, 3 Aug 2023 17:46:16 +0530 Subject: [PATCH 1/6] fix: create secret name from release instead of chart --- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../add-sampler/rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/deployment-gateway.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/deployment-gateway.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../crio-logging/rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- examples/default/rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../default/rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/deployment-gateway.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/deployment-gateway.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../only-metrics/rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../only-traces/rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../use-proxy/rendered_manifests/daemonset.yaml | 2 +- .../deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- .../splunk-otel-collector/templates/_helpers.tpl | 14 ++++++++++++-- 86 files changed, 97 insertions(+), 87 deletions(-) diff --git a/examples/add-filter-processor/rendered_manifests/daemonset.yaml b/examples/add-filter-processor/rendered_manifests/daemonset.yaml index c31af9934e..48ed649f34 100644 --- a/examples/add-filter-processor/rendered_manifests/daemonset.yaml +++ b/examples/add-filter-processor/rendered_manifests/daemonset.yaml @@ -186,7 +186,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-filter-processor/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml b/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml +++ b/examples/add-filter-processor/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml index 046c051f79..7afa239770 100644 --- a/examples/add-receiver-creator/rendered_manifests/daemonset.yaml +++ b/examples/add-receiver-creator/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-receiver-creator/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml b/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml +++ b/examples/add-receiver-creator/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/add-sampler/rendered_manifests/daemonset.yaml b/examples/add-sampler/rendered_manifests/daemonset.yaml index 37b7110940..7104ceb6ff 100644 --- a/examples/add-sampler/rendered_manifests/daemonset.yaml +++ b/examples/add-sampler/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/add-sampler/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/add-sampler/rendered_manifests/secret-splunk.yaml b/examples/add-sampler/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/add-sampler/rendered_manifests/secret-splunk.yaml +++ b/examples/add-sampler/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/autodetect-istio/rendered_manifests/daemonset.yaml b/examples/autodetect-istio/rendered_manifests/daemonset.yaml index 841bf36392..064c54e0b9 100644 --- a/examples/autodetect-istio/rendered_manifests/daemonset.yaml +++ b/examples/autodetect-istio/rendered_manifests/daemonset.yaml @@ -187,7 +187,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml index 0d235b35b6..3c3add67d1 100644 --- a/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/autodetect-istio/rendered_manifests/deployment-cluster-receiver.yaml @@ -70,7 +70,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml b/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml +++ b/examples/autodetect-istio/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/collector-agent-only/rendered_manifests/daemonset.yaml b/examples/collector-agent-only/rendered_manifests/daemonset.yaml index 3ac4de476f..f44ad7a743 100644 --- a/examples/collector-agent-only/rendered_manifests/daemonset.yaml +++ b/examples/collector-agent-only/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml b/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-agent-only/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/collector-all-modes/rendered_manifests/daemonset.yaml b/examples/collector-all-modes/rendered_manifests/daemonset.yaml index 8f806276c4..d4ef07a704 100644 --- a/examples/collector-all-modes/rendered_manifests/daemonset.yaml +++ b/examples/collector-all-modes/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml index 1339526536..40275359e1 100644 --- a/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-all-modes/rendered_manifests/deployment-gateway.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token ports: - name: http-forwarder diff --git a/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml b/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-all-modes/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml index 9349e287f2..44dec6ce54 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml b/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-cluster-receiver-only/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml index 88571b6e83..841972f062 100644 --- a/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml +++ b/examples/collector-gateway-only/rendered_manifests/deployment-gateway.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token ports: - name: http-forwarder diff --git a/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml b/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml +++ b/examples/collector-gateway-only/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/crio-logging/rendered_manifests/daemonset.yaml b/examples/crio-logging/rendered_manifests/daemonset.yaml index 3ac4de476f..f44ad7a743 100644 --- a/examples/crio-logging/rendered_manifests/daemonset.yaml +++ b/examples/crio-logging/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/crio-logging/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/crio-logging/rendered_manifests/secret-splunk.yaml b/examples/crio-logging/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/crio-logging/rendered_manifests/secret-splunk.yaml +++ b/examples/crio-logging/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/default/rendered_manifests/daemonset.yaml b/examples/default/rendered_manifests/daemonset.yaml index 3ac4de476f..f44ad7a743 100644 --- a/examples/default/rendered_manifests/daemonset.yaml +++ b/examples/default/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/default/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/default/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/default/rendered_manifests/secret-splunk.yaml b/examples/default/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/default/rendered_manifests/secret-splunk.yaml +++ b/examples/default/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/distribution-aks/rendered_manifests/daemonset.yaml b/examples/distribution-aks/rendered_manifests/daemonset.yaml index f13217d53c..c3d9fd5f10 100644 --- a/examples/distribution-aks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-aks/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml index a3a7b8e48b..48192fa7ff 100644 --- a/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-aks/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/distribution-aks/rendered_manifests/secret-splunk.yaml b/examples/distribution-aks/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/distribution-aks/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-aks/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml index 8f4b8664d2..0a6b82433e 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-cluster-receiver.yaml @@ -102,7 +102,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml index d574807851..08517defc3 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/deployment-gateway.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token ports: - name: http-forwarder diff --git a/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml b/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-eks-fargate/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/distribution-eks/rendered_manifests/daemonset.yaml b/examples/distribution-eks/rendered_manifests/daemonset.yaml index d4fa8d675a..a7138aaf53 100644 --- a/examples/distribution-eks/rendered_manifests/daemonset.yaml +++ b/examples/distribution-eks/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml index 77570b4112..376454d54e 100644 --- a/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-eks/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/distribution-eks/rendered_manifests/secret-splunk.yaml b/examples/distribution-eks/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/distribution-eks/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-eks/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml index ce907f0382..e5f24f3cb8 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/daemonset.yaml @@ -114,7 +114,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml index ee1e66d539..101a97c074 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml b/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-gke-autopilot/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/distribution-gke/rendered_manifests/daemonset.yaml b/examples/distribution-gke/rendered_manifests/daemonset.yaml index 89e136db96..b5827d0e06 100644 --- a/examples/distribution-gke/rendered_manifests/daemonset.yaml +++ b/examples/distribution-gke/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml index ee1e66d539..101a97c074 100644 --- a/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-gke/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/distribution-gke/rendered_manifests/secret-splunk.yaml b/examples/distribution-gke/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/distribution-gke/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-gke/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/distribution-openshift/rendered_manifests/daemonset.yaml b/examples/distribution-openshift/rendered_manifests/daemonset.yaml index 4fb9502089..bab3ee6a7f 100644 --- a/examples/distribution-openshift/rendered_manifests/daemonset.yaml +++ b/examples/distribution-openshift/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml index 7fb8291dfa..24c63ec270 100644 --- a/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/distribution-openshift/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml b/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml +++ b/examples/distribution-openshift/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-network-explorer/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/enable-network-explorer/rendered_manifests/deployment-gateway.yaml b/examples/enable-network-explorer/rendered_manifests/deployment-gateway.yaml index 1339526536..40275359e1 100644 --- a/examples/enable-network-explorer/rendered_manifests/deployment-gateway.yaml +++ b/examples/enable-network-explorer/rendered_manifests/deployment-gateway.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token ports: - name: http-forwarder diff --git a/examples/enable-network-explorer/rendered_manifests/secret-splunk.yaml b/examples/enable-network-explorer/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/enable-network-explorer/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-network-explorer/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml index 2fe78c1b5b..25040ec4df 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/daemonset.yaml @@ -186,7 +186,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml index 46b2cdf732..afaef35acf 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-operator-and-auto-instrumentation/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml index 6943b80b43..c42ab24fc2 100644 --- a/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/daemonset.yaml @@ -109,7 +109,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: diff --git a/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml b/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml +++ b/examples/enable-trace-sampling/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml index 599dab279a..b4a13b0a4a 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml b/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml +++ b/examples/enabled-pprof-extension/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml index 4a333557b2..f25a0360ac 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/daemonset.yaml @@ -186,7 +186,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/fluentd-multiline-logs-java-stack-traces/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml index 2da54a9b75..59d91c13ab 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/daemonset.yaml @@ -158,7 +158,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml index 3652af158b..b8337e4fc7 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/deployment-cluster-receiver.yaml @@ -71,7 +71,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml b/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml +++ b/examples/kubernetes-windows-nodes/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml index 02bf9e4bb1..f3da5e2921 100644 --- a/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/daemonset.yaml @@ -166,7 +166,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: diff --git a/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml b/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-fluentd/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/only-logs-otel/rendered_manifests/daemonset.yaml b/examples/only-logs-otel/rendered_manifests/daemonset.yaml index 924c5ac608..860448d6f7 100644 --- a/examples/only-logs-otel/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-otel/rendered_manifests/daemonset.yaml @@ -134,7 +134,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: diff --git a/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml b/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-otel/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml index 5dcd8ca509..5ece1e1ef2 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/daemonset.yaml @@ -134,7 +134,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: diff --git a/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml b/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml +++ b/examples/only-logs-with-extra-file-logs/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml index 640a1e7280..b33b8aec98 100644 --- a/examples/only-metrics-platform/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics-platform/rendered_manifests/daemonset.yaml @@ -97,7 +97,7 @@ spec: - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_platform_hec_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml index 85815b16cb..a6b43dddec 100644 --- a/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics-platform/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_platform_hec_token readinessProbe: httpGet: diff --git a/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml b/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml index 1ba3a00de7..fccd0dc72d 100644 --- a/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml +++ b/examples/only-metrics-platform/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/only-metrics/rendered_manifests/daemonset.yaml b/examples/only-metrics/rendered_manifests/daemonset.yaml index a1f846cab8..e503268fc2 100644 --- a/examples/only-metrics/rendered_manifests/daemonset.yaml +++ b/examples/only-metrics/rendered_manifests/daemonset.yaml @@ -97,7 +97,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/only-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/only-metrics/rendered_manifests/secret-splunk.yaml b/examples/only-metrics/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/only-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/only-metrics/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/only-traces/rendered_manifests/daemonset.yaml b/examples/only-traces/rendered_manifests/daemonset.yaml index ab95a7d441..f456da6ed0 100644 --- a/examples/only-traces/rendered_manifests/daemonset.yaml +++ b/examples/only-traces/rendered_manifests/daemonset.yaml @@ -109,7 +109,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: diff --git a/examples/only-traces/rendered_manifests/secret-splunk.yaml b/examples/only-traces/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/only-traces/rendered_manifests/secret-splunk.yaml +++ b/examples/only-traces/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml index 7fb9d35bf0..3374e50ce8 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml index f8a5706c2e..ee18616347 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml +++ b/examples/route-data-through-gateway-deployed-separately/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml index 7332e6aae4..749c3558d8 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/daemonset.yaml @@ -166,7 +166,7 @@ spec: - name: SPLUNK_PLATFORM_HEC_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_platform_hec_token readinessProbe: diff --git a/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml b/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml index 1ba3a00de7..fccd0dc72d 100644 --- a/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml +++ b/examples/splunk-enterprise-index-routing/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/examples/use-proxy/rendered_manifests/daemonset.yaml b/examples/use-proxy/rendered_manifests/daemonset.yaml index edfd8286fe..13db9f7a8e 100644 --- a/examples/use-proxy/rendered_manifests/daemonset.yaml +++ b/examples/use-proxy/rendered_manifests/daemonset.yaml @@ -113,7 +113,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml index 6618677209..39737a282c 100644 --- a/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/use-proxy/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token - name: HTTPS_PROXY value: 192.168.0.10 diff --git a/examples/use-proxy/rendered_manifests/secret-splunk.yaml b/examples/use-proxy/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/use-proxy/rendered_manifests/secret-splunk.yaml +++ b/examples/use-proxy/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0 diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index 5053b7ef7c..d39602a34a 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -149,7 +149,12 @@ Define name for the Splunk Secret {{- if .Values.secret.name -}} {{- printf "%s" .Values.secret.name -}} {{- else -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} +{{ $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{- end -}} {{- end -}} @@ -160,7 +165,12 @@ Define name for the etcd Secret {{- if .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- printf "%s" .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- else -}} -{{- default .Chart.Name .Values.nameOverride | printf "%s-etcd" | trunc 63 | trimSuffix "-" -}} +{{ $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- end -}} {{- end -}} {{- end -}} From d3c102506b59ef56c2497ba798802a814b81a0a4 Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Thu, 3 Aug 2023 17:49:26 +0530 Subject: [PATCH 2/6] fix: update etcd --- helm-charts/splunk-otel-collector/templates/_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index d39602a34a..25944193a5 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -169,7 +169,7 @@ Define name for the etcd Secret {{- if contains $name .Release.Name -}} {{- .Release.Name | trunc 63 | trimSuffix "-" -}} {{- else -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- printf "%s-%s-etcd" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} {{- end -}} From 6a7fc93dcb2fc756961ec19c47fc7a9d2b28c3d5 Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Mon, 7 Aug 2023 14:50:33 +0530 Subject: [PATCH 3/6] fix: use a helper --- helm-charts/splunk-otel-collector/templates/_helpers.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index 25944193a5..926c9c93f7 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -149,7 +149,7 @@ Define name for the Splunk Secret {{- if .Values.secret.name -}} {{- printf "%s" .Values.secret.name -}} {{- else -}} -{{ $name := default .Chart.Name .Values.nameOverride -}} +{{ $name := (include "splunk-otel-collector.name" .) -}} {{- if contains $name .Release.Name -}} {{- .Release.Name | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -165,7 +165,7 @@ Define name for the etcd Secret {{- if .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- printf "%s" .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- else -}} -{{ $name := default .Chart.Name .Values.nameOverride -}} +{{ $name := (include "splunk-otel-collector.name" .) -}} {{- if contains $name .Release.Name -}} {{- .Release.Name | trunc 63 | trimSuffix "-" -}} {{- else -}} From fa9abd6b1721ad2223e246d7d649d51c6feefa51 Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Tue, 8 Aug 2023 23:42:41 +0530 Subject: [PATCH 4/6] fix: simplify things --- .../splunk-otel-collector/templates/_helpers.tpl | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index 926c9c93f7..416434043f 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -149,14 +149,10 @@ Define name for the Splunk Secret {{- if .Values.secret.name -}} {{- printf "%s" .Values.secret.name -}} {{- else -}} -{{ $name := (include "splunk-otel-collector.name" .) -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} -{{- end -}} {{/* Define name for the etcd Secret @@ -165,14 +161,10 @@ Define name for the etcd Secret {{- if .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- printf "%s" .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- else -}} -{{ $name := (include "splunk-otel-collector.name" .) -}} -{{- if contains $name .Release.Name -}} -{{- .Release.Name | trunc 63 | trimSuffix "-" -}} -{{- else -}} +{{- $name := default .Chart.Name .Values.nameOverride -}} {{- printf "%s-%s-etcd" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} -{{- end -}} {{/* Create the name of the service account to use From 27a52c30099e7aa8aa96bf6c84f933d7a81c1e2a Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Fri, 11 Aug 2023 18:05:19 +0530 Subject: [PATCH 5/6] use existing logic --- .../splunk-otel-collector/templates/_helpers.tpl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/helm-charts/splunk-otel-collector/templates/_helpers.tpl b/helm-charts/splunk-otel-collector/templates/_helpers.tpl index 416434043f..3c196e8f56 100644 --- a/helm-charts/splunk-otel-collector/templates/_helpers.tpl +++ b/helm-charts/splunk-otel-collector/templates/_helpers.tpl @@ -146,12 +146,7 @@ Whether profiling data is enabled (applicable to Splunk Observability only). Define name for the Splunk Secret */}} {{- define "splunk-otel-collector.secret" -}} -{{- if .Values.secret.name -}} -{{- printf "%s" .Values.secret.name -}} -{{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} -{{- end -}} +{{- default (include "splunk-otel-collector.fullname" .) .Values.secret.name }} {{- end -}} {{/* @@ -161,8 +156,8 @@ Define name for the etcd Secret {{- if .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- printf "%s" .Values.agent.controlPlaneMetrics.etcd.secret.name -}} {{- else -}} -{{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s-etcd" .Release.Name $name | trunc 63 | trimSuffix "-" -}} +{{- $name := (include "splunk-otel-collector.fullname" .) -}} +{{- printf "%s-etcd" $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{- end -}} From 1bfbdeadaa30424ce06f497c55f364a4a5672f23 Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Wed, 16 Aug 2023 10:49:44 +0530 Subject: [PATCH 6/6] update examples --- .../rendered_manifests/daemonset.yaml | 2 +- .../rendered_manifests/deployment-cluster-receiver.yaml | 2 +- .../rendered_manifests/secret-splunk.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/kafkametricsreceiver-metrics/rendered_manifests/daemonset.yaml b/examples/kafkametricsreceiver-metrics/rendered_manifests/daemonset.yaml index 7850b7105c..184b84ce95 100644 --- a/examples/kafkametricsreceiver-metrics/rendered_manifests/daemonset.yaml +++ b/examples/kafkametricsreceiver-metrics/rendered_manifests/daemonset.yaml @@ -186,7 +186,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token # Env variables for host metrics receiver - name: HOST_PROC diff --git a/examples/kafkametricsreceiver-metrics/rendered_manifests/deployment-cluster-receiver.yaml b/examples/kafkametricsreceiver-metrics/rendered_manifests/deployment-cluster-receiver.yaml index e00fe7b0e1..18809f7577 100644 --- a/examples/kafkametricsreceiver-metrics/rendered_manifests/deployment-cluster-receiver.yaml +++ b/examples/kafkametricsreceiver-metrics/rendered_manifests/deployment-cluster-receiver.yaml @@ -69,7 +69,7 @@ spec: - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN valueFrom: secretKeyRef: - name: splunk-otel-collector + name: default-splunk-otel-collector key: splunk_observability_access_token readinessProbe: httpGet: diff --git a/examples/kafkametricsreceiver-metrics/rendered_manifests/secret-splunk.yaml b/examples/kafkametricsreceiver-metrics/rendered_manifests/secret-splunk.yaml index 3ceb79302f..5cea81768a 100644 --- a/examples/kafkametricsreceiver-metrics/rendered_manifests/secret-splunk.yaml +++ b/examples/kafkametricsreceiver-metrics/rendered_manifests/secret-splunk.yaml @@ -3,7 +3,7 @@ apiVersion: v1 kind: Secret metadata: - name: splunk-otel-collector + name: default-splunk-otel-collector labels: app.kubernetes.io/name: splunk-otel-collector helm.sh/chart: splunk-otel-collector-0.82.0