Move collector service account template to separate collector …

config/helm/chart/default/templates/Common/extensions-opentelemetry-collector/clusterrole-extensions-opentelemetry-collector.yaml → config/helm/chart/default/templates/Common/extensions/clusterole-extensions-prometheus.yaml

@@ -18,7 +18,7 @@ metadata:
   name: dynatrace-extensions-prometheus
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "dynatrace-operator.extensionsOpenTelemetryCollectorLabels" . | nindent 4 }}
+    {{- include "dynatrace-operator.openTelemetryCollectorLabels" . | nindent 4 }}
 rules:
   - apiGroups:
       - ""
@@ -66,13 +66,13 @@ metadata:
   name: dynatrace-extensions-prometheus
   namespace: {{ .Release.Namespace }}
   labels:
-    {{- include "dynatrace-operator.extensionsOpenTelemetryCollectorLabels" . | nindent 4 }}
+    {{- include "dynatrace-operator.openTelemetryCollectorLabels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
   name: dynatrace-extensions-prometheus
 subjects:
   - kind: ServiceAccount
-    name: dynatrace-extensions-collector
+    name: dynatrace-opentelemetry-collector
     namespace: {{ .Release.Namespace }}
 {{ end }}

config/helm/chart/default/templates/Common/extensions-opentelemetry-collector/serviceaccount-extensions-opentelemetry-collector.yaml → config/helm/chart/default/templates/Common/opentelemetry-collector/serviceaccount-opentelemetry-collector.yaml

@@ -15,12 +15,12 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: dynatrace-extensions-collector
+  name: dynatrace-opentelemetry-collector
   namespace: {{ .Release.Namespace }}
   {{- if .Values.rbac.extensions.annotations }}
   annotations:
     {{- toYaml .Values.rbac.extensions.annotations | nindent 4 }}
   {{- end }}
   labels:
-    {{- include "dynatrace-operator.extensionsOpenTelemetryCollectorLabels" . | nindent 4 }}
+    {{- include "dynatrace-operator.openTelemetryCollectorLabels" . | nindent 4 }}
 {{ end }}

config/helm/chart/default/templates/_labels.tpl

@@ -110,9 +110,9 @@ app.kubernetes.io/component: dynatrace-extensions-controller
 {{- end -}}
 
 {{/*
-Extensions OpenTelemetry Collector (OTelC) labels
+OpenTelemetry Collector (OTelC) labels
 */}}
-{{- define "dynatrace-operator.extensionsOpenTelemetryCollectorLabels" -}}
+{{- define "dynatrace-operator.openTelemetryCollectorLabels" -}}
 {{ include "dynatrace-operator.commonLabels" . }}
 app.kubernetes.io/component: dynatrace-extensions-collector
 {{- end -}}

config/helm/chart/default/tests/Common/extensions-opentelemetry-collector/clusterrole-extensions-opentelemetry-collector_test.yaml → config/helm/chart/default/tests/Common/extensions/clusterrole-extensions-prometheus_test.yaml

@@ -1,6 +1,6 @@
-suite: test clusterrole for the extensions OpenTelemetry collector
+suite: test clusterrole for the dynatrace OpenTelemetry collector
 templates:
-  - Common/extensions-opentelemetry-collector/clusterrole-extensions-opentelemetry-collector.yaml
+  - Common/extensions/clusterole-extensions-prometheus.yaml
 tests:
   - it: ClusterRole and ClusterRoleBinding exists
     asserts:

config/helm/chart/default/tests/Common/extensions-controller/role-extensions-controller_test.yaml → config/helm/chart/default/tests/Common/extensions/role-extensions-controller_test.yaml

@@ -1,6 +1,6 @@
 suite: test role for the extensions controller
 templates:
-  - Common/extensions-controller/role-extensions-controller.yaml
+  - Common/extensions/role-extensions-controller.yaml
 tests:
   - it: should not exist by default
     asserts:

config/helm/chart/default/tests/Common/extensions-controller/serviceaccount-extensions-controller_test.yaml → config/helm/chart/default/tests/Common/extensions/serviceaccount-extensions-controller_test.yaml

@@ -1,6 +1,6 @@
 suite: test service account for extensions controller
 templates:
-  - Common/extensions-controller/serviceaccount-extensions-controller.yaml
+  - Common/extensions/serviceaccount-extensions-controller.yaml
 tests:
   - it: should exist
     set:

config/helm/chart/default/tests/Common/extensions-opentelemetry-collector/serviceaccount-extensions-opentelemetry-collector_test.yaml → config/helm/chart/default/tests/Common/opentelemetry-collector/serviceaccount-opentelemetry-collector_test.yaml

@@ -1,6 +1,6 @@
-suite: test service account for extensions OpenTelemetry collector
+suite: test service account for dynatrace OpenTelemetry collector
 templates:
-  - Common/extensions-opentelemetry-collector/serviceaccount-extensions-opentelemetry-collector.yaml
+  - Common/opentelemetry-collector/serviceaccount-opentelemetry-collector.yaml
 tests:
   - it: should exist
     set:
@@ -10,7 +10,7 @@ tests:
           of: ServiceAccount
       - equal:
           path: metadata.name
-          value: dynatrace-extensions-collector
+          value: dynatrace-opentelemetry-collector
       - equal:
           path: metadata.namespace
           value: NAMESPACE