Renamed collector from default to contrib

rcastley · rcastley · commit 36f31a52dc55 · 2024-12-04T10:23:16.000Z
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/clusterRole.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/clusterRole.yaml
@@ -3,7 +3,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: default-otel-collector
+  name: otel-contrib-collector
   labels:
     app.kubernetes.io/name: otel-collector
     app: otel-collector
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/clusterRoleBinding.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/clusterRoleBinding.yaml
@@ -3,15 +3,15 @@
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
-  name: default-otel-collector
+  name: otel-contrib-collector
   labels:
     app.kubernetes.io/name: otel-collector
     app: otel-collector
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: default-otel-collector
+  name: otel-contrib-collector
 subjects:
 - kind: ServiceAccount
-  name: default-otel-collector
+  name: otel-contrib-collector
   namespace: default
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/configmap-agent.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/configmap-agent.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: default-otel-collector-otel-agent
+  name: otel-contrib-collector-otel-agent
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/configmap-and-secrets.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/configmap-and-secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: otel-configmap
+  name: otel-contrib-configmap
 data:
   splunk_trace_url: "https://ingest.[REALM].signalfx.com/v2/trace/otlp"
   splunk_api_url: "https://api.[REALM].signalfx.com"
@@ -16,7 +16,7 @@ data:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: default-otel-collector
+  name: otel-contrib-collector
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/configmap-cluster-receiver.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/configmap-cluster-receiver.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: default-otel-collector-otel-k8s-cluster-receiver
+  name: otel-contrib-collector-otel-k8s-cluster-receiver
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/daemonset.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/daemonset.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: default-otel-collector-agent
+  name: otel-contrib-collector-agent
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
@@ -31,7 +31,7 @@ spec:
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccount: default-otel-collector
-      serviceAccountName: default-otel-collector
+      serviceAccountName: otel-contrib-collector
       nodeSelector:
         kubernetes.io/os: linux
       tolerations:
@@ -84,17 +84,17 @@ spec:
           - name: SPLUNK_API_URL
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: splunk_api_url
           - name: SPLUNK_INGEST_URL
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: splunk_ingest_url
           - name: K8S_CLUSTER_NAME
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: k8s_cluster_name
           - name: K8S_NODE_IP
             valueFrom:
@@ -121,22 +121,22 @@ spec:
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom:
               secretKeyRef:
-                name: default-otel-collector
+                name: otel-contrib-collector
                 key: splunk_observability_access_token
           - name: SPLUNK_HEC_URL
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: splunk_hec_url
           - name: SPLUNK_HEC_TOKEN
             valueFrom:
               secretKeyRef:
-                name: default-otel-collector
+                name: otel-contrib-collector
                 key: splunk_hec_token
           - name: SPLUNK_INDEX
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: splunk_index
         readinessProbe:
           httpGet:
@@ -154,7 +154,7 @@ spec:
           runAsUser: 0
         volumeMounts:
         - mountPath: /conf
-          name: otel-configmap
+          name: otel-contrib-configmap
         - mountPath: /hostfs/dev
           name: host-dev
           readOnly: true
@@ -203,9 +203,9 @@ spec:
       - name: varlibdockercontainers
         hostPath:
           path: /var/lib/docker/containers
-      - name: otel-configmap
+      - name: otel-contrib-configmap
         configMap:
-          name: default-otel-collector-otel-agent
+          name: otel-contrib-collector-otel-agent
           items:
             - key: relay
               path: relay.yaml
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/deployment-cluster-receiver.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/deployment-cluster-receiver.yaml
@@ -3,7 +3,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: default-otel-collector-k8s-cluster-receiver
+  name: otel-contrib-collector-k8s-cluster-receiver
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
@@ -26,7 +26,7 @@ spec:
       annotations:
         checksum/config: 4b62199b9bbcfb6f7dc9ae4dd0ec6fc45a2a5953d7002ed90e884883b6f0ad4b
     spec:
-      serviceAccountName: default-otel-collector
+      serviceAccountName: otel-contrib-collector
       nodeSelector:
           kubernetes.io/os: linux
       containers:
@@ -46,17 +46,17 @@ spec:
           - name: SPLUNK_API_URL
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: splunk_api_url
           - name: SPLUNK_INGEST_URL
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: splunk_ingest_url
           - name: K8S_CLUSTER_NAME
             valueFrom:
               configMapKeyRef:
-                name: otel-configmap
+                name: otel-contrib-configmap
                 key: k8s_cluster_name
           - name: K8S_POD_IP
             valueFrom:
@@ -78,7 +78,7 @@ spec:
           - name: SPLUNK_OBSERVABILITY_ACCESS_TOKEN
             valueFrom:
               secretKeyRef:
-                name: default-otel-collector
+                name: otel-contrib-collector
                 key: splunk_observability_access_token
         readinessProbe:
           httpGet:
@@ -99,7 +99,7 @@ spec:
       volumes:
       - name: collector-configmap
         configMap:
-          name: default-otel-collector-otel-k8s-cluster-receiver
+          name: otel-contrib-collector-otel-k8s-cluster-receiver
           items:
             - key: relay
               path: relay.yaml
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/service-agent.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/service-agent.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: default-otel-collector-agent
+  name: otel-contrib-collector-agent
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
diff --git a/workshop/otel-contrib-splunk-demo/k8s_manifests/serviceAccount.yaml b/workshop/otel-contrib-splunk-demo/k8s_manifests/serviceAccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: true
 metadata:
-  name: default-otel-collector
+  name: otel-contrib-collector
   namespace: default
   labels:
     app.kubernetes.io/name: otel-collector
diff --git a/workshop/otel-contrib-splunk-demo/opentelemetry-demo-values.yaml b/workshop/otel-contrib-splunk-demo/opentelemetry-demo-values.yaml
@@ -12,7 +12,7 @@ default:
     - name: DEPLOYMENT_ENVIRONMENT
       valueFrom:
         configMapKeyRef:
-          name: otel-configmap
+          name: otel-contrib-configmap
           key: deployment_environment
     - name: OTEL_RESOURCE_ATTRIBUTES
       value: 'service.name=$(OTEL_SERVICE_NAME),service.namespace=opentelemetry-demo,service.version={{ .Chart.AppVersion }},deployment.environment=$(DEPLOYMENT_ENVIRONMENT)'
