Infer csi-usage based on csi-driver-availability

cmd/troubleshoot/dynakube_test.go

@@ -8,7 +8,6 @@ import (
 	"github.com/Dynatrace/dynatrace-operator/pkg/api/shared/value"
 	"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta3/dynakube"
 	"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta3/dynakube/activegate"
-	"github.com/Dynatrace/dynatrace-operator/pkg/util/address"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"
@@ -378,14 +377,12 @@ func (builder *testDynaKubeBuilder) withCloudNativeCodeModulesImage(image string
 func (builder *testDynaKubeBuilder) withApplicationMonitoringCodeModulesImage(image string) *testDynaKubeBuilder {
 	if builder.dynakube.Spec.OneAgent.ApplicationMonitoring != nil {
 		builder.dynakube.Spec.OneAgent.ApplicationMonitoring.CodeModulesImage = image
-		builder.dynakube.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = address.Of(true)
 	} else {
 		builder.dynakube.Spec.OneAgent.ApplicationMonitoring = &dynakube.ApplicationMonitoringSpec{
 			AppInjectionSpec: dynakube.AppInjectionSpec{
 				InitResources:    &corev1.ResourceRequirements{},
 				CodeModulesImage: image,
 			},
-			UseCSIDriver: address.Of(true),
 		}
 	}
 	builder.dynakube.Status.CodeModules.ImageID = image

config/crd/bases/dynatrace.com_dynakubes.yaml

@@ -5053,11 +5053,6 @@ spec:
                             type: object
                         type: object
                         x-kubernetes-map-type: atomic
-                      useCSIDriver:
-                        description: Set if you want to use the CSIDriver. Don't enable
-                          it if you do not have access to Kubernetes nodes or if you
-                          lack privileges.
-                        type: boolean
                       version:
                         description: Use a specific OneAgent CodeModule version. Defaults
                           to the latest version from the Dynatrace cluster.

config/helm/chart/default/templates/Common/crd/dynatrace-operator-crd.yaml

@@ -5065,11 +5065,6 @@ spec:
                             type: object
                         type: object
                         x-kubernetes-map-type: atomic
-                      useCSIDriver:
-                        description: Set if you want to use the CSIDriver. Don't enable
-                          it if you do not have access to Kubernetes nodes or if you
-                          lack privileges.
-                        type: boolean
                       version:
                         description: Use a specific OneAgent CodeModule version. Defaults
                           to the latest version from the Dynatrace cluster.

config/helm/chart/default/templates/Common/csi/daemonset.yaml

@@ -170,6 +170,9 @@ spec:
           - name: MAX_UNMOUNTED_VOLUME_AGE
             value: "{{ .Values.csidriver.maxUnmountedVolumeAge}}"
           {{- end }}
+        envFrom:
+          - configMapRef:
+              name: install-config
         {{- include "dynatrace-operator.startupProbe" . | nindent 8 }}
         {{- if not .Values.debug }}
         livenessProbe:

config/helm/chart/default/templates/Common/operator/install-config.yaml

@@ -8,6 +8,7 @@ metadata:
 data:
   modules.json: |
     {
+      "csiDriver": {{ .Values.csidriver.enabled }},
       "activeGate": {{ .Values.rbac.activeGate.create }},
       "oneAgent": {{ .Values.rbac.oneAgent.create }},
       "extensions": {{ .Values.rbac.extensions.create }},

config/helm/chart/default/tests/Common/csi/daemonset_test.yaml

@@ -236,6 +236,9 @@ tests:
                       fieldRef:
                         apiVersion: v1
                         fieldPath: metadata.namespace
+                envFrom:
+                  - configMapRef:
+                      name: install-config
                 image: image-name
                 imagePullPolicy: Always
                 startupProbe:

config/helm/chart/default/tests/Common/operator/install-config_test.yaml

@@ -17,6 +17,7 @@ tests:
           value:
             modules.json: |
                 {
+                  "csiDriver": true,
                   "activeGate": true,
                   "oneAgent": true,
                   "extensions": true,
@@ -27,6 +28,7 @@ tests:
                 }
   - it: ConfigMap should respect the set values
     set:
+      csidriver.enabled: false
       rbac.oneAgent.create: false
       rbac.logMonitoring.create: false
       rbac.edgeConnect.create: false
@@ -48,6 +50,7 @@ tests:
           value:
             modules.json: |
                 {
+                  "csiDriver": false,
                   "activeGate": false,
                   "oneAgent": false,
                   "extensions": false,

pkg/api/v1beta1/dynakube/convert_from.go

@@ -5,9 +5,12 @@ import (
 
 	"github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta3/dynakube"
 	"github.com/Dynatrace/dynatrace-operator/pkg/util/address"
+	"github.com/Dynatrace/dynatrace-operator/pkg/util/installconfig"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
+var isEnabledModules = installconfig.GetModules()
+
 // ConvertFrom converts v1beta3 to v1beta1.
 func (dst *DynaKube) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*dynakube.DynaKube)
@@ -57,7 +60,7 @@ func (dst *DynaKube) fromOneAgentSpec(src *dynakube.DynaKube) {
 		dst.Spec.OneAgent.ApplicationMonitoring = &ApplicationMonitoringSpec{}
 		dst.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec = *fromAppInjectSpec(src.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec)
 		dst.Spec.OneAgent.ApplicationMonitoring.Version = src.Spec.OneAgent.ApplicationMonitoring.Version
-		dst.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = src.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver
+		dst.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = &isEnabledModules.CSIDriver
 	}
 }
 

pkg/api/v1beta1/dynakube/convert_from_test.go

@@ -175,7 +175,7 @@ func compareCloudNativeSpec(t *testing.T, oldSpec CloudNativeFullStackSpec, newS
 
 func compareApplicationMonitoringSpec(t *testing.T, oldSpec ApplicationMonitoringSpec, newSpec dynakube.ApplicationMonitoringSpec) {
 	compareAppInjectionSpec(t, oldSpec.AppInjectionSpec, newSpec.AppInjectionSpec)
-	assert.Equal(t, *oldSpec.UseCSIDriver, *newSpec.UseCSIDriver)
+	assert.Equal(t, *oldSpec.UseCSIDriver, isEnabledModules.CSIDriver)
 	assert.Equal(t, oldSpec.Version, newSpec.Version)
 }
 
@@ -343,7 +343,6 @@ func getNewCloudNativeSpec() dynakube.CloudNativeFullStackSpec {
 func getNewApplicationMonitoringSpec() dynakube.ApplicationMonitoringSpec {
 	return dynakube.ApplicationMonitoringSpec{
 		AppInjectionSpec: getNewAppInjectionSpec(),
-		UseCSIDriver:     address.Of(true),
 		Version:          "app-monitoring-version",
 	}
 }

pkg/api/v1beta1/dynakube/convert_to.go

@@ -68,10 +68,6 @@ func (src *DynaKube) toOneAgentSpec(dst *dynakube.DynaKube) {
 		dst.Spec.OneAgent.ApplicationMonitoring = &dynakube.ApplicationMonitoringSpec{}
 		dst.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec = *toAppInjectSpec(src.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec)
 		dst.Spec.OneAgent.ApplicationMonitoring.Version = src.Spec.OneAgent.ApplicationMonitoring.Version
-
-		if src.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver != nil {
-			dst.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = src.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver
-		}
 	}
 }
 

pkg/api/v1beta2/dynakube/convert_from.go

@@ -2,9 +2,12 @@ package dynakube
 
 import (
 	v1beta3 "github.com/Dynatrace/dynatrace-operator/pkg/api/v1beta3/dynakube"
+	"github.com/Dynatrace/dynatrace-operator/pkg/util/installconfig"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
+var isEnabledModules = installconfig.GetModules()
+
 // ConvertFrom converts from the Hub version (v1beta3) to this version (v1beta3).
 func (dst *DynaKube) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*v1beta3.DynaKube)
@@ -52,7 +55,7 @@ func (dst *DynaKube) fromOneAgentSpec(src *v1beta3.DynaKube) {
 		dst.Spec.OneAgent.ApplicationMonitoring = &ApplicationMonitoringSpec{}
 		dst.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec = *fromAppInjectSpec(src.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec)
 		dst.Spec.OneAgent.ApplicationMonitoring.Version = src.Spec.OneAgent.ApplicationMonitoring.Version
-		dst.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = src.IsAppMonitoringWithCSI()
+		dst.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = isEnabledModules.CSIDriver
 	}
 }
 

pkg/api/v1beta2/dynakube/convert_from_test.go

@@ -166,7 +166,7 @@ func compareCloudNativeSpec(t *testing.T, oldSpec CloudNativeFullStackSpec, newS
 
 func compareApplicationMonitoringSpec(t *testing.T, oldSpec ApplicationMonitoringSpec, newSpec dynakube.ApplicationMonitoringSpec) {
 	compareAppInjectionSpec(t, oldSpec.AppInjectionSpec, newSpec.AppInjectionSpec)
-	assert.Equal(t, oldSpec.UseCSIDriver, *newSpec.UseCSIDriver)
+	assert.Equal(t, oldSpec.UseCSIDriver, isEnabledModules.CSIDriver)
 	assert.Equal(t, oldSpec.Version, newSpec.Version)
 }
 
@@ -334,7 +334,6 @@ func getNewCloudNativeSpec() dynakube.CloudNativeFullStackSpec {
 func getNewApplicationMonitoringSpec() dynakube.ApplicationMonitoringSpec {
 	return dynakube.ApplicationMonitoringSpec{
 		AppInjectionSpec: getNewAppInjectionSpec(),
-		UseCSIDriver:     address.Of(true),
 		Version:          "app-monitoring-version",
 	}
 }

pkg/api/v1beta2/dynakube/convert_to.go

@@ -79,7 +79,6 @@ func (src *DynaKube) toOneAgentSpec(dst *dynakube.DynaKube) {
 		dst.Spec.OneAgent.ApplicationMonitoring = &dynakube.ApplicationMonitoringSpec{}
 		dst.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec = *toAppInjectSpec(src.Spec.OneAgent.ApplicationMonitoring.AppInjectionSpec)
 		dst.Spec.OneAgent.ApplicationMonitoring.Version = src.Spec.OneAgent.ApplicationMonitoring.Version
-		dst.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver = &src.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver
 	}
 }
 

pkg/api/v1beta3/dynakube/feature_flags.go

@@ -67,7 +67,6 @@ const (
 	AnnotationInjectionFailurePolicy       = AnnotationFeaturePrefix + "injection-failure-policy"
 	AnnotationFeatureInitContainerSeccomp  = AnnotationFeaturePrefix + "init-container-seccomp-profile"
 	AnnotationFeatureEnforcementMode       = AnnotationFeaturePrefix + "enforcement-mode"
-	AnnotationFeatureReadOnlyOneAgent      = AnnotationFeaturePrefix + "oneagent-readonly-host-fs"
 
 	// CSI.
 	AnnotationFeatureMaxFailedCsiMountAttempts = AnnotationFeaturePrefix + "max-csi-mount-attempts"
@@ -193,13 +192,6 @@ func (dk *DynaKube) FeatureAutomaticInjection() bool {
 	return dk.getFeatureFlagRaw(AnnotationFeatureAutomaticInjection) != falsePhrase
 }
 
-// FeatureReadOnlyOneAgent controls whether the host agent is run in readonly mode.
-// In Host Monitoring disabling readonly mode, also disables the use of a CSI volume.
-// Not compatible with Classic Fullstack.
-func (dk *DynaKube) FeatureReadOnlyOneAgent() bool {
-	return dk.getFeatureFlagRaw(AnnotationFeatureReadOnlyOneAgent) != falsePhrase
-}
-
 // FeatureEnableMultipleOsAgentsOnNode is a feature flag to enable multiple osagents running on the same host.
 func (dk *DynaKube) FeatureEnableMultipleOsAgentsOnNode() bool {
 	return dk.getFeatureFlagRaw(AnnotationFeatureMultipleOsAgentsOnNode) == truePhrase

pkg/api/v1beta3/dynakube/oneagent_props.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Dynatrace/dynatrace-operator/pkg/api"
 	"github.com/Dynatrace/dynatrace-operator/pkg/util/dtversion"
+	"github.com/Dynatrace/dynatrace-operator/pkg/util/installconfig"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -17,6 +18,10 @@ const (
 	DefaultOneAgentImageRegistrySubPath   = "/linux/oneagent"
 )
 
+func (dk *DynaKube) IsCSIAvailable() bool {
+	return installconfig.GetModules().CSIDriver
+}
+
 // ApplicationMonitoringMode returns true when application only section is used.
 func (dk *DynaKube) ApplicationMonitoringMode() bool {
 	return dk.Spec.OneAgent != OneAgentSpec{} && dk.Spec.OneAgent.ApplicationMonitoring != nil
@@ -77,30 +82,8 @@ func (dk *DynaKube) OneAgentConnectionInfoConfigMapName() string {
 	return dk.Name + OneAgentConnectionInfoConfigMapSuffix
 }
 
-func (dk *DynaKube) NeedsReadOnlyOneAgents() bool {
-	return (dk.HostMonitoringMode() || dk.CloudNativeFullstackMode()) &&
-		dk.FeatureReadOnlyOneAgent()
-}
-
-func (dk *DynaKube) IsAppMonitoringWithCSI() bool {
-	if !dk.ApplicationMonitoringMode() {
-		return false
-	}
-
-	defaultUseCSIDriver := false
-	if dk.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver == nil {
-		return defaultUseCSIDriver
-	}
-
-	return *dk.Spec.OneAgent.ApplicationMonitoring.UseCSIDriver
-}
-
-func (dk *DynaKube) NeedsCSIDriver() bool {
-	isAppMonitoringWithCSI := dk.IsAppMonitoringWithCSI()
-
-	isHostMonitoringWithCSI := dk.HostMonitoringMode() && dk.FeatureReadOnlyOneAgent()
-
-	return dk.CloudNativeFullstackMode() || isAppMonitoringWithCSI || isHostMonitoringWithCSI
+func (dk *DynaKube) UseReadOnlyOneAgents() bool {
+	return dk.CloudNativeFullstackMode() || (dk.HostMonitoringMode() && dk.IsCSIAvailable())
 }
 
 func (dk *DynaKube) NeedAppInjection() bool {
@@ -171,7 +154,7 @@ func (dk *DynaKube) CodeModulesImage() string {
 func (dk *DynaKube) CustomCodeModulesImage() string {
 	if dk.CloudNativeFullstackMode() {
 		return dk.Spec.OneAgent.CloudNativeFullStack.CodeModulesImage
-	} else if dk.ApplicationMonitoringMode() && dk.NeedsCSIDriver() {
+	} else if dk.ApplicationMonitoringMode() && dk.IsCSIAvailable() {
 		return dk.Spec.OneAgent.ApplicationMonitoring.CodeModulesImage
 	}