Create kubernetes-monitoring rbac's if only KSPM is enabled (#4125) (#…

…4126)
Dynatrace · Nov 29, 2024 · 4d01742 · 4d01742
1 parent 12cb27e
commit 4d01742
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/...art/default/templates/Common/kubernetes-monitoring/clusterrole-kubernetes-monitoring.yaml b/...art/default/templates/Common/kubernetes-monitoring/clusterrole-kubernetes-monitoring.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.activeGate.create }}
+{{- if or (eq .Values.rbac.activeGate.create true) (eq .Values.rbac.kspm.create true) }}
 # Copyright 2021 Dynatrace LLC
 
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/.../default/templates/Common/kubernetes-monitoring/serviceaccount-kubernetes-monitoring.yaml b/.../default/templates/Common/kubernetes-monitoring/serviceaccount-kubernetes-monitoring.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.activeGate.create }}
+{{- if or (eq .Values.rbac.activeGate.create true) (eq .Values.rbac.kspm.create true) }}
 # Copyright 2021 Dynatrace LLC
 
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/...rt/default/tests/Common/kubernetes-monitoring/clusterrole-kubernetes-monitoring_test.yaml b/...rt/default/tests/Common/kubernetes-monitoring/clusterrole-kubernetes-monitoring_test.yaml
@@ -149,9 +149,17 @@ tests:
             kind: ServiceAccount
             name: dynatrace-kubernetes-monitoring
             namespace: NAMESPACE
+  - it: should exist if only kspm is turned on
+    set:
+      rbac.activeGate.create: false
+      rbac.kspm.create: true
+    asserts:
+      - hasDocuments:
+          count: 2
   - it: shouldn't exist if turned off
     set:
       rbac.activeGate.create: false
+      rbac.kspm.create: false
     asserts:
       - hasDocuments:
-        count: 0
+          count: 0
diff --git a/...default/tests/Common/kubernetes-monitoring/serviceaccount-kubernetes-monitoring_test.yaml b/...default/tests/Common/kubernetes-monitoring/serviceaccount-kubernetes-monitoring_test.yaml
@@ -28,9 +28,17 @@ tests:
           path: metadata.annotations
           value:
             test: test
+  - it: should exist if only kspm is turned on
+    set:
+      rbac.activeGate.create: false
+      rbac.kspm.create: true
+    asserts:
+      - isKind:
+          of: ServiceAccount
   - it: shouldn't exist if turned off
     set:
       rbac.activeGate.create: false
+      rbac.kspm.create: false
     asserts:
       - hasDocuments:
-        count: 0
+          count: 0
diff --git a/pkg/api/validation/dynakube/modules.go b/pkg/api/validation/dynakube/modules.go
@@ -25,7 +25,7 @@ func isOneAgentModuleDisabled(_ context.Context, v *Validator, dk *dynakube.Dyna
 }
 
 func isActiveGateModuleDisabled(_ context.Context, v *Validator, dk *dynakube.DynaKube) string {
-	if dk.ActiveGate().IsEnabled() && !v.modules.ActiveGate {
+	if dk.ActiveGate().IsEnabled() && !v.modules.ActiveGate && !v.modules.KSPM {
 		return errorActiveGateModuleDisabled
 	}
 

diff --git a/pkg/controllers/dynakube/kspm/daemonset/reconciler.go b/pkg/controllers/dynakube/kspm/daemonset/reconciler.go
@@ -18,7 +18,6 @@ import (
 )
 
 const (
-	nameSuffix         = "-node-config-collector"
 	serviceAccountName = "dynatrace-node-config-collector"
 )