From 68aba555c85733178a543b4199ffa7c353855239 Mon Sep 17 00:00:00 2001 From: mrdoggopat Date: Tue, 24 Sep 2024 15:13:23 -0400 Subject: [PATCH 01/18] consolidate versionInfo and platformInfo --- .../controller/datadogagent/controller.go | 15 +++--- .../datadogagent/controller_reconcile_v2.go | 1 - .../datadogagent/feature/apm/feature.go | 4 +- .../datadogagent/feature/dogstatsd/feature.go | 4 +- .../feature/externalmetrics/feature.go | 3 +- .../datadogagent/feature/otlp/feature.go | 6 ++- .../controller/datadogagent/store/store.go | 19 ++++--- .../controller/datadogagent_controller.go | 4 +- .../controller/datadogdashboard/controller.go | 10 ++-- .../controller/datadogdashboard_controller.go | 16 +++--- .../controller/datadogmonitor/controller.go | 5 +- .../controller/datadogmonitor_controller.go | 16 +++--- internal/controller/datadogslo/controller.go | 8 +-- internal/controller/datadogslo_controller.go | 16 +++--- internal/controller/setup.go | 49 +++++++++---------- pkg/kubernetes/platforminfo.go | 4 ++ 16 files changed, 86 insertions(+), 94 deletions(-) diff --git a/internal/controller/datadogagent/controller.go b/internal/controller/datadogagent/controller.go index f604a5752..aa6612e3b 100644 --- a/internal/controller/datadogagent/controller.go +++ b/internal/controller/datadogagent/controller.go @@ -11,7 +11,6 @@ import ( "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -69,9 +68,9 @@ type ReconcilerOptions struct { // Reconciler is the internal reconciler for Datadog Agent type Reconciler struct { - options ReconcilerOptions - client client.Client - versionInfo *version.Info + options ReconcilerOptions + client client.Client + // versionInfo *version.Info platformInfo kubernetes.PlatformInfo scheme *runtime.Scheme log logr.Logger @@ -80,13 +79,13 @@ type Reconciler struct { } // NewReconciler returns a reconciler for DatadogAgent -func NewReconciler(options ReconcilerOptions, client client.Client, versionInfo *version.Info, platformInfo kubernetes.PlatformInfo, +func NewReconciler(options ReconcilerOptions, client client.Client, platformInfo kubernetes.PlatformInfo, scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder, metricForwarder datadog.MetricForwardersManager, ) (*Reconciler, error) { return &Reconciler{ - options: options, - client: client, - versionInfo: versionInfo, + options: options, + client: client, + // versionInfo: versionInfo, platformInfo: platformInfo, scheme: scheme, log: log, diff --git a/internal/controller/datadogagent/controller_reconcile_v2.go b/internal/controller/datadogagent/controller_reconcile_v2.go index a2a182280..946b2c21d 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2.go +++ b/internal/controller/datadogagent/controller_reconcile_v2.go @@ -107,7 +107,6 @@ func (r *Reconciler) reconcileInstanceV2(ctx context.Context, logger logr.Logger // ----------------------- storeOptions := &store.StoreOptions{ SupportCilium: r.options.SupportCilium, - VersionInfo: r.versionInfo, PlatformInfo: r.platformInfo, Logger: logger, Scheme: r.scheme, diff --git a/internal/controller/datadogagent/feature/apm/feature.go b/internal/controller/datadogagent/feature/apm/feature.go index 0b76d7be6..2aa644360 100644 --- a/internal/controller/datadogagent/feature/apm/feature.go +++ b/internal/controller/datadogagent/feature/apm/feature.go @@ -176,8 +176,10 @@ func (f *apmFeature) shouldEnableLanguageDetection() bool { // ManageDependencies allows a feature to manage its dependencies. // Feature's dependencies should be added in the store. func (f *apmFeature) ManageDependencies(managers feature.ResourceManagers, components feature.RequiredComponents) error { + + platformInfo := managers.Store().GetPlatformInfo() // agent local service - if common.ShouldCreateAgentLocalService(managers.Store().GetVersionInfo(), f.forceEnableLocalService) { + if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { apmPort := &corev1.ServicePort{ Protocol: corev1.ProtocolTCP, TargetPort: intstr.FromInt(int(v2alpha1.DefaultApmPort)), diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature.go b/internal/controller/datadogagent/feature/dogstatsd/feature.go index 976667919..ee11060e0 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature.go @@ -101,8 +101,10 @@ func (f *dogstatsdFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp featur // ManageDependencies allows a feature to manage its dependencies. // Feature's dependencies should be added in the store. func (f *dogstatsdFeature) ManageDependencies(managers feature.ResourceManagers, components feature.RequiredComponents) error { + + platformInfo := managers.Store().GetPlatformInfo() // agent local service - if common.ShouldCreateAgentLocalService(managers.Store().GetVersionInfo(), f.forceEnableLocalService) { + if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { dsdPort := &corev1.ServicePort{ Protocol: corev1.ProtocolUDP, TargetPort: intstr.FromInt(int(apicommon.DefaultDogstatsdPort)), diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature.go b/internal/controller/datadogagent/feature/externalmetrics/feature.go index e838723f8..005cd28c9 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature.go @@ -199,8 +199,9 @@ func (f *externalMetricsFeature) ManageDependencies(managers feature.ResourceMan return fmt.Errorf("error adding external metrics provider apiservice to store: %w", err) } + platformInfo := managers.Store().GetPlatformInfo() // RBAC - if err := managers.RBACManager().AddClusterPolicyRules("kube-system", componentdca.GetExternalMetricsReaderClusterRoleName(f.owner, managers.Store().GetVersionInfo()), "horizontal-pod-autoscaler", getExternalMetricsReaderPolicyRules()); err != nil { + if err := managers.RBACManager().AddClusterPolicyRules("kube-system", componentdca.GetExternalMetricsReaderClusterRoleName(f.owner, platformInfo.GetVersionInfo()), "horizontal-pod-autoscaler", getExternalMetricsReaderPolicyRules()); err != nil { return fmt.Errorf("error adding external metrics provider external metrics reader clusterrole and clusterrolebinding to store: %w", err) } } diff --git a/internal/controller/datadogagent/feature/otlp/feature.go b/internal/controller/datadogagent/feature/otlp/feature.go index 7139b70ff..8d5f5efd0 100644 --- a/internal/controller/datadogagent/feature/otlp/feature.go +++ b/internal/controller/datadogagent/feature/otlp/feature.go @@ -112,8 +112,10 @@ func (f *otlpFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp feature.Req // ManageDependencies allows a feature to manage its dependencies. // Feature's dependencies should be added in the store. func (f *otlpFeature) ManageDependencies(managers feature.ResourceManagers, components feature.RequiredComponents) error { + platformInfo := managers.Store().GetPlatformInfo() + if f.grpcEnabled { - if common.ShouldCreateAgentLocalService(managers.Store().GetVersionInfo(), f.forceEnableLocalService) { + if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { port, err := extractPortEndpoint(f.grpcEndpoint) if err != nil { f.logger.Error(err, "failed to extract port from OTLP/gRPC endpoint") @@ -134,7 +136,7 @@ func (f *otlpFeature) ManageDependencies(managers feature.ResourceManagers, comp } } if f.httpEnabled { - if common.ShouldCreateAgentLocalService(managers.Store().GetVersionInfo(), f.forceEnableLocalService) { + if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { port, err := extractPortEndpoint(f.httpEndpoint) if err != nil { f.logger.Error(err, "failed to extract port from OTLP/HTTP endpoint") diff --git a/internal/controller/datadogagent/store/store.go b/internal/controller/datadogagent/store/store.go index 42df1e0dd..cf596c36e 100644 --- a/internal/controller/datadogagent/store/store.go +++ b/internal/controller/datadogagent/store/store.go @@ -26,7 +26,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" "sigs.k8s.io/controller-runtime/pkg/client" ) @@ -40,7 +39,7 @@ type StoreClient interface { AddOrUpdate(kind kubernetes.ObjectKind, obj client.Object) error Get(kind kubernetes.ObjectKind, namespace, name string) (client.Object, bool) GetOrCreate(kind kubernetes.ObjectKind, namespace, name string) (client.Object, bool) - GetVersionInfo() *version.Info + // GetVersionInfo() *version.Info GetPlatformInfo() kubernetes.PlatformInfo Delete(kind kubernetes.ObjectKind, namespace string, name string) bool DeleteAll(ctx context.Context, k8sClient client.Client) []error @@ -55,7 +54,7 @@ func NewStore(owner metav1.Object, options *StoreOptions) *Store { } if options != nil { store.supportCilium = options.SupportCilium - store.versionInfo = options.VersionInfo + // store.versionInfo = options.VersionInfo store.platformInfo = options.PlatformInfo store.logger = options.Logger store.scheme = options.Scheme @@ -71,8 +70,8 @@ type Store struct { mutex sync.RWMutex supportCilium bool - versionInfo *version.Info - platformInfo kubernetes.PlatformInfo + // versionInfo *version.Info + platformInfo kubernetes.PlatformInfo scheme *runtime.Scheme logger logr.Logger @@ -82,8 +81,8 @@ type Store struct { // StoreOptions use to provide to NewStore() function some Store creation options. type StoreOptions struct { SupportCilium bool - VersionInfo *version.Info - PlatformInfo kubernetes.PlatformInfo + // VersionInfo *version.Info + PlatformInfo kubernetes.PlatformInfo Scheme *runtime.Scheme Logger logr.Logger @@ -286,9 +285,9 @@ func (ds *Store) Cleanup(ctx context.Context, k8sClient client.Client) []error { } // GetVersionInfo returns the Kubernetes version -func (ds *Store) GetVersionInfo() *version.Info { - return ds.versionInfo -} +// func (ds *Store) GetVersionInfo() *version.Info { +// return ds.versionInfo +// } // GetPlatformInfo returns api-resources info func (ds *Store) GetPlatformInfo() kubernetes.PlatformInfo { diff --git a/internal/controller/datadogagent_controller.go b/internal/controller/datadogagent_controller.go index fc9589871..d0dc81f45 100644 --- a/internal/controller/datadogagent_controller.go +++ b/internal/controller/datadogagent_controller.go @@ -18,7 +18,6 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" ctrlbuilder "sigs.k8s.io/controller-runtime/pkg/builder" @@ -42,7 +41,6 @@ import ( // DatadogAgentReconciler reconciles a DatadogAgent object. type DatadogAgentReconciler struct { client.Client - VersionInfo *version.Info PlatformInfo kubernetes.PlatformInfo Log logr.Logger Scheme *runtime.Scheme @@ -263,7 +261,7 @@ func (r *DatadogAgentReconciler) SetupWithManager(mgr ctrl.Manager) error { return err } - internal, err := datadogagent.NewReconciler(r.Options, r.Client, r.VersionInfo, r.PlatformInfo, r.Scheme, r.Log, r.Recorder, metricForwarder) + internal, err := datadogagent.NewReconciler(r.Options, r.Client, r.PlatformInfo, r.Scheme, r.Log, r.Recorder, metricForwarder) if err != nil { return err } diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index c9f9cd753..91b623211 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -45,15 +45,15 @@ type Reconciler struct { recorder record.EventRecorder } -func NewReconciler(client client.Client, ddClient datadogclient.DatadogDashboardClient, versionInfo *version.Info, scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder) *Reconciler { +func NewReconciler(client client.Client, ddClient datadogclient.DatadogDashboardClient, scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder) *Reconciler { return &Reconciler{ client: client, datadogClient: ddClient.Client, datadogAuth: ddClient.Auth, - versionInfo: versionInfo, - scheme: scheme, - log: log, - recorder: recorder, + // versionInfo: versionInfo, + scheme: scheme, + log: log, + recorder: recorder, } } diff --git a/internal/controller/datadogdashboard_controller.go b/internal/controller/datadogdashboard_controller.go index 03180ce6d..97b261835 100644 --- a/internal/controller/datadogdashboard_controller.go +++ b/internal/controller/datadogdashboard_controller.go @@ -9,7 +9,6 @@ import ( "context" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -23,13 +22,12 @@ import ( // DatadogDashboardReconciler reconciles a DatadogDashboard object type DatadogDashboardReconciler struct { - Client client.Client - DDClient datadogclient.DatadogDashboardClient - VersionInfo *version.Info - Log logr.Logger - Scheme *runtime.Scheme - Recorder record.EventRecorder - internal *datadogdashboard.Reconciler + Client client.Client + DDClient datadogclient.DatadogDashboardClient + Log logr.Logger + Scheme *runtime.Scheme + Recorder record.EventRecorder + internal *datadogdashboard.Reconciler } //+kubebuilder:rbac:groups=datadoghq.com,resources=datadogdashboards,verbs=get;list;watch;create;update;patch;delete @@ -43,7 +41,7 @@ func (r *DatadogDashboardReconciler) Reconcile(ctx context.Context, req ctrl.Req // SetupWithManager sets up the controller with the Manager. func (r *DatadogDashboardReconciler) SetupWithManager(mgr ctrl.Manager) error { - r.internal = datadogdashboard.NewReconciler(r.Client, r.DDClient, r.VersionInfo, r.Scheme, r.Log, r.Recorder) + r.internal = datadogdashboard.NewReconciler(r.Client, r.DDClient, r.Scheme, r.Log, r.Recorder) builder := ctrl.NewControllerManagedBy(mgr). For(&v1alpha1.DatadogDashboard{}). diff --git a/internal/controller/datadogmonitor/controller.go b/internal/controller/datadogmonitor/controller.go index bc5744972..5e821927d 100644 --- a/internal/controller/datadogmonitor/controller.go +++ b/internal/controller/datadogmonitor/controller.go @@ -18,7 +18,6 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -63,19 +62,17 @@ type Reconciler struct { client client.Client datadogClient *datadogV1.MonitorsApi datadogAuth context.Context - versionInfo *version.Info log logr.Logger scheme *runtime.Scheme recorder record.EventRecorder } // NewReconciler returns a new Reconciler object -func NewReconciler(client client.Client, ddClient datadogclient.DatadogMonitorClient, versionInfo *version.Info, scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder) (*Reconciler, error) { +func NewReconciler(client client.Client, ddClient datadogclient.DatadogMonitorClient, scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder) (*Reconciler, error) { return &Reconciler{ client: client, datadogClient: ddClient.Client, datadogAuth: ddClient.Auth, - versionInfo: versionInfo, scheme: scheme, log: log, recorder: recorder, diff --git a/internal/controller/datadogmonitor_controller.go b/internal/controller/datadogmonitor_controller.go index 667b4b2bc..11f81a9da 100644 --- a/internal/controller/datadogmonitor_controller.go +++ b/internal/controller/datadogmonitor_controller.go @@ -10,7 +10,6 @@ import ( "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -23,13 +22,12 @@ import ( // DatadogMonitorReconciler reconciles a DatadogMonitor object. type DatadogMonitorReconciler struct { - Client client.Client - DDClient datadogclient.DatadogMonitorClient - VersionInfo *version.Info - Log logr.Logger - Scheme *runtime.Scheme - Recorder record.EventRecorder - internal *datadogmonitor.Reconciler + Client client.Client + DDClient datadogclient.DatadogMonitorClient + Log logr.Logger + Scheme *runtime.Scheme + Recorder record.EventRecorder + internal *datadogmonitor.Reconciler } // +kubebuilder:rbac:groups=datadoghq.com,resources=datadogmonitors,verbs=get;list;watch;create;update;patch;delete @@ -43,7 +41,7 @@ func (r *DatadogMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Reque // SetupWithManager creates a new DatadogMonitor controller. func (r *DatadogMonitorReconciler) SetupWithManager(mgr ctrl.Manager) error { - internal, err := datadogmonitor.NewReconciler(r.Client, r.DDClient, r.VersionInfo, r.Scheme, r.Log, r.Recorder) + internal, err := datadogmonitor.NewReconciler(r.Client, r.DDClient, r.Scheme, r.Log, r.Recorder) if err != nil { return err } diff --git a/internal/controller/datadogslo/controller.go b/internal/controller/datadogslo/controller.go index 1a4307780..b84a1af4a 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -53,14 +53,14 @@ type Reconciler struct { recorder record.EventRecorder } -func NewReconciler(client client.Client, ddClient datadogclient.DatadogSLOClient, versionInfo *version.Info, log logr.Logger, recorder record.EventRecorder) *Reconciler { +func NewReconciler(client client.Client, ddClient datadogclient.DatadogSLOClient, log logr.Logger, recorder record.EventRecorder) *Reconciler { return &Reconciler{ client: client, datadogClient: ddClient.Client, datadogAuth: ddClient.Auth, - versionInfo: versionInfo, - log: log, - recorder: recorder, + // versionInfo: versionInfo, + log: log, + recorder: recorder, } } diff --git a/internal/controller/datadogslo_controller.go b/internal/controller/datadogslo_controller.go index 8e1b1da0a..77a93f08e 100644 --- a/internal/controller/datadogslo_controller.go +++ b/internal/controller/datadogslo_controller.go @@ -13,7 +13,6 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogslo" "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -24,13 +23,12 @@ import ( ) type DatadogSLOReconciler struct { - Client client.Client - DDClient datadogclient.DatadogSLOClient - VersionInfo *version.Info - Log logr.Logger - Scheme *runtime.Scheme - Recorder record.EventRecorder - internal *datadogslo.Reconciler + Client client.Client + DDClient datadogclient.DatadogSLOClient + Log logr.Logger + Scheme *runtime.Scheme + Recorder record.EventRecorder + internal *datadogslo.Reconciler } // +kubebuilder:rbac:groups=datadoghq.com,resources=datadogslos,verbs=get;list;watch;create;update;patch;delete @@ -43,7 +41,7 @@ func (r *DatadogSLOReconciler) Reconcile(ctx context.Context, req reconcile.Requ } func (r *DatadogSLOReconciler) SetupWithManager(mgr ctrl.Manager) error { - r.internal = datadogslo.NewReconciler(r.Client, r.DDClient, r.VersionInfo, r.Log, r.Recorder) + r.internal = datadogslo.NewReconciler(r.Client, r.DDClient, r.Log, r.Recorder) builder := ctrl.NewControllerManagedBy(mgr). For(&v1alpha1.DatadogSLO{}). diff --git a/internal/controller/setup.go b/internal/controller/setup.go index 2bab071bc..c701409b5 100644 --- a/internal/controller/setup.go +++ b/internal/controller/setup.go @@ -22,7 +22,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/utils" "github.com/go-logr/logr" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/discovery" "k8s.io/client-go/rest" ) @@ -67,7 +66,7 @@ type ExtendedDaemonsetOptions struct { CanaryAutoPauseMaxSlowStartDuration time.Duration } -type starterFunc func(logr.Logger, manager.Manager, *version.Info, kubernetes.PlatformInfo, SetupOptions) error +type starterFunc func(logr.Logger, manager.Manager, kubernetes.PlatformInfo, SetupOptions) error var controllerStarters = map[string]starterFunc{ agentControllerName: startDatadogAgent, @@ -107,7 +106,7 @@ func SetupControllers(logger logr.Logger, mgr manager.Manager, options SetupOpti platformInfo := kubernetes.NewPlatformInfo(versionInfo, groups, resources) for controller, starter := range controllerStarters { - if err := starter(logger, mgr, versionInfo, platformInfo, options); err != nil { + if err := starter(logger, mgr, platformInfo, options); err != nil { logger.Error(err, "Couldn't start controller", "controller", controller) } } @@ -126,7 +125,7 @@ func getServerGroupsAndResources(log logr.Logger, discoveryClient *discovery.Dis return groups, resources, nil } -func startDatadogAgent(logger logr.Logger, mgr manager.Manager, vInfo *version.Info, pInfo kubernetes.PlatformInfo, options SetupOptions) error { +func startDatadogAgent(logger logr.Logger, mgr manager.Manager, pInfo kubernetes.PlatformInfo, options SetupOptions) error { if !options.DatadogAgentEnabled { logger.Info("Feature disabled, not starting the controller", "controller", agentControllerName) @@ -135,7 +134,6 @@ func startDatadogAgent(logger logr.Logger, mgr manager.Manager, vInfo *version.I return (&DatadogAgentReconciler{ Client: mgr.GetClient(), - VersionInfo: vInfo, PlatformInfo: pInfo, Log: ctrl.Log.WithName("controllers").WithName(agentControllerName), Scheme: mgr.GetScheme(), @@ -163,7 +161,7 @@ func startDatadogAgent(logger logr.Logger, mgr manager.Manager, vInfo *version.I }).SetupWithManager(mgr) } -func startDatadogMonitor(logger logr.Logger, mgr manager.Manager, vInfo *version.Info, pInfo kubernetes.PlatformInfo, options SetupOptions) error { +func startDatadogMonitor(logger logr.Logger, mgr manager.Manager, pInfo kubernetes.PlatformInfo, options SetupOptions) error { if !options.DatadogMonitorEnabled { logger.Info("Feature disabled, not starting the controller", "controller", monitorControllerName) @@ -176,16 +174,15 @@ func startDatadogMonitor(logger logr.Logger, mgr manager.Manager, vInfo *version } return (&DatadogMonitorReconciler{ - Client: mgr.GetClient(), - DDClient: ddClient, - VersionInfo: vInfo, - Log: ctrl.Log.WithName("controllers").WithName(monitorControllerName), - Scheme: mgr.GetScheme(), - Recorder: mgr.GetEventRecorderFor(monitorControllerName), + Client: mgr.GetClient(), + DDClient: ddClient, + Log: ctrl.Log.WithName("controllers").WithName(monitorControllerName), + Scheme: mgr.GetScheme(), + Recorder: mgr.GetEventRecorderFor(monitorControllerName), }).SetupWithManager(mgr) } -func startDatadogDashboard(logger logr.Logger, mgr manager.Manager, vInfo *version.Info, pInfo kubernetes.PlatformInfo, options SetupOptions) error { +func startDatadogDashboard(logger logr.Logger, mgr manager.Manager, pInfo kubernetes.PlatformInfo, options SetupOptions) error { if !options.DatadogDashboardEnabled { logger.Info("Feature disabled, not starting the controller", "controller", dashboardControllerName) return nil @@ -197,16 +194,15 @@ func startDatadogDashboard(logger logr.Logger, mgr manager.Manager, vInfo *versi } return (&DatadogDashboardReconciler{ - Client: mgr.GetClient(), - DDClient: ddClient, - VersionInfo: vInfo, - Log: ctrl.Log.WithName("controllers").WithName(dashboardControllerName), - Scheme: mgr.GetScheme(), - Recorder: mgr.GetEventRecorderFor(dashboardControllerName), + Client: mgr.GetClient(), + DDClient: ddClient, + Log: ctrl.Log.WithName("controllers").WithName(dashboardControllerName), + Scheme: mgr.GetScheme(), + Recorder: mgr.GetEventRecorderFor(dashboardControllerName), }).SetupWithManager(mgr) } -func startDatadogSLO(logger logr.Logger, mgr manager.Manager, info *version.Info, pInfo kubernetes.PlatformInfo, options SetupOptions) error { +func startDatadogSLO(logger logr.Logger, mgr manager.Manager, pInfo kubernetes.PlatformInfo, options SetupOptions) error { if !options.DatadogSLOEnabled { logger.Info("Feature disabled, not starting the controller", "controller", sloControllerName) return nil @@ -218,18 +214,17 @@ func startDatadogSLO(logger logr.Logger, mgr manager.Manager, info *version.Info } controller := &DatadogSLOReconciler{ - Client: mgr.GetClient(), - DDClient: ddClient, - VersionInfo: info, - Log: ctrl.Log.WithName("controllers").WithName(sloControllerName), - Scheme: mgr.GetScheme(), - Recorder: mgr.GetEventRecorderFor(sloControllerName), + Client: mgr.GetClient(), + DDClient: ddClient, + Log: ctrl.Log.WithName("controllers").WithName(sloControllerName), + Scheme: mgr.GetScheme(), + Recorder: mgr.GetEventRecorderFor(sloControllerName), } return controller.SetupWithManager(mgr) } -func startDatadogAgentProfiles(logger logr.Logger, mgr manager.Manager, vInfo *version.Info, pInfo kubernetes.PlatformInfo, options SetupOptions) error { +func startDatadogAgentProfiles(logger logr.Logger, mgr manager.Manager, pInfo kubernetes.PlatformInfo, options SetupOptions) error { if !options.DatadogAgentProfileEnabled { logger.Info("Feature disabled, not starting the controller", "controller", profileControllerName) return nil diff --git a/pkg/kubernetes/platforminfo.go b/pkg/kubernetes/platforminfo.go index b2737ac67..c04e8ead7 100644 --- a/pkg/kubernetes/platforminfo.go +++ b/pkg/kubernetes/platforminfo.go @@ -120,3 +120,7 @@ func (platformInfo *PlatformInfo) GetApiVersions(name string) (preferred string, other = platformInfo.apiOtherVersions[name] return preferred, other } + +func (platformInfo *PlatformInfo) GetVersionInfo() *version.Info { + return platformInfo.versionInfo +} From 03db7280d4aba4f796dacd59eb60923136188bd8 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:55:10 -0400 Subject: [PATCH 02/18] Update controller.go remove commented versionInfo --- internal/controller/datadogslo/controller.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogslo/controller.go b/internal/controller/datadogslo/controller.go index b84a1af4a..4156f9b17 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -58,7 +58,6 @@ func NewReconciler(client client.Client, ddClient datadogclient.DatadogSLOClient client: client, datadogClient: ddClient.Client, datadogAuth: ddClient.Auth, - // versionInfo: versionInfo, log: log, recorder: recorder, } From e12ca6a7a8f71e5516d314b2db0a35d7c309867f Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:55:15 -0400 Subject: [PATCH 03/18] Update store.go remove commented versionInfo --- internal/controller/datadogagent/store/store.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/internal/controller/datadogagent/store/store.go b/internal/controller/datadogagent/store/store.go index cf596c36e..8e0a79c3a 100644 --- a/internal/controller/datadogagent/store/store.go +++ b/internal/controller/datadogagent/store/store.go @@ -54,7 +54,6 @@ func NewStore(owner metav1.Object, options *StoreOptions) *Store { } if options != nil { store.supportCilium = options.SupportCilium - // store.versionInfo = options.VersionInfo store.platformInfo = options.PlatformInfo store.logger = options.Logger store.scheme = options.Scheme @@ -70,7 +69,6 @@ type Store struct { mutex sync.RWMutex supportCilium bool - // versionInfo *version.Info platformInfo kubernetes.PlatformInfo scheme *runtime.Scheme @@ -81,7 +79,6 @@ type Store struct { // StoreOptions use to provide to NewStore() function some Store creation options. type StoreOptions struct { SupportCilium bool - // VersionInfo *version.Info PlatformInfo kubernetes.PlatformInfo Scheme *runtime.Scheme @@ -284,11 +281,6 @@ func (ds *Store) Cleanup(ctx context.Context, k8sClient client.Client) []error { return errs } -// GetVersionInfo returns the Kubernetes version -// func (ds *Store) GetVersionInfo() *version.Info { -// return ds.versionInfo -// } - // GetPlatformInfo returns api-resources info func (ds *Store) GetPlatformInfo() kubernetes.PlatformInfo { return ds.platformInfo From 80213fe275d03b29914521452fee6881e22d61ea Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:55:19 -0400 Subject: [PATCH 04/18] Update controller.go remove commented versionInfo --- internal/controller/datadogagent/controller.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/controller/datadogagent/controller.go b/internal/controller/datadogagent/controller.go index aa6612e3b..3239a8fc8 100644 --- a/internal/controller/datadogagent/controller.go +++ b/internal/controller/datadogagent/controller.go @@ -70,7 +70,6 @@ type ReconcilerOptions struct { type Reconciler struct { options ReconcilerOptions client client.Client - // versionInfo *version.Info platformInfo kubernetes.PlatformInfo scheme *runtime.Scheme log logr.Logger @@ -85,7 +84,6 @@ func NewReconciler(options ReconcilerOptions, client client.Client, platformInfo return &Reconciler{ options: options, client: client, - // versionInfo: versionInfo, platformInfo: platformInfo, scheme: scheme, log: log, From e2a59f949507bbdae13d154275bccde909114d5a Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:56:05 -0400 Subject: [PATCH 05/18] Update controller.go remove commented versionInfo --- internal/controller/datadogdashboard/controller.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index 91b623211..1a516207c 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -50,7 +50,6 @@ func NewReconciler(client client.Client, ddClient datadogclient.DatadogDashboard client: client, datadogClient: ddClient.Client, datadogAuth: ddClient.Auth, - // versionInfo: versionInfo, scheme: scheme, log: log, recorder: recorder, From b0aa0bf1d35562ddf6d6ace96a68cb5c6860724d Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Wed, 25 Sep 2024 10:57:48 -0400 Subject: [PATCH 06/18] Update store.go remove commented versionInfo --- internal/controller/datadogagent/store/store.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogagent/store/store.go b/internal/controller/datadogagent/store/store.go index 8e0a79c3a..5528ced61 100644 --- a/internal/controller/datadogagent/store/store.go +++ b/internal/controller/datadogagent/store/store.go @@ -39,7 +39,6 @@ type StoreClient interface { AddOrUpdate(kind kubernetes.ObjectKind, obj client.Object) error Get(kind kubernetes.ObjectKind, namespace, name string) (client.Object, bool) GetOrCreate(kind kubernetes.ObjectKind, namespace, name string) (client.Object, bool) - // GetVersionInfo() *version.Info GetPlatformInfo() kubernetes.PlatformInfo Delete(kind kubernetes.ObjectKind, namespace string, name string) bool DeleteAll(ctx context.Context, k8sClient client.Client) []error From 97306ee8b265b65f9e6be6c6b88dc5e9ff78bb24 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:52:23 -0400 Subject: [PATCH 07/18] remove versionInfo in datadogslo controller.go --- internal/controller/datadogslo/controller.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/controller/datadogslo/controller.go b/internal/controller/datadogslo/controller.go index 4156f9b17..2bd7cab03 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -48,7 +48,6 @@ type Reconciler struct { client client.Client datadogClient *datadogV1.ServiceLevelObjectivesApi datadogAuth context.Context - versionInfo *version.Info log logr.Logger recorder record.EventRecorder } @@ -72,7 +71,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco func (r *Reconciler) internalReconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) { logger := r.log.WithValues("datadogslo", req.NamespacedName) - logger.Info("Reconciling Datadog SLO", "version", r.versionInfo.String()) + logger.Info("Reconciling Datadog SLO") now := metav1.NewTime(time.Now()) // Get instance From 61f0a95cf60c1cab5c34157a371b696b900d8eae Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 10:52:45 -0400 Subject: [PATCH 08/18] remove versionInfo in datadogdashboard controller.go --- internal/controller/datadogdashboard/controller.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index 1a516207c..8a8ad4059 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -39,7 +39,6 @@ type Reconciler struct { client client.Client datadogClient *datadogV1.DashboardsApi datadogAuth context.Context - versionInfo *version.Info scheme *runtime.Scheme log logr.Logger recorder record.EventRecorder @@ -62,7 +61,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) ( func (r *Reconciler) internalReconcile(ctx context.Context, req reconcile.Request) (reconcile.Result, error) { logger := r.log.WithValues("datadogdashboard", req.NamespacedName) - logger.Info("Reconciling Datadog Dashboard", "version", r.versionInfo.String()) + logger.Info("Reconciling Datadog Dashboard") now := metav1.NewTime(time.Now()) instance := &v1alpha1.DatadogDashboard{} From c1a2aeeb1314edd0e1209a32bb876d2b605054b8 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:49:38 -0400 Subject: [PATCH 09/18] Update internal/controller/datadogagent/feature/apm/feature.go Co-authored-by: khewonc <39867936+khewonc@users.noreply.github.com> --- internal/controller/datadogagent/feature/apm/feature.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogagent/feature/apm/feature.go b/internal/controller/datadogagent/feature/apm/feature.go index 2aa644360..0bb94d65b 100644 --- a/internal/controller/datadogagent/feature/apm/feature.go +++ b/internal/controller/datadogagent/feature/apm/feature.go @@ -176,7 +176,6 @@ func (f *apmFeature) shouldEnableLanguageDetection() bool { // ManageDependencies allows a feature to manage its dependencies. // Feature's dependencies should be added in the store. func (f *apmFeature) ManageDependencies(managers feature.ResourceManagers, components feature.RequiredComponents) error { - platformInfo := managers.Store().GetPlatformInfo() // agent local service if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { From 44f8ea6ad48a65a5fe05c6295e418750b7c9703e Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:49:44 -0400 Subject: [PATCH 10/18] Update internal/controller/datadogagent/feature/dogstatsd/feature.go Co-authored-by: khewonc <39867936+khewonc@users.noreply.github.com> --- internal/controller/datadogagent/feature/dogstatsd/feature.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature.go b/internal/controller/datadogagent/feature/dogstatsd/feature.go index ee11060e0..d61ce2eb2 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature.go @@ -101,7 +101,6 @@ func (f *dogstatsdFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp featur // ManageDependencies allows a feature to manage its dependencies. // Feature's dependencies should be added in the store. func (f *dogstatsdFeature) ManageDependencies(managers feature.ResourceManagers, components feature.RequiredComponents) error { - platformInfo := managers.Store().GetPlatformInfo() // agent local service if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { From 82eff1cdb0c98f3dff683756bbd1fcfb0cab70fc Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:50:50 -0400 Subject: [PATCH 11/18] putting platformInfo under //RBAC --- .../controller/datadogagent/feature/externalmetrics/feature.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature.go b/internal/controller/datadogagent/feature/externalmetrics/feature.go index 005cd28c9..d00fe87af 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature.go @@ -199,8 +199,8 @@ func (f *externalMetricsFeature) ManageDependencies(managers feature.ResourceMan return fmt.Errorf("error adding external metrics provider apiservice to store: %w", err) } - platformInfo := managers.Store().GetPlatformInfo() // RBAC + platformInfo := managers.Store().GetPlatformInfo() if err := managers.RBACManager().AddClusterPolicyRules("kube-system", componentdca.GetExternalMetricsReaderClusterRoleName(f.owner, platformInfo.GetVersionInfo()), "horizontal-pod-autoscaler", getExternalMetricsReaderPolicyRules()); err != nil { return fmt.Errorf("error adding external metrics provider external metrics reader clusterrole and clusterrolebinding to store: %w", err) } From 620bf0a4fe103e682d1d81e64295a566eef54af5 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:53:59 -0400 Subject: [PATCH 12/18] refactor platformInfo --- internal/controller/datadogagent/feature/otlp/feature.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/controller/datadogagent/feature/otlp/feature.go b/internal/controller/datadogagent/feature/otlp/feature.go index 8d5f5efd0..8c2218176 100644 --- a/internal/controller/datadogagent/feature/otlp/feature.go +++ b/internal/controller/datadogagent/feature/otlp/feature.go @@ -113,9 +113,9 @@ func (f *otlpFeature) Configure(dda *v2alpha1.DatadogAgent) (reqComp feature.Req // Feature's dependencies should be added in the store. func (f *otlpFeature) ManageDependencies(managers feature.ResourceManagers, components feature.RequiredComponents) error { platformInfo := managers.Store().GetPlatformInfo() - + versionInfo := platformInfo.GetVersionInfo() if f.grpcEnabled { - if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { + if common.ShouldCreateAgentLocalService(versionInfo, f.forceEnableLocalService) { port, err := extractPortEndpoint(f.grpcEndpoint) if err != nil { f.logger.Error(err, "failed to extract port from OTLP/gRPC endpoint") @@ -136,7 +136,7 @@ func (f *otlpFeature) ManageDependencies(managers feature.ResourceManagers, comp } } if f.httpEnabled { - if common.ShouldCreateAgentLocalService(platformInfo.GetVersionInfo(), f.forceEnableLocalService) { + if common.ShouldCreateAgentLocalService(versionInfo, f.forceEnableLocalService) { port, err := extractPortEndpoint(f.httpEndpoint) if err != nil { f.logger.Error(err, "failed to extract port from OTLP/HTTP endpoint") From bca46ca146c9098585f44daf0ba0aa329964d661 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:57:47 -0400 Subject: [PATCH 13/18] cleaned up extraneous unused version.Info imports --- internal/controller/datadogdashboard/controller.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index 8a8ad4059..f2301257b 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -18,7 +18,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" From 157acb19baafbc874683f2e4b27925fb207edfbf Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 15:58:07 -0400 Subject: [PATCH 14/18] cleaned up extraneous unused version.Info imports --- internal/controller/datadogslo/controller.go | 1 - 1 file changed, 1 deletion(-) diff --git a/internal/controller/datadogslo/controller.go b/internal/controller/datadogslo/controller.go index 2bd7cab03..28fd20a3e 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -17,7 +17,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" From e33d909765aaa123a363bb0f4522ba2e0a4398d7 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 16:00:03 -0400 Subject: [PATCH 15/18] cleaned up any extra versionInfo in test files --- internal/controller/datadogdashboard/controller_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/controller/datadogdashboard/controller_test.go b/internal/controller/datadogdashboard/controller_test.go index fe7c04550..6e4b611ce 100644 --- a/internal/controller/datadogdashboard/controller_test.go +++ b/internal/controller/datadogdashboard/controller_test.go @@ -10,7 +10,6 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/tools/record" "k8s.io/kubectl/pkg/scheme" ctrl "sigs.k8s.io/controller-runtime" @@ -188,7 +187,6 @@ func TestReconcileDatadogDashboard_Reconcile(t *testing.T) { scheme: s, recorder: recorder, log: logf.Log.WithName(tt.name), - versionInfo: &version.Info{}, } // First dashboard action From b654c236c0687c7aeea00b2b80bd4e0e46f02829 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Thu, 26 Sep 2024 16:00:11 -0400 Subject: [PATCH 16/18] cleaned up any extra versionInfo in test files --- internal/controller/datadogslo/controller_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/internal/controller/datadogslo/controller_test.go b/internal/controller/datadogslo/controller_test.go index 2e6b65beb..85d73667c 100644 --- a/internal/controller/datadogslo/controller_test.go +++ b/internal/controller/datadogslo/controller_test.go @@ -19,7 +19,6 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/version" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" @@ -147,7 +146,6 @@ func TestReconciler_Reconcile(t *testing.T) { datadogAuth: testAuth, recorder: recorder, log: testLogger, - versionInfo: &version.Info{}, } res, _ := r.Reconcile(ctx, tt.request) From f0338760552a763f02c393714071a51f0c2edfe8 Mon Sep 17 00:00:00 2001 From: mrdoggopat Date: Mon, 30 Sep 2024 14:08:30 -0400 Subject: [PATCH 17/18] fix spacings --- internal/controller/datadogagent/controller.go | 8 ++++---- internal/controller/datadogagent/store/store.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/controller/datadogagent/controller.go b/internal/controller/datadogagent/controller.go index 3239a8fc8..25af3d1ec 100644 --- a/internal/controller/datadogagent/controller.go +++ b/internal/controller/datadogagent/controller.go @@ -68,8 +68,8 @@ type ReconcilerOptions struct { // Reconciler is the internal reconciler for Datadog Agent type Reconciler struct { - options ReconcilerOptions - client client.Client + options ReconcilerOptions + client client.Client platformInfo kubernetes.PlatformInfo scheme *runtime.Scheme log logr.Logger @@ -82,8 +82,8 @@ func NewReconciler(options ReconcilerOptions, client client.Client, platformInfo scheme *runtime.Scheme, log logr.Logger, recorder record.EventRecorder, metricForwarder datadog.MetricForwardersManager, ) (*Reconciler, error) { return &Reconciler{ - options: options, - client: client, + options: options, + client: client, platformInfo: platformInfo, scheme: scheme, log: log, diff --git a/internal/controller/datadogagent/store/store.go b/internal/controller/datadogagent/store/store.go index 5528ced61..bd9181adf 100644 --- a/internal/controller/datadogagent/store/store.go +++ b/internal/controller/datadogagent/store/store.go @@ -68,7 +68,7 @@ type Store struct { mutex sync.RWMutex supportCilium bool - platformInfo kubernetes.PlatformInfo + platformInfo kubernetes.PlatformInfo scheme *runtime.Scheme logger logr.Logger @@ -78,7 +78,7 @@ type Store struct { // StoreOptions use to provide to NewStore() function some Store creation options. type StoreOptions struct { SupportCilium bool - PlatformInfo kubernetes.PlatformInfo + PlatformInfo kubernetes.PlatformInfo Scheme *runtime.Scheme Logger logr.Logger From 896d27435deb9232d37687e06116a801906f6f34 Mon Sep 17 00:00:00 2001 From: mrmcpat <109171317+mrdoggopat@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:22:36 -0400 Subject: [PATCH 18/18] correct spacing in NewReconciler --- internal/controller/datadogdashboard/controller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index f2301257b..48dbaf116 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -48,9 +48,9 @@ func NewReconciler(client client.Client, ddClient datadogclient.DatadogDashboard client: client, datadogClient: ddClient.Client, datadogAuth: ddClient.Auth, - scheme: scheme, - log: log, - recorder: recorder, + scheme: scheme, + log: log, + recorder: recorder, } }