add controllerrevisions collection in ksm check for agents > 7.72.x (#2249)

frank-spano · fanny-jiang · web-flow · commit 272a47c9fa84 · 2025-11-17T13:08:58.000-05:00
* add controllerrevisions collection for agents &gt; 7.72.x

* add test coverage for controller revisions

* fix version check, expected to fail e2e if no image override is available and agent is &gt;7.72

* use default agent images if override not present

* removes logging

* Remove explicit controllerrevisions setting

* remove logging

* pass default value to min version func

* controller revisions enabled by default

---------

Co-authored-by: Fanny Jiang &lt;fanny.jiang@datadoghq.com&gt;
diff --git a/cmd/main.go b/cmd/main.go
@@ -378,7 +378,7 @@ func run(opts *options) error {
 
 	if versionInfo != nil {
 		gitVersion := versionInfo.GitVersion
-		if !utils.IsAboveMinVersion(gitVersion, "1.16-0") {
+		if !utils.IsAboveMinVersion(gitVersion, "1.16-0", nil) {
 			setupLog.Error(nil, "Detected Kubernetes version <1.16 which requires CRD version apiextensions.k8s.io/v1beta1. "+
 				"CRDs of this version were removed in v1.10.0.")
 		}
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -97,6 +97,13 @@ rules:
   - apiservices
   verbs:
   - '*'
+- apiGroups:
+  - apps
+  resources:
+  - controllerrevisions
+  verbs:
+  - list
+  - watch
 - apiGroups:
   - apps
   resources:
diff --git a/internal/controller/datadogagent/common/utils.go b/internal/controller/datadogagent/common/utils.go
@@ -142,5 +142,5 @@ func ShouldCreateAgentLocalService(versionInfo *version.Info, forceEnableLocalSe
 		return false
 	}
 	// Service Internal Traffic Policy is enabled by default since 1.22
-	return utils.IsAboveMinVersion(versionInfo.GitVersion, localServiceDefaultMinimumVersion) || forceEnableLocalService
+	return utils.IsAboveMinVersion(versionInfo.GitVersion, localServiceDefaultMinimumVersion, nil) || forceEnableLocalService
 }
diff --git a/internal/controller/datadogagent/feature/apm/feature.go b/internal/controller/datadogagent/feature/apm/feature.go
@@ -388,10 +388,10 @@ func supportsInstrumentationTargets(ddaSpec *v2alpha1.DatadogAgentSpec) bool {
 	// Agent version must >= 7.64.0 to run feature in core agent
 	if nodeAgent, ok := ddaSpec.Override[v2alpha1.ClusterAgentComponentName]; ok {
 		if nodeAgent.Image != nil {
-			return utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), minInstrumentationTargetsVersion)
+			return utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), minInstrumentationTargetsVersion, nil)
 		}
 	}
-	return utils.IsAboveMinVersion(images.ClusterAgentLatestVersion, minInstrumentationTargetsVersion)
+	return utils.IsAboveMinVersion(images.ClusterAgentLatestVersion, minInstrumentationTargetsVersion, nil)
 }
 
 // ManageSingleContainerNodeAgent allows a feature to configure the Agent container for the Node Agent's corev1.PodTemplateSpec
diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap.go b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap.go
@@ -92,6 +92,10 @@ instances:
 		config.WriteString("    - apiservices\n")
 	}
 
+	if collectorOpts.enableControllerRevisions {
+		config.WriteString("    - controllerrevisions\n")
+	}
+
 	if collectorOpts.enableCRD {
 		config.WriteString("    - customresourcedefinitions\n")
 	}
diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go
@@ -30,6 +30,7 @@ instances:
 	optionsWithVPA := collectorOptions{enableVPA: true}
 	optionsWithCRD := collectorOptions{enableCRD: true}
 	optionsWithAPIService := collectorOptions{enableAPIService: true}
+	optionsWithControllerRevisions := collectorOptions{enableControllerRevisions: true}
 
 	// Test custom resources
 	optionsWithCustomResources := collectorOptions{
@@ -159,6 +160,17 @@ instances:
 			},
 			want: buildDefaultConfigMap(owner.GetNamespace(), defaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithAPIService)),
 		},
+		{
+			name: "with ControllerRevisions",
+			fields: fields{
+				owner:                    owner,
+				enable:                   true,
+				runInClusterChecksRunner: true,
+				configConfigMapName:      defaultKubeStateMetricsCoreConf,
+				collectorOpts:            optionsWithControllerRevisions,
+			},
+			want: buildDefaultConfigMap(owner.GetNamespace(), defaultKubeStateMetricsCoreConf, ksmCheckConfig(true, optionsWithControllerRevisions)),
+		},
 		{
 			name: "with custom resources",
 			fields: fields{
diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go
@@ -46,10 +46,11 @@ func buildKSMFeature(options *feature.Options) feature.Feature {
 }
 
 type ksmFeature struct {
-	runInClusterChecksRunner bool
-	collectCRDMetrics        bool
-	collectCrMetrics         []v2alpha1.Resource
-	collectAPIServiceMetrics bool
+	runInClusterChecksRunner   bool
+	collectCRDMetrics          bool
+	collectCrMetrics           []v2alpha1.Resource
+	collectAPIServiceMetrics   bool
+	collectControllerRevisions bool
 
 	rbacSuffix         string
 	serviceAccountName string
@@ -63,9 +64,14 @@ type ksmFeature struct {
 	logger logr.Logger
 }
 
-// Minimum agent version that supports collection of CRD and APIService data
-// Add "-0" so that prerelase versions are considered sufficient. https://github.com/Masterminds/semver#working-with-prerelease-versions
-const crdAPIServiceCollectionMinVersion = "7.46.0-0"
+const (
+	// Minimum agent version that supports collection of CRD and APIService data
+	// Add "-0" so that prerelase versions are considered sufficient. https://github.com/Masterminds/semver#working-with-prerelease-versions
+	crdAPIServiceCollectionMinVersion = "7.46.0-0"
+
+	// Minimum agent version that supports collection of controllerrevisions
+	controllerRevisionsCollectionMinVersion = "7.72.0-0"
+)
 
 // ID returns the ID of the Feature
 func (f *ksmFeature) ID() feature.IDType {
@@ -88,6 +94,10 @@ func (f *ksmFeature) Configure(dda metav1.Object, ddaSpec *v2alpha1.DatadogAgent
 		f.collectCrMetrics = ddaSpec.Features.KubeStateMetricsCore.CollectCrMetrics
 		f.serviceAccountName = constants.GetClusterAgentServiceAccount(dda.GetName(), ddaSpec)
 
+		// Determine CollectControllerRevisions setting
+		// Default to true, then check version requirements
+		f.collectControllerRevisions = true
+
 		// This check will only run in the Cluster Checks Runners or Cluster Agent (not the Node Agent)
 		if ddaSpec.Features.ClusterChecks != nil && apiutils.BoolValue(ddaSpec.Features.ClusterChecks.Enabled) && apiutils.BoolValue(ddaSpec.Features.ClusterChecks.UseClusterChecksRunners) {
 			f.runInClusterChecksRunner = true
@@ -97,17 +107,39 @@ func (f *ksmFeature) Configure(dda metav1.Object, ddaSpec *v2alpha1.DatadogAgent
 			output.ClusterChecksRunner.Containers = []apicommon.AgentContainerName{apicommon.CoreAgentContainerName}
 
 			if ccrOverride, ok := ddaSpec.Override[v2alpha1.ClusterChecksRunnerComponentName]; ok {
-				if ccrOverride.Image != nil && !utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*ccrOverride.Image), crdAPIServiceCollectionMinVersion) {
-					// Disable if image is overridden to an unsupported version
-					f.collectAPIServiceMetrics = false
-					f.collectCRDMetrics = false
+				if ccrOverride.Image != nil {
+					agentVersion := common.GetAgentVersionFromImage(*ccrOverride.Image)
+
+					// CRD and APIService version checks
+					if !utils.IsAboveMinVersion(agentVersion, crdAPIServiceCollectionMinVersion, nil) {
+						f.collectAPIServiceMetrics = false
+						f.collectCRDMetrics = false
+					}
+
+					// ControllerRevisions version check - enable if version supports it
+					fallback := false
+					if !utils.IsAboveMinVersion(agentVersion, controllerRevisionsCollectionMinVersion, &fallback) {
+						f.collectControllerRevisions = false
+					}
 				}
 			}
-		} else if clusterAgentOverride, ok := ddaSpec.Override[v2alpha1.ClusterAgentComponentName]; ok {
-			if clusterAgentOverride.Image != nil && !utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*clusterAgentOverride.Image), crdAPIServiceCollectionMinVersion) {
-				// Disable if image is overridden to an unsupported version
-				f.collectAPIServiceMetrics = false
-				f.collectCRDMetrics = false
+		} else {
+			if clusterAgentOverride, ok := ddaSpec.Override[v2alpha1.ClusterAgentComponentName]; ok {
+				if clusterAgentOverride.Image != nil {
+					agentVersion := common.GetAgentVersionFromImage(*clusterAgentOverride.Image)
+
+					// CRD and APIService version checks
+					if !utils.IsAboveMinVersion(agentVersion, crdAPIServiceCollectionMinVersion, nil) {
+						f.collectAPIServiceMetrics = false
+						f.collectCRDMetrics = false
+					}
+
+					// ControllerRevisions version check - enable if version supports it
+					fallback := false
+					if !utils.IsAboveMinVersion(agentVersion, controllerRevisionsCollectionMinVersion, &fallback) {
+						f.collectControllerRevisions = false
+					}
+				}
 			}
 		}
 
@@ -146,10 +178,11 @@ func (f *ksmFeature) Configure(dda metav1.Object, ddaSpec *v2alpha1.DatadogAgent
 }
 
 type collectorOptions struct {
-	enableVPA        bool
-	enableAPIService bool
-	enableCRD        bool
-	customResources  []v2alpha1.Resource
+	enableVPA                 bool
+	enableAPIService          bool
+	enableCRD                 bool
+	enableControllerRevisions bool
+	customResources           []v2alpha1.Resource
 }
 
 // ManageDependencies allows a feature to manage its dependencies.
@@ -159,10 +192,11 @@ func (f *ksmFeature) ManageDependencies(managers feature.ResourceManagers, provi
 	// OR if the default configMap is needed.
 	pInfo := managers.Store().GetPlatformInfo()
 	collectorOpts := collectorOptions{
-		enableVPA:        pInfo.IsResourceSupported("VerticalPodAutoscaler"),
-		enableAPIService: f.collectAPIServiceMetrics,
-		enableCRD:        f.collectCRDMetrics,
-		customResources:  f.collectCrMetrics,
+		enableVPA:                 pInfo.IsResourceSupported("VerticalPodAutoscaler"),
+		enableAPIService:          f.collectAPIServiceMetrics,
+		enableCRD:                 f.collectCRDMetrics,
+		enableControllerRevisions: f.collectControllerRevisions,
+		customResources:           f.collectCrMetrics,
 	}
 	configCM, err := f.buildKSMCoreConfigMap(collectorOpts)
 	if err != nil {
diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go
@@ -90,6 +90,50 @@ func Test_ksmFeature_Configure(t *testing.T) {
 			ClusterAgent:  ksmClusterAgentWantFunc(true),
 			Agent:         test.NewDefaultComponentTest().WithWantFunc(ksmAgentSingleAgentWantFunc),
 		},
+		{
+			Name: "ksm-core enabled, cluster agent with image >= 7.72.0",
+			DDA: testutils.NewDatadogAgentBuilder().
+				WithKSMEnabled(true).
+				WithClusterAgentImage("gcr.io/datadoghq/agent:7.72.0").
+				Build(),
+			WantConfigure: true,
+			ClusterAgent:  ksmClusterAgentWantFunc(false),
+			Agent:         test.NewDefaultComponentTest().WithWantFunc(ksmAgentNodeWantFunc),
+		},
+		{
+			Name: "ksm-core enabled, cluster agent with image < 7.72.0",
+			DDA: testutils.NewDatadogAgentBuilder().
+				WithKSMEnabled(true).
+				WithClusterAgentImage("gcr.io/datadoghq/agent:7.71.0").
+				Build(),
+			WantConfigure: true,
+			ClusterAgent:  ksmClusterAgentWantFunc(false),
+			Agent:         test.NewDefaultComponentTest().WithWantFunc(ksmAgentNodeWantFunc),
+		},
+		{
+			Name: "ksm-core enabled, cluster checks runner with image >= 7.72.0",
+			DDA: testutils.NewDatadogAgentBuilder().
+				WithKSMEnabled(true).
+				WithClusterChecks(true, true).
+				WithClusterChecksRunnerImage("gcr.io/datadoghq/agent:7.72.0").
+				Build(),
+			WantConfigure:       true,
+			Agent:               test.NewDefaultComponentTest().WithWantFunc(ksmAgentNodeWantFunc),
+			ClusterAgent:        test.NewDefaultComponentTest().WithWantFunc(func(t testing.TB, mgrInterface feature.PodTemplateManagers) {}),
+			ClusterChecksRunner: test.NewDefaultComponentTest().WithWantFunc(func(t testing.TB, mgrInterface feature.PodTemplateManagers) {}),
+		},
+		{
+			Name: "ksm-core enabled, cluster checks runner with image < 7.72.0",
+			DDA: testutils.NewDatadogAgentBuilder().
+				WithKSMEnabled(true).
+				WithClusterChecks(true, true).
+				WithClusterChecksRunnerImage("gcr.io/datadoghq/agent:7.71.0").
+				Build(),
+			WantConfigure:       true,
+			Agent:               test.NewDefaultComponentTest().WithWantFunc(ksmAgentNodeWantFunc),
+			ClusterAgent:        test.NewDefaultComponentTest().WithWantFunc(func(t testing.TB, mgrInterface feature.PodTemplateManagers) {}),
+			ClusterChecksRunner: test.NewDefaultComponentTest().WithWantFunc(func(t testing.TB, mgrInterface feature.PodTemplateManagers) {}),
+		},
 	}
 
 	tests.Run(t, buildKSMFeature)
diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/rbac.go b/internal/controller/datadogagent/feature/kubernetesstatecore/rbac.go
@@ -44,6 +44,7 @@ func getRBACPolicyRules(collectorOpts collectorOptions) []rbacv1.PolicyRule {
 				rbac.DeploymentsResource,
 				rbac.ReplicasetsResource,
 				rbac.StatefulsetsResource,
+				rbac.ControllerRevisionsResource,
 			},
 		},
 		{
diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go
@@ -149,7 +149,7 @@ func (f *orchestratorExplorerFeature) Configure(dda metav1.Object, ddaSpec *v2al
 	reqContainers := []apicommon.AgentContainerName{apicommon.CoreAgentContainerName}
 	// Process Agent is not required as of agent version 7.51.0
 	if nodeAgent, ok := ddaSpec.Override[v2alpha1.NodeAgentComponentName]; ok {
-		if nodeAgent.Image != nil && !utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), NoProcessAgentMinVersion) {
+		if nodeAgent.Image != nil && !utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), NoProcessAgentMinVersion, nil) {
 			f.processAgentRequired = true
 			reqContainers = append(reqContainers, apicommon.ProcessAgentContainerName)
 		}
diff --git a/internal/controller/datadogagent/feature/utils/utils.go b/internal/controller/datadogagent/feature/utils/utils.go
@@ -28,10 +28,10 @@ func agentSupportsRunInCoreAgent(ddaSpec *v2alpha1.DatadogAgentSpec) bool {
 	// Agent version must >= 7.60.0 to run feature in core agent
 	if nodeAgent, ok := ddaSpec.Override[v2alpha1.NodeAgentComponentName]; ok {
 		if nodeAgent.Image != nil {
-			return utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), ProcessConfigRunInCoreAgentMinVersion)
+			return utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), ProcessConfigRunInCoreAgentMinVersion, nil)
 		}
 	}
-	return utils.IsAboveMinVersion(images.AgentLatestVersion, ProcessConfigRunInCoreAgentMinVersion)
+	return utils.IsAboveMinVersion(images.AgentLatestVersion, ProcessConfigRunInCoreAgentMinVersion, nil)
 }
 
 // ShouldRunProcessChecksInCoreAgent determines whether allow process checks to run in core agent based on
diff --git a/internal/controller/datadogagent_controller.go b/internal/controller/datadogagent_controller.go
@@ -176,6 +176,7 @@ type DatadogAgentReconciler struct {
 // +kubebuilder:rbac:groups=apps,resources=replicasets,verbs=list;watch
 // +kubebuilder:rbac:groups="",resources=replicationcontrollers,verbs=get;list;watch
 // +kubebuilder:rbac:groups=apps,resources=statefulsets,verbs=list;watch
+// +kubebuilder:rbac:groups=apps,resources=controllerrevisions,verbs=list;watch
 // +kubebuilder:rbac:groups=autoscaling,resources=horizontalpodautoscalers,verbs=list;watch
 // +kubebuilder:rbac:groups=batch,resources=cronjobs,verbs=list;watch
 // +kubebuilder:rbac:groups=batch,resources=jobs,verbs=list;watch
diff --git a/pkg/kubernetes/rbac/const.go b/pkg/kubernetes/rbac/const.go
@@ -45,6 +45,7 @@ const (
 	ClusterRoleBindingResource          = "clusterrolebindings"
 	ClusterRoleResource                 = "clusterroles"
 	ComponentStatusesResource           = "componentstatuses"
+	ControllerRevisionsResource         = "controllerrevisions"
 	ConfigMapsResource                  = "configmaps"
 	CronjobsResource                    = "cronjobs"
 	CustomResourceDefinitionsResource   = "customresourcedefinitions"
diff --git a/pkg/testutils/builder.go b/pkg/testutils/builder.go
@@ -637,6 +637,13 @@ func (builder *DatadogAgentBuilder) WithClusterChecksUseCLCEnabled(enabled bool)
 	return builder
 }
 
+func (builder *DatadogAgentBuilder) WithClusterChecks(enabled bool, useRunners bool) *DatadogAgentBuilder {
+	builder.initCC()
+	builder.datadogAgent.Spec.Features.ClusterChecks.Enabled = apiutils.NewBoolPointer(enabled)
+	builder.datadogAgent.Spec.Features.ClusterChecks.UseClusterChecksRunners = apiutils.NewBoolPointer(useRunners)
+	return builder
+}
+
 // Prometheus Scrape
 
 func (builder *DatadogAgentBuilder) initPrometheusScrape() {
@@ -1036,6 +1043,36 @@ func (builder *DatadogAgentBuilder) WithComponentOverride(componentName v2alpha1
 	return builder
 }
 
+func (builder *DatadogAgentBuilder) WithClusterAgentImage(image string) *DatadogAgentBuilder {
+	if builder.datadogAgent.Spec.Override == nil {
+		builder.datadogAgent.Spec.Override = map[v2alpha1.ComponentName]*v2alpha1.DatadogAgentComponentOverride{}
+	}
+
+	if builder.datadogAgent.Spec.Override[v2alpha1.ClusterAgentComponentName] == nil {
+		builder.datadogAgent.Spec.Override[v2alpha1.ClusterAgentComponentName] = &v2alpha1.DatadogAgentComponentOverride{}
+	}
+
+	builder.datadogAgent.Spec.Override[v2alpha1.ClusterAgentComponentName].Image = &v2alpha1.AgentImageConfig{
+		Name: image,
+	}
+	return builder
+}
+
+func (builder *DatadogAgentBuilder) WithClusterChecksRunnerImage(image string) *DatadogAgentBuilder {
+	if builder.datadogAgent.Spec.Override == nil {
+		builder.datadogAgent.Spec.Override = map[v2alpha1.ComponentName]*v2alpha1.DatadogAgentComponentOverride{}
+	}
+
+	if builder.datadogAgent.Spec.Override[v2alpha1.ClusterChecksRunnerComponentName] == nil {
+		builder.datadogAgent.Spec.Override[v2alpha1.ClusterChecksRunnerComponentName] = &v2alpha1.DatadogAgentComponentOverride{}
+	}
+
+	builder.datadogAgent.Spec.Override[v2alpha1.ClusterChecksRunnerComponentName].Image = &v2alpha1.AgentImageConfig{
+		Name: image,
+	}
+	return builder
+}
+
 // FIPS
 
 func (builder *DatadogAgentBuilder) WithUseFIPSAgent() *DatadogAgentBuilder {
diff --git a/pkg/utils/version.go b/pkg/utils/version.go
@@ -16,14 +16,22 @@ var versionRx = regexp.MustCompile(`(\d+\.\d+\.\d+)(\-[^\+]+)*(\+.+)*`)
 var versionWithDashesRx = regexp.MustCompile(`(\d+\-\d+\-\d+)(\-[^\+]+)*(\+.+)*`)
 
 // IsAboveMinVersion uses semver to check if `version` is >= minVersion.
-// For versions not containing a semver, it will consider them above minVersion.
-func IsAboveMinVersion(version, minVersion string) bool {
+// The defaultValue parameter controls the behavior when version parsing fails:
+//   - nil: uses the default behavior (returns true for unparseable versions)
+//   - true: returns true for unparseable versions
+//   - false: returns false for unparseable versions
+func IsAboveMinVersion(version, minVersion string, defaultValue *bool) bool {
+	// Determine the fallback value
+	fallback := true
+	if defaultValue != nil {
+		fallback = *defaultValue
+	}
 
 	version = formatVersionTag(version)
 	v, err := semver.NewVersion(version)
 	if err != nil {
-		// If the version tag is not a valid semver, return true.
-		return true
+		// If the version tag is not a valid semver, return fallback value.
+		return fallback
 	}
 
 	c, err := semver.NewConstraint(">= " + minVersion)
diff --git a/pkg/utils/version_test.go b/pkg/utils/version_test.go

Original file line number	Diff line number	Diff line change
`@@ -378,7 +378,7 @@ func run(opts *options) error {`
`378`	`378`
`379`	`379`	`if versionInfo != nil {`
`380`	`380`	`gitVersion := versionInfo.GitVersion`
`381`		`- if !utils.IsAboveMinVersion(gitVersion, "1.16-0") {`
	`381`	`+ if !utils.IsAboveMinVersion(gitVersion, "1.16-0", nil) {`
`382`	`382`	`setupLog.Error(nil, "Detected Kubernetes version <1.16 which requires CRD version apiextensions.k8s.io/v1beta1. "+`
`383`	`383`	`"CRDs of this version were removed in v1.10.0.")`
`384`	`384`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,5 +142,5 @@ func ShouldCreateAgentLocalService(versionInfo *version.Info, forceEnableLocalSe`
`142`	`142`	`return false`
`143`	`143`	`}`
`144`	`144`	`// Service Internal Traffic Policy is enabled by default since 1.22`
`145`		`- return utils.IsAboveMinVersion(versionInfo.GitVersion, localServiceDefaultMinimumVersion) \|\| forceEnableLocalService`
	`145`	`+ return utils.IsAboveMinVersion(versionInfo.GitVersion, localServiceDefaultMinimumVersion, nil) \|\| forceEnableLocalService`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,10 +388,10 @@ func supportsInstrumentationTargets(ddaSpec *v2alpha1.DatadogAgentSpec) bool {`
`388`	`388`	`// Agent version must >= 7.64.0 to run feature in core agent`
`389`	`389`	`if nodeAgent, ok := ddaSpec.Override[v2alpha1.ClusterAgentComponentName]; ok {`
`390`	`390`	`if nodeAgent.Image != nil {`
`391`		`- return utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), minInstrumentationTargetsVersion)`
	`391`	`+ return utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), minInstrumentationTargetsVersion, nil)`
`392`	`392`	`}`
`393`	`393`	`}`
`394`		`- return utils.IsAboveMinVersion(images.ClusterAgentLatestVersion, minInstrumentationTargetsVersion)`
	`394`	`+ return utils.IsAboveMinVersion(images.ClusterAgentLatestVersion, minInstrumentationTargetsVersion, nil)`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`// ManageSingleContainerNodeAgent allows a feature to configure the Agent container for the Node Agent's corev1.PodTemplateSpec`
Original file line number	Diff line number	Diff line change
`@@ -92,6 +92,10 @@ instances:`
`92`	`92`	`config.WriteString(" - apiservices\n")`
`93`	`93`	`}`
`94`	`94`
	`95`	`+ if collectorOpts.enableControllerRevisions {`
	`96`	`+ config.WriteString(" - controllerrevisions\n")`
	`97`	`+ }`
	`98`	`+`
`95`	`99`	`if collectorOpts.enableCRD {`
`96`	`100`	`config.WriteString(" - customresourcedefinitions\n")`
`97`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ func getRBACPolicyRules(collectorOpts collectorOptions) []rbacv1.PolicyRule {`
`44`	`44`	`rbac.DeploymentsResource,`
`45`	`45`	`rbac.ReplicasetsResource,`
`46`	`46`	`rbac.StatefulsetsResource,`
	`47`	`+ rbac.ControllerRevisionsResource,`
`47`	`48`	`},`
`48`	`49`	`},`
`49`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func (f orchestratorExplorerFeature) Configure(dda metav1.Object, ddaSpec v2al`
`149`	`149`	`reqContainers := []apicommon.AgentContainerName{apicommon.CoreAgentContainerName}`
`150`	`150`	`// Process Agent is not required as of agent version 7.51.0`
`151`	`151`	`if nodeAgent, ok := ddaSpec.Override[v2alpha1.NodeAgentComponentName]; ok {`
`152`		`- if nodeAgent.Image != nil && !utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), NoProcessAgentMinVersion) {`
	`152`	`+ if nodeAgent.Image != nil && !utils.IsAboveMinVersion(common.GetAgentVersionFromImage(*nodeAgent.Image), NoProcessAgentMinVersion, nil) {`
`153`	`153`	`f.processAgentRequired = true`
`154`	`154`	`reqContainers = append(reqContainers, apicommon.ProcessAgentContainerName)`
`155`	`155`	`}`