chore(dca): Config component migration in webhook and config (#32247)

Author: gabedos

pkg/clusteragent/admission/controllers/webhook/config.go

@@ -13,7 +13,7 @@ import (
 	"fmt"
 	"strings"
 
-	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
+	"github.com/DataDog/datadog-agent/comp/core/config"
 	"github.com/DataDog/datadog-agent/pkg/util/kubernetes/apiserver/common"
 )
 
@@ -36,21 +36,21 @@ type Config struct {
 }
 
 // NewConfig creates a webhook controller configuration
-func NewConfig(admissionV1Enabled, namespaceSelectorEnabled, matchConditionsSupported bool) Config {
+func NewConfig(admissionV1Enabled, namespaceSelectorEnabled, matchConditionsSupported bool, datadogConfig config.Component) Config {
 	return Config{
-		webhookName:              pkgconfigsetup.Datadog().GetString("admission_controller.webhook_name"),
-		secretName:               pkgconfigsetup.Datadog().GetString("admission_controller.certificate.secret_name"),
-		validationEnabled:        pkgconfigsetup.Datadog().GetBool("admission_controller.validation.enabled"),
-		mutationEnabled:          pkgconfigsetup.Datadog().GetBool("admission_controller.mutation.enabled"),
+		webhookName:              datadogConfig.GetString("admission_controller.webhook_name"),
+		secretName:               datadogConfig.GetString("admission_controller.certificate.secret_name"),
+		validationEnabled:        datadogConfig.GetBool("admission_controller.validation.enabled"),
+		mutationEnabled:          datadogConfig.GetBool("admission_controller.mutation.enabled"),
 		namespace:                common.GetResourcesNamespace(),
 		admissionV1Enabled:       admissionV1Enabled,
 		namespaceSelectorEnabled: namespaceSelectorEnabled,
 		matchConditionsSupported: matchConditionsSupported,
-		svcName:                  pkgconfigsetup.Datadog().GetString("admission_controller.service_name"),
+		svcName:                  datadogConfig.GetString("admission_controller.service_name"),
 		svcPort:                  int32(443),
-		timeout:                  pkgconfigsetup.Datadog().GetInt32("admission_controller.timeout_seconds"),
-		failurePolicy:            pkgconfigsetup.Datadog().GetString("admission_controller.failure_policy"),
-		reinvocationPolicy:       pkgconfigsetup.Datadog().GetString("admission_controller.reinvocation_policy"),
+		timeout:                  datadogConfig.GetInt32("admission_controller.timeout_seconds"),
+		failurePolicy:            datadogConfig.GetString("admission_controller.failure_policy"),
+		reinvocationPolicy:       datadogConfig.GetString("admission_controller.reinvocation_policy"),
 	}
 }
 

pkg/clusteragent/admission/controllers/webhook/controller_base.go

@@ -35,7 +35,6 @@ import (
 	"github.com/DataDog/datadog-agent/pkg/clusteragent/admission/mutate/tagsfromlabels"
 	"github.com/DataDog/datadog-agent/pkg/clusteragent/admission/validate/kubernetesadmissionevents"
 	"github.com/DataDog/datadog-agent/pkg/clusteragent/autoscaling/workload"
-	pkgconfigsetup "github.com/DataDog/datadog-agent/pkg/config/setup"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )
 
@@ -125,7 +124,7 @@ func (c *controllerBase) generateWebhooks(wmeta workloadmeta.Component, pa workl
 			configWebhook.NewWebhook(wmeta, injectionFilter, datadogConfig),
 			tagsfromlabels.NewWebhook(wmeta, datadogConfig, injectionFilter),
 			agentsidecar.NewWebhook(datadogConfig),
-			autoscaling.NewWebhook(pa),
+			autoscaling.NewWebhook(pa, datadogConfig),
 		}
 		webhooks = append(webhooks, mutatingWebhooks...)
 
@@ -137,7 +136,7 @@ func (c *controllerBase) generateWebhooks(wmeta workloadmeta.Component, pa workl
 			log.Errorf("failed to register APM Instrumentation webhook: %v", err)
 		}
 
-		isCWSInstrumentationEnabled := pkgconfigsetup.Datadog().GetBool("admission_controller.cws_instrumentation.enabled")
+		isCWSInstrumentationEnabled := datadogConfig.GetBool("admission_controller.cws_instrumentation.enabled")
 		if isCWSInstrumentationEnabled {
 			cws, err := cwsinstrumentation.NewCWSInstrumentation(wmeta, datadogConfig)
 			if err == nil {

pkg/clusteragent/admission/controllers/webhook/controller_base_test.go

@@ -36,7 +36,7 @@ func TestNewController(t *testing.T) {
 		factory.Admissionregistration(),
 		func() bool { return true },
 		make(chan struct{}),
-		v1Cfg,
+		getV1Cfg(t),
 		wmeta,
 		nil,
 		datadogConfig,
@@ -53,7 +53,7 @@ func TestNewController(t *testing.T) {
 		factory.Admissionregistration(),
 		func() bool { return true },
 		make(chan struct{}),
-		v1beta1Cfg,
+		getV1beta1Cfg(t),
 		wmeta,
 		nil,
 		datadogConfig,