diff --git a/.golangci.toml b/.golangci.toml index 72824aac8..3627ee872 100644 --- a/.golangci.toml +++ b/.golangci.toml @@ -21,7 +21,11 @@ [linters-settings.gci] sections = [ - "prefix(github.com/DataDog/datadog-operator)" + "standard", + "default", + "prefix(github.com/DataDog/datadog-operator)", + "blank", + "dot", ] [linters-settings.godot] @@ -55,7 +59,6 @@ "paralleltest", "nestif", "exhaustive", - "gci", "wsl", "godox", "godot", @@ -105,4 +108,4 @@ ".cache", "go/pkg/mod", "pkg/mod", - ] \ No newline at end of file + ] diff --git a/cmd/check-operator/main.go b/cmd/check-operator/main.go index 81dca8695..4e3c6546a 100644 --- a/cmd/check-operator/main.go +++ b/cmd/check-operator/main.go @@ -10,9 +10,10 @@ import ( "github.com/spf13/pflag" "k8s.io/cli-runtime/pkg/genericclioptions" - _ "k8s.io/client-go/plugin/pkg/client/auth" "github.com/DataDog/datadog-operator/cmd/check-operator/root" + + _ "k8s.io/client-go/plugin/pkg/client/auth" ) func main() { diff --git a/cmd/check-operator/upgrade/upgrade.go b/cmd/check-operator/upgrade/upgrade.go index 829e7036e..c9f5ad8cf 100644 --- a/cmd/check-operator/upgrade/upgrade.go +++ b/cmd/check-operator/upgrade/upgrade.go @@ -14,13 +14,13 @@ import ( "github.com/spf13/cobra" "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // Options provides information required to manage canary. diff --git a/cmd/helpers/main.go b/cmd/helpers/main.go index 6c3849a59..03e3e8257 100644 --- a/cmd/helpers/main.go +++ b/cmd/helpers/main.go @@ -8,9 +8,9 @@ package main import ( "os" - "github.com/DataDog/datadog-operator/cmd/helpers/secrets" - "github.com/spf13/cobra" + + "github.com/DataDog/datadog-operator/cmd/helpers/secrets" ) func main() { diff --git a/cmd/helpers/secrets/secrets.go b/cmd/helpers/secrets/secrets.go index 1d0bb0d35..1e37c8ae6 100644 --- a/cmd/helpers/secrets/secrets.go +++ b/cmd/helpers/secrets/secrets.go @@ -15,9 +15,9 @@ import ( "path/filepath" "strings" - s "github.com/DataDog/datadog-operator/pkg/secrets" - "github.com/spf13/cobra" + + s "github.com/DataDog/datadog-operator/pkg/secrets" ) const ( diff --git a/cmd/kubectl-datadog/agent/agent/agent.go b/cmd/kubectl-datadog/agent/agent/agent.go index c28c92aca..98e5ae99e 100644 --- a/cmd/kubectl-datadog/agent/agent/agent.go +++ b/cmd/kubectl-datadog/agent/agent/agent.go @@ -6,12 +6,12 @@ package agent import ( + "github.com/spf13/cobra" + "k8s.io/cli-runtime/pkg/genericclioptions" + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/agent/check" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/agent/find" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/agent/upgrade" - - "github.com/spf13/cobra" - "k8s.io/cli-runtime/pkg/genericclioptions" ) // options provides information required by agent command diff --git a/cmd/kubectl-datadog/agent/check/check.go b/cmd/kubectl-datadog/agent/check/check.go index 9c5b0bc9f..577a2c5fa 100644 --- a/cmd/kubectl-datadog/agent/check/check.go +++ b/cmd/kubectl-datadog/agent/check/check.go @@ -12,8 +12,6 @@ import ( "fmt" "sync" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -21,6 +19,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" restclient "k8s.io/client-go/rest" "k8s.io/client-go/tools/remotecommand" + + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) const ( diff --git a/cmd/kubectl-datadog/agent/find/find.go b/cmd/kubectl-datadog/agent/find/find.go index bdddace57..ad681ee23 100644 --- a/cmd/kubectl-datadog/agent/find/find.go +++ b/cmd/kubectl-datadog/agent/find/find.go @@ -10,11 +10,11 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var findExample = ` diff --git a/cmd/kubectl-datadog/agent/upgrade/upgrade.go b/cmd/kubectl-datadog/agent/upgrade/upgrade.go index 8a60269a0..d4f439e41 100644 --- a/cmd/kubectl-datadog/agent/upgrade/upgrade.go +++ b/cmd/kubectl-datadog/agent/upgrade/upgrade.go @@ -10,15 +10,15 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/pkg/defaulting" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/pkg/defaulting" + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var ( diff --git a/cmd/kubectl-datadog/clusteragent/clusteragent/clusteragent.go b/cmd/kubectl-datadog/clusteragent/clusteragent/clusteragent.go index cea8a1ea9..afcb695ff 100644 --- a/cmd/kubectl-datadog/clusteragent/clusteragent/clusteragent.go +++ b/cmd/kubectl-datadog/clusteragent/clusteragent/clusteragent.go @@ -6,11 +6,11 @@ package clusteragent import ( - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/clusteragent/leader" - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/clusteragent/upgrade" - "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/clusteragent/leader" + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/clusteragent/upgrade" ) // options provides information required by clusteragent command diff --git a/cmd/kubectl-datadog/clusteragent/leader/leader.go b/cmd/kubectl-datadog/clusteragent/leader/leader.go index f13c6f623..4aebf1c3b 100644 --- a/cmd/kubectl-datadog/clusteragent/leader/leader.go +++ b/cmd/kubectl-datadog/clusteragent/leader/leader.go @@ -10,8 +10,6 @@ import ( "encoding/json" "fmt" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/spf13/cobra" coordv1 "k8s.io/api/coordination/v1" corev1 "k8s.io/api/core/v1" @@ -20,6 +18,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/discovery" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var leaderExample = ` diff --git a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go index 3bb3f9145..07683c270 100644 --- a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go +++ b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go @@ -10,15 +10,15 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/pkg/defaulting" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/pkg/defaulting" + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var ( diff --git a/cmd/kubectl-datadog/datadog/datadog.go b/cmd/kubectl-datadog/datadog/datadog.go index b592d43b0..c14d3f9aa 100644 --- a/cmd/kubectl-datadog/datadog/datadog.go +++ b/cmd/kubectl-datadog/datadog/datadog.go @@ -6,15 +6,15 @@ package datadog import ( + "github.com/spf13/cobra" + "k8s.io/cli-runtime/pkg/genericclioptions" + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/agent/agent" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/clusteragent/clusteragent" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/flare" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/get" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/metrics" "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/validate" - - "github.com/spf13/cobra" - "k8s.io/cli-runtime/pkg/genericclioptions" ) // options provides information required by datadog command diff --git a/cmd/kubectl-datadog/flare/flare.go b/cmd/kubectl-datadog/flare/flare.go index 2ef29e47e..a7b667fc8 100644 --- a/cmd/kubectl-datadog/flare/flare.go +++ b/cmd/kubectl-datadog/flare/flare.go @@ -23,10 +23,6 @@ import ( "strings" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/DataDog/datadog-operator/pkg/version" - "github.com/mholt/archiver/v3" "github.com/spf13/cobra" "gopkg.in/yaml.v3" @@ -36,6 +32,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/tools/remotecommand" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/pkg/plugin/common" + "github.com/DataDog/datadog-operator/pkg/version" ) const ( diff --git a/cmd/kubectl-datadog/get/get.go b/cmd/kubectl-datadog/get/get.go index 9108646eb..927fc599d 100644 --- a/cmd/kubectl-datadog/get/get.go +++ b/cmd/kubectl-datadog/get/get.go @@ -11,14 +11,14 @@ import ( "fmt" "io" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var getExample = ` diff --git a/cmd/kubectl-datadog/main.go b/cmd/kubectl-datadog/main.go index 4541f36e3..f74f41722 100644 --- a/cmd/kubectl-datadog/main.go +++ b/cmd/kubectl-datadog/main.go @@ -8,10 +8,11 @@ package main import ( "os" - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/datadog" - "github.com/spf13/pflag" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/datadog" + _ "k8s.io/client-go/plugin/pkg/client/auth" ) diff --git a/cmd/kubectl-datadog/metrics/get/get.go b/cmd/kubectl-datadog/metrics/get/get.go index 798a991de..72f444cb8 100644 --- a/cmd/kubectl-datadog/metrics/get/get.go +++ b/cmd/kubectl-datadog/metrics/get/get.go @@ -7,15 +7,15 @@ import ( "io" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/pkg/plugin/common" - "k8s.io/apimachinery/pkg/util/duration" - "github.com/olekukonko/tablewriter" "github.com/spf13/cobra" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/util/duration" "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var getExample = ` diff --git a/cmd/kubectl-datadog/metrics/metrics.go b/cmd/kubectl-datadog/metrics/metrics.go index 7b68f9975..1f0bc21a6 100644 --- a/cmd/kubectl-datadog/metrics/metrics.go +++ b/cmd/kubectl-datadog/metrics/metrics.go @@ -1,10 +1,10 @@ package metrics import ( - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/metrics/get" - "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/metrics/get" ) // options provides information required by agent command diff --git a/cmd/kubectl-datadog/validate/ad/ad/ad.go b/cmd/kubectl-datadog/validate/ad/ad/ad.go index ee61ec84f..a8d768110 100644 --- a/cmd/kubectl-datadog/validate/ad/ad/ad.go +++ b/cmd/kubectl-datadog/validate/ad/ad/ad.go @@ -6,11 +6,11 @@ package ad import ( - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/ad/pod" - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/ad/service" - "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/ad/pod" + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/ad/service" ) // options provides information required by ad command. diff --git a/cmd/kubectl-datadog/validate/ad/pod/pod.go b/cmd/kubectl-datadog/validate/ad/pod/pod.go index ad0c0c9d2..1e0b670f8 100644 --- a/cmd/kubectl-datadog/validate/ad/pod/pod.go +++ b/cmd/kubectl-datadog/validate/ad/pod/pod.go @@ -10,10 +10,11 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/pkg/plugin/common" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var podExample = ` diff --git a/cmd/kubectl-datadog/validate/ad/service/service.go b/cmd/kubectl-datadog/validate/ad/service/service.go index 146ea0d57..ad9a0e5db 100644 --- a/cmd/kubectl-datadog/validate/ad/service/service.go +++ b/cmd/kubectl-datadog/validate/ad/service/service.go @@ -10,10 +10,11 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/pkg/plugin/common" "github.com/spf13/cobra" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/pkg/plugin/common" ) var serviceExample = ` diff --git a/cmd/kubectl-datadog/validate/validate/validate.go b/cmd/kubectl-datadog/validate/validate/validate.go index 0408707b9..ec0da22c9 100644 --- a/cmd/kubectl-datadog/validate/validate/validate.go +++ b/cmd/kubectl-datadog/validate/validate/validate.go @@ -6,10 +6,10 @@ package validate import ( - "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/ad/ad" - "github.com/spf13/cobra" "k8s.io/cli-runtime/pkg/genericclioptions" + + "github.com/DataDog/datadog-operator/cmd/kubectl-datadog/validate/ad/ad" ) // options provides information required by validate command diff --git a/cmd/main.go b/cmd/main.go index 629f4b41b..b99430bae 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -14,37 +14,35 @@ import ( "strings" "time" + edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" + "github.com/go-logr/logr" + "go.uber.org/zap" + "go.uber.org/zap/zapcore" + "gopkg.in/DataDog/dd-trace-go.v1/profiler" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "k8s.io/client-go/tools/leaderelection/resourcelock" - klog "k8s.io/klog/v2" + "k8s.io/klog/v2" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ctrl "sigs.k8s.io/controller-runtime" ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/metrics/filters" - - "go.uber.org/zap" - "go.uber.org/zap/zapcore" - - "gopkg.in/DataDog/dd-trace-go.v1/profiler" - - edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" - "github.com/go-logr/logr" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller" "github.com/DataDog/datadog-operator/internal/controller/metrics" - "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/controller/debug" "github.com/DataDog/datadog-operator/pkg/remoteconfig" "github.com/DataDog/datadog-operator/pkg/secrets" "github.com/DataDog/datadog-operator/pkg/version" + + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" + // nolint:gci // +kubebuilder:scaffold:imports ) @@ -205,7 +203,7 @@ func run(opts *options) error { } version.PrintVersionLogs(setupLog) - //submits the maximum go routine setting as a metric + // submits the maximum go routine setting as a metric metrics.MaxGoroutines.Set(float64(opts.maximumGoroutines)) if opts.profilingEnabled { diff --git a/hack/generate-docs/generate-docs.go b/hack/generate-docs/generate-docs.go index 4db6360bd..10996bfb6 100644 --- a/hack/generate-docs/generate-docs.go +++ b/hack/generate-docs/generate-docs.go @@ -11,7 +11,6 @@ import ( "golang.org/x/text/cases" "golang.org/x/text/language" - apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "sigs.k8s.io/yaml" ) diff --git a/internal/controller/datadogagent/common/utils.go b/internal/controller/datadogagent/common/utils.go index 4e49386ae..6f8f2ffe7 100644 --- a/internal/controller/datadogagent/common/utils.go +++ b/internal/controller/datadogagent/common/utils.go @@ -9,17 +9,17 @@ import ( "fmt" "strings" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/version" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/utils" - - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/version" ) // NewDeployment use to generate the skeleton of a new deployment based on few information diff --git a/internal/controller/datadogagent/component/agent/default.go b/internal/controller/datadogagent/component/agent/default.go index a1c949623..094c5f022 100644 --- a/internal/controller/datadogagent/component/agent/default.go +++ b/internal/controller/datadogagent/component/agent/default.go @@ -10,6 +10,9 @@ import ( "strconv" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -21,10 +24,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/secrets" - - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // NewDefaultAgentDaemonset return a new default agent DaemonSet diff --git a/internal/controller/datadogagent/component/agent/new.go b/internal/controller/datadogagent/component/agent/new.go index 11dd031fe..c89792252 100644 --- a/internal/controller/datadogagent/component/agent/new.go +++ b/internal/controller/datadogagent/component/agent/new.go @@ -8,12 +8,12 @@ package agent import ( "time" - apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" ) // NewDaemonset use to generate the skeleton of a new daemonset based on few information diff --git a/internal/controller/datadogagent/component/clusteragent/default.go b/internal/controller/datadogagent/component/clusteragent/default.go index e115935ba..0a53bb018 100644 --- a/internal/controller/datadogagent/component/clusteragent/default.go +++ b/internal/controller/datadogagent/component/clusteragent/default.go @@ -16,7 +16,6 @@ import ( apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils" diff --git a/internal/controller/datadogagent/component/clusteragent/utils.go b/internal/controller/datadogagent/component/clusteragent/utils.go index d287fe65d..3e4331033 100644 --- a/internal/controller/datadogagent/component/clusteragent/utils.go +++ b/internal/controller/datadogagent/component/clusteragent/utils.go @@ -9,19 +9,19 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "sigs.k8s.io/controller-runtime/pkg/client" - - "github.com/DataDog/datadog-operator/pkg/constants" corev1 "k8s.io/api/core/v1" policyv1 "k8s.io/api/policy/v1" policyv1beta1 "k8s.io/api/policy/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/version" + "sigs.k8s.io/controller-runtime/pkg/client" + + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" + "github.com/DataDog/datadog-operator/pkg/constants" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" ) // GetClusterAgentService returns the Cluster-Agent service diff --git a/internal/controller/datadogagent/component/objects/network.go b/internal/controller/datadogagent/component/objects/network.go index 5baa1f23c..8eb538c03 100644 --- a/internal/controller/datadogagent/component/objects/network.go +++ b/internal/controller/datadogagent/component/objects/network.go @@ -20,7 +20,6 @@ import ( componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" componentccr "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusterchecksrunner" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" - cilium "github.com/DataDog/datadog-operator/pkg/cilium/v1" "github.com/DataDog/datadog-operator/pkg/kubernetes" ) diff --git a/internal/controller/datadogagent/controller_reconcile_agent.go b/internal/controller/datadogagent/controller_reconcile_agent.go index 5905d1d88..21b7f7043 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent.go +++ b/internal/controller/datadogagent/controller_reconcile_agent.go @@ -10,6 +10,14 @@ import ( "time" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" + "github.com/go-logr/logr" + appsv1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" @@ -24,15 +32,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - appsv1 "k8s.io/api/apps/v1" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) func (r *Reconciler) reconcileV2Agent(logger logr.Logger, requiredComponents feature.RequiredComponents, features []feature.Feature, diff --git a/internal/controller/datadogagent/controller_reconcile_ccr.go b/internal/controller/datadogagent/controller_reconcile_ccr.go index 8882f06ea..1b519bb89 100644 --- a/internal/controller/datadogagent/controller_reconcile_ccr.go +++ b/internal/controller/datadogagent/controller_reconcile_ccr.go @@ -9,6 +9,14 @@ import ( "context" "time" + "github.com/go-logr/logr" + appsv1 "k8s.io/api/apps/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -20,14 +28,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - appsv1 "k8s.io/api/apps/v1" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) func (r *Reconciler) reconcileV2ClusterChecksRunner(logger logr.Logger, requiredComponents feature.RequiredComponents, features []feature.Feature, dda *datadoghqv2alpha1.DatadogAgent, resourcesManager feature.ResourceManagers, newStatus *datadoghqv2alpha1.DatadogAgentStatus) (reconcile.Result, error) { diff --git a/internal/controller/datadogagent/controller_reconcile_dca.go b/internal/controller/datadogagent/controller_reconcile_dca.go index 9fb18dd38..caacffa71 100644 --- a/internal/controller/datadogagent/controller_reconcile_dca.go +++ b/internal/controller/datadogagent/controller_reconcile_dca.go @@ -9,6 +9,15 @@ import ( "context" "time" + "github.com/go-logr/logr" + appsv1 "k8s.io/api/apps/v1" + "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + utilerrors "k8s.io/apimachinery/pkg/util/errors" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -20,15 +29,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - appsv1 "k8s.io/api/apps/v1" - "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - utilerrors "k8s.io/apimachinery/pkg/util/errors" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) func (r *Reconciler) reconcileV2ClusterAgent(logger logr.Logger, requiredComponents feature.RequiredComponents, features []feature.Feature, dda *datadoghqv2alpha1.DatadogAgent, resourcesManager feature.ResourceManagers, newStatus *datadoghqv2alpha1.DatadogAgentStatus) (reconcile.Result, error) { diff --git a/internal/controller/datadogagent/controller_reconcile_v2.go b/internal/controller/datadogagent/controller_reconcile_v2.go index bb876d8b3..5b0ed7ee2 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2.go +++ b/internal/controller/datadogagent/controller_reconcile_v2.go @@ -10,6 +10,15 @@ import ( "fmt" "time" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + apiequality "k8s.io/apimachinery/pkg/api/equality" + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/util/errors" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" @@ -23,15 +32,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/secrets" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - apiequality "k8s.io/apimachinery/pkg/api/equality" - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/types" - "k8s.io/apimachinery/pkg/util/errors" - "sigs.k8s.io/controller-runtime/pkg/reconcile" ) func (r *Reconciler) internalReconcileV2(ctx context.Context, request reconcile.Request) (reconcile.Result, error) { diff --git a/internal/controller/datadogagent/controller_reconcile_v2_common.go b/internal/controller/datadogagent/controller_reconcile_v2_common.go index c0fc9814b..69679cea9 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_common.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_common.go @@ -11,16 +11,7 @@ import ( "fmt" "time" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - "github.com/DataDog/datadog-operator/pkg/agentprofile" - "github.com/DataDog/datadog-operator/pkg/condition" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - + edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -30,7 +21,15 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/pkg/agentprofile" + "github.com/DataDog/datadog-operator/pkg/condition" + "github.com/DataDog/datadog-operator/pkg/constants" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" + "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" + "github.com/DataDog/datadog-operator/pkg/kubernetes" ) const ( diff --git a/internal/controller/datadogagent/feature/admissioncontroller/feature.go b/internal/controller/datadogagent/feature/admissioncontroller/feature.go index 1bd53484a..a80bbb0bb 100644 --- a/internal/controller/datadogagent/feature/admissioncontroller/feature.go +++ b/internal/controller/datadogagent/feature/admissioncontroller/feature.go @@ -9,6 +9,11 @@ import ( "encoding/json" "strconv" + corev1 "k8s.io/api/core/v1" + netv1 "k8s.io/api/networking/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -18,11 +23,6 @@ import ( cilium "github.com/DataDog/datadog-operator/pkg/cilium/v1" "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/defaulting" - - corev1 "k8s.io/api/core/v1" - netv1 "k8s.io/api/networking/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/intstr" ) func init() { diff --git a/internal/controller/datadogagent/feature/apm/rbac.go b/internal/controller/datadogagent/feature/apm/rbac.go index 5820bdef6..1a1398132 100644 --- a/internal/controller/datadogagent/feature/apm/rbac.go +++ b/internal/controller/datadogagent/feature/apm/rbac.go @@ -6,8 +6,9 @@ package apm import ( - "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" rbacv1 "k8s.io/api/rbac/v1" + + "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" ) func getLanguageDetectionRBACPolicyRules() []rbacv1.PolicyRule { diff --git a/internal/controller/datadogagent/feature/asm/feature.go b/internal/controller/datadogagent/feature/asm/feature.go index bc22dc852..43091d4d3 100644 --- a/internal/controller/datadogagent/feature/asm/feature.go +++ b/internal/controller/datadogagent/feature/asm/feature.go @@ -6,13 +6,14 @@ package asm import ( + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func init() { diff --git a/internal/controller/datadogagent/feature/autoscaling/feature.go b/internal/controller/datadogagent/feature/autoscaling/feature.go index 2ce02f175..48d2dffd4 100644 --- a/internal/controller/datadogagent/feature/autoscaling/feature.go +++ b/internal/controller/datadogagent/feature/autoscaling/feature.go @@ -8,17 +8,16 @@ package autoscaling import ( "errors" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" - "github.com/go-logr/logr" - - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/DataDog/datadog-operator/pkg/constants" ) func init() { diff --git a/internal/controller/datadogagent/feature/clusterchecks/feature.go b/internal/controller/datadogagent/feature/clusterchecks/feature.go index d2d099635..20c4288af 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature.go @@ -6,6 +6,12 @@ package clusterchecks import ( + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + netv1 "k8s.io/api/networking/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -16,12 +22,6 @@ import ( cilium "github.com/DataDog/datadog-operator/pkg/cilium/v1" "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - netv1 "k8s.io/api/networking/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/intstr" ) func init() { diff --git a/internal/controller/datadogagent/feature/cspm/feature.go b/internal/controller/datadogagent/feature/cspm/feature.go index 3d1696d11..c072f58a6 100644 --- a/internal/controller/datadogagent/feature/cspm/feature.go +++ b/internal/controller/datadogagent/feature/cspm/feature.go @@ -8,6 +8,10 @@ package cspm import ( "strconv" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -19,10 +23,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func init() { diff --git a/internal/controller/datadogagent/feature/cws/feature.go b/internal/controller/datadogagent/feature/cws/feature.go index 598c57fd9..7d1015d94 100644 --- a/internal/controller/datadogagent/feature/cws/feature.go +++ b/internal/controller/datadogagent/feature/cws/feature.go @@ -8,23 +8,22 @@ package cws import ( "path/filepath" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/go-logr/logr" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" ) func init() { diff --git a/internal/controller/datadogagent/feature/enabledefault/feature.go b/internal/controller/datadogagent/feature/enabledefault/feature.go index d6eae6626..53b4c533d 100644 --- a/internal/controller/datadogagent/feature/enabledefault/feature.go +++ b/internal/controller/datadogagent/feature/enabledefault/feature.go @@ -10,6 +10,11 @@ import ( "fmt" "os" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/errors" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -24,11 +29,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/secrets" "github.com/DataDog/datadog-operator/pkg/version" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/errors" ) func init() { diff --git a/internal/controller/datadogagent/feature/enabledefault/rbac.go b/internal/controller/datadogagent/feature/enabledefault/rbac.go index 85b553f67..fa4709849 100644 --- a/internal/controller/datadogagent/feature/enabledefault/rbac.go +++ b/internal/controller/datadogagent/feature/enabledefault/rbac.go @@ -9,13 +9,13 @@ import ( "fmt" "strings" + rbacv1 "k8s.io/api/rbac/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" - - rbacv1 "k8s.io/api/rbac/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) // RBAC for Agent diff --git a/internal/controller/datadogagent/feature/eventcollection/configmap.go b/internal/controller/datadogagent/feature/eventcollection/configmap.go index 65a654c18..f8d7e8bc2 100644 --- a/internal/controller/datadogagent/feature/eventcollection/configmap.go +++ b/internal/controller/datadogagent/feature/eventcollection/configmap.go @@ -6,10 +6,11 @@ package eventcollection import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) func buildDefaultConfigMap(namespace, name string, unbundleEvents bool, collectedEventTypes []v2alpha1.EventTypes) (*corev1.ConfigMap, error) { diff --git a/internal/controller/datadogagent/feature/eventcollection/feature.go b/internal/controller/datadogagent/feature/eventcollection/feature.go index 5b1acd4ce..3601698fa 100644 --- a/internal/controller/datadogagent/feature/eventcollection/feature.go +++ b/internal/controller/datadogagent/feature/eventcollection/feature.go @@ -8,14 +8,13 @@ package eventcollection import ( "fmt" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/go-logr/logr" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" common "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature.go b/internal/controller/datadogagent/feature/externalmetrics/feature.go index 1cc53ba33..b985df265 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature.go @@ -9,6 +9,13 @@ import ( "fmt" "strconv" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + netv1 "k8s.io/api/networking/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/apimachinery/pkg/util/intstr" + apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -20,13 +27,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" "github.com/DataDog/datadog-operator/pkg/secrets" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - netv1 "k8s.io/api/networking/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/util/intstr" - apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ) func init() { diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap.go b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap.go index 02ada2ee1..a8050bc5e 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap.go @@ -9,9 +9,10 @@ import ( "fmt" "strconv" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" ) func (f *ksmFeature) buildKSMCoreConfigMap(collectorOpts collectorOptions) (*corev1.ConfigMap, error) { diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go index fc5252a43..ef0310c56 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go @@ -8,24 +8,22 @@ package kubernetesstatecore import ( "fmt" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/DataDog/datadog-operator/pkg/utils" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" + "github.com/DataDog/datadog-operator/pkg/constants" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" + "github.com/DataDog/datadog-operator/pkg/kubernetes" + "github.com/DataDog/datadog-operator/pkg/utils" ) func init() { diff --git a/internal/controller/datadogagent/feature/livecontainer/feature.go b/internal/controller/datadogagent/feature/livecontainer/feature.go index 5792ceff2..bbd1bed41 100644 --- a/internal/controller/datadogagent/feature/livecontainer/feature.go +++ b/internal/controller/datadogagent/feature/livecontainer/feature.go @@ -8,10 +8,9 @@ package livecontainer import ( corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" diff --git a/internal/controller/datadogagent/feature/liveprocess/feature.go b/internal/controller/datadogagent/feature/liveprocess/feature.go index 494bc44aa..1c8b59bb0 100644 --- a/internal/controller/datadogagent/feature/liveprocess/feature.go +++ b/internal/controller/datadogagent/feature/liveprocess/feature.go @@ -8,10 +8,9 @@ package liveprocess import ( corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" diff --git a/internal/controller/datadogagent/feature/logcollection/feature.go b/internal/controller/datadogagent/feature/logcollection/feature.go index 972ba3341..4b2dae634 100644 --- a/internal/controller/datadogagent/feature/logcollection/feature.go +++ b/internal/controller/datadogagent/feature/logcollection/feature.go @@ -10,10 +10,9 @@ import ( corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/npm/feature.go b/internal/controller/datadogagent/feature/npm/feature.go index 7ea4ebcdf..08ef5e24e 100644 --- a/internal/controller/datadogagent/feature/npm/feature.go +++ b/internal/controller/datadogagent/feature/npm/feature.go @@ -6,14 +6,13 @@ package npm import ( - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" ) diff --git a/internal/controller/datadogagent/feature/oomkill/feature.go b/internal/controller/datadogagent/feature/oomkill/feature.go index 97695b25c..666d2e7ee 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature.go +++ b/internal/controller/datadogagent/feature/oomkill/feature.go @@ -6,17 +6,16 @@ package oomkill import ( - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" - "github.com/DataDog/datadog-operator/pkg/kubernetes" corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" + "github.com/DataDog/datadog-operator/pkg/kubernetes" ) func init() { diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap.go b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap.go index affc79cb8..0123c97e8 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap.go @@ -9,9 +9,10 @@ import ( "fmt" "strconv" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" ) func (f *orchestratorExplorerFeature) buildOrchestratorExplorerConfigMap() (*corev1.ConfigMap, error) { diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go index 08a74cfc3..986ac0f34 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go @@ -8,22 +8,21 @@ package orchestratorexplorer import ( "fmt" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/DataDog/datadog-operator/pkg/utils" - "github.com/go-logr/logr" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" + "github.com/DataDog/datadog-operator/pkg/constants" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" + "github.com/DataDog/datadog-operator/pkg/kubernetes" + "github.com/DataDog/datadog-operator/pkg/utils" ) func init() { diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/rbac.go b/internal/controller/datadogagent/feature/orchestratorexplorer/rbac.go index d3c67c4d5..55f523e42 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/rbac.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/rbac.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" - "github.com/go-logr/logr" rbacv1 "k8s.io/api/rbac/v1" apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" + + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" ) // getRBACRules generates the cluster role permissions required for the orchestrator explorer feature diff --git a/internal/controller/datadogagent/feature/otelcollector/feature.go b/internal/controller/datadogagent/feature/otelcollector/feature.go index 161d44957..4696a30f2 100644 --- a/internal/controller/datadogagent/feature/otelcollector/feature.go +++ b/internal/controller/datadogagent/feature/otelcollector/feature.go @@ -4,6 +4,10 @@ import ( "strconv" "strings" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -16,10 +20,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func init() { diff --git a/internal/controller/datadogagent/feature/otlp/feature.go b/internal/controller/datadogagent/feature/otlp/feature.go index 266b66464..e87b79f92 100644 --- a/internal/controller/datadogagent/feature/otlp/feature.go +++ b/internal/controller/datadogagent/feature/otlp/feature.go @@ -11,21 +11,20 @@ import ( "strconv" "strings" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/pkg/cilium/v1" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/go-logr/logr" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/objects" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" + "github.com/DataDog/datadog-operator/pkg/cilium/v1" + "github.com/DataDog/datadog-operator/pkg/constants" ) var ( diff --git a/internal/controller/datadogagent/feature/prometheusscrape/feature.go b/internal/controller/datadogagent/feature/prometheusscrape/feature.go index 3a9390270..e648994b2 100644 --- a/internal/controller/datadogagent/feature/prometheusscrape/feature.go +++ b/internal/controller/datadogagent/feature/prometheusscrape/feature.go @@ -10,10 +10,9 @@ import ( corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" ) diff --git a/internal/controller/datadogagent/feature/remoteconfig/feature.go b/internal/controller/datadogagent/feature/remoteconfig/feature.go index c86470bea..e32bfdd0a 100644 --- a/internal/controller/datadogagent/feature/remoteconfig/feature.go +++ b/internal/controller/datadogagent/feature/remoteconfig/feature.go @@ -6,15 +6,13 @@ package remoteconfig import ( + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/go-logr/logr" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" ) diff --git a/internal/controller/datadogagent/feature/sbom/feature.go b/internal/controller/datadogagent/feature/sbom/feature.go index fb3c06ff8..d90fced23 100644 --- a/internal/controller/datadogagent/feature/sbom/feature.go +++ b/internal/controller/datadogagent/feature/sbom/feature.go @@ -8,15 +8,13 @@ package sbom import ( "strings" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/go-logr/logr" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go index bdd5f5a17..27248a8d3 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go @@ -8,16 +8,14 @@ package tcpqueuelength import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" + "github.com/DataDog/datadog-operator/pkg/kubernetes" ) func init() { diff --git a/internal/controller/datadogagent/feature/test/testsuite.go b/internal/controller/datadogagent/feature/test/testsuite.go index 2d3a8be54..209777f5e 100644 --- a/internal/controller/datadogagent/feature/test/testsuite.go +++ b/internal/controller/datadogagent/feature/test/testsuite.go @@ -3,6 +3,12 @@ package test import ( "testing" + "github.com/go-logr/logr" + v1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" @@ -10,12 +16,6 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" testutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - v1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - logf "sigs.k8s.io/controller-runtime/pkg/log" - "sigs.k8s.io/controller-runtime/pkg/log/zap" ) // FeatureTestSuite use define several tests on a Feature diff --git a/internal/controller/datadogagent/feature/types.go b/internal/controller/datadogagent/feature/types.go index c0d34f177..c782d3ea3 100644 --- a/internal/controller/datadogagent/feature/types.go +++ b/internal/controller/datadogagent/feature/types.go @@ -6,14 +6,14 @@ package feature import ( + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" ) // RequiredComponents use to know which component need to be enabled for the feature diff --git a/internal/controller/datadogagent/feature/usm/feature.go b/internal/controller/datadogagent/feature/usm/feature.go index 4462cc9f9..f4f9b30b6 100644 --- a/internal/controller/datadogagent/feature/usm/feature.go +++ b/internal/controller/datadogagent/feature/usm/feature.go @@ -6,14 +6,13 @@ package usm import ( - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" - - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" ) diff --git a/internal/controller/datadogagent/feature/utils/utils.go b/internal/controller/datadogagent/feature/utils/utils.go index 299d10b2c..3e31203e3 100644 --- a/internal/controller/datadogagent/feature/utils/utils.go +++ b/internal/controller/datadogagent/feature/utils/utils.go @@ -9,10 +9,9 @@ import ( "strconv" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/utils" - - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" ) const ProcessCongigRunInCoreAgentMinVersion = "7.60.0-0" diff --git a/internal/controller/datadogagent/finalizer.go b/internal/controller/datadogagent/finalizer.go index 68ed87682..90ac6647b 100644 --- a/internal/controller/datadogagent/finalizer.go +++ b/internal/controller/datadogagent/finalizer.go @@ -9,6 +9,12 @@ import ( "context" "fmt" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" + "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/reconcile" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/defaults" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" @@ -16,12 +22,6 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/agentprofile" "github.com/DataDog/datadog-operator/pkg/controller/utils" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/errors" - "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - - "github.com/go-logr/logr" ) const ( diff --git a/internal/controller/datadogagent/merger/apiservice.go b/internal/controller/datadogagent/merger/apiservice.go index a84d5ccec..c650cf00c 100644 --- a/internal/controller/datadogagent/merger/apiservice.go +++ b/internal/controller/datadogagent/merger/apiservice.go @@ -8,10 +8,10 @@ package merger import ( "fmt" + apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" ) // APIServiceManager is used to manage service resources. diff --git a/internal/controller/datadogagent/merger/configmap.go b/internal/controller/datadogagent/merger/configmap.go index b66a93900..9d08e0cc7 100644 --- a/internal/controller/datadogagent/merger/configmap.go +++ b/internal/controller/datadogagent/merger/configmap.go @@ -8,10 +8,10 @@ package merger import ( "fmt" + corev1 "k8s.io/api/core/v1" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - corev1 "k8s.io/api/core/v1" ) // ConfigMapManager is used to manage configmap resources. diff --git a/internal/controller/datadogagent/merger/envvarfrom.go b/internal/controller/datadogagent/merger/envvarfrom.go index 212ca49cd..091f2b34f 100644 --- a/internal/controller/datadogagent/merger/envvarfrom.go +++ b/internal/controller/datadogagent/merger/envvarfrom.go @@ -6,8 +6,9 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // EnvFromVarManager use to manage adding Environment variable to container in a PodTemplateSpec diff --git a/internal/controller/datadogagent/merger/envvars.go b/internal/controller/datadogagent/merger/envvars.go index 499fd6404..fef138fd5 100644 --- a/internal/controller/datadogagent/merger/envvars.go +++ b/internal/controller/datadogagent/merger/envvars.go @@ -8,8 +8,9 @@ package merger import ( "strings" - "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // EnvVarManager use to manage adding Environment variable to container in a PodTemplateSpec diff --git a/internal/controller/datadogagent/merger/fake/envfromvar_manager.go b/internal/controller/datadogagent/merger/fake/envfromvar_manager.go index 8af5bc69b..ee916242b 100644 --- a/internal/controller/datadogagent/merger/fake/envfromvar_manager.go +++ b/internal/controller/datadogagent/merger/fake/envfromvar_manager.go @@ -3,10 +3,10 @@ package fake import ( "testing" + v1 "k8s.io/api/core/v1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" - - v1 "k8s.io/api/core/v1" ) // EnvVarManager is an autogenerated mock type for the EnvVarManager type diff --git a/internal/controller/datadogagent/merger/fake/envvar_manager.go b/internal/controller/datadogagent/merger/fake/envvar_manager.go index d7857ca78..d6a662237 100644 --- a/internal/controller/datadogagent/merger/fake/envvar_manager.go +++ b/internal/controller/datadogagent/merger/fake/envvar_manager.go @@ -3,10 +3,10 @@ package fake import ( "testing" + v1 "k8s.io/api/core/v1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" - - v1 "k8s.io/api/core/v1" ) // EnvVarManager is an autogenerated mock type for the EnvVarManager type diff --git a/internal/controller/datadogagent/merger/fake/port_manager.go b/internal/controller/datadogagent/merger/fake/port_manager.go index 801f5c4bc..d5e44c54a 100644 --- a/internal/controller/datadogagent/merger/fake/port_manager.go +++ b/internal/controller/datadogagent/merger/fake/port_manager.go @@ -8,10 +8,10 @@ package fake import ( "testing" + v1 "k8s.io/api/core/v1" + common "github.com/DataDog/datadog-operator/api/datadoghq/common" merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" - - v1 "k8s.io/api/core/v1" ) // PortManager is an autogenerated mock type for the PortManager type diff --git a/internal/controller/datadogagent/merger/fake/security_context_manager.go b/internal/controller/datadogagent/merger/fake/security_context_manager.go index 4fb498110..5a50776e3 100644 --- a/internal/controller/datadogagent/merger/fake/security_context_manager.go +++ b/internal/controller/datadogagent/merger/fake/security_context_manager.go @@ -3,9 +3,9 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - v1 "k8s.io/api/core/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // SecurityContextManager is a mock type for the SecurityContextManager type diff --git a/internal/controller/datadogagent/merger/fake/volume_manager.go b/internal/controller/datadogagent/merger/fake/volume_manager.go index 8ed5d14e2..b1ddd915d 100644 --- a/internal/controller/datadogagent/merger/fake/volume_manager.go +++ b/internal/controller/datadogagent/merger/fake/volume_manager.go @@ -3,9 +3,9 @@ package fake import ( "testing" - merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" - v1 "k8s.io/api/core/v1" + + merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" ) // VolumeManager is an autogenerated mock type for the VolumeManager type diff --git a/internal/controller/datadogagent/merger/fake/volume_mount_manager.go b/internal/controller/datadogagent/merger/fake/volume_mount_manager.go index db2d41469..89e2bb873 100644 --- a/internal/controller/datadogagent/merger/fake/volume_mount_manager.go +++ b/internal/controller/datadogagent/merger/fake/volume_mount_manager.go @@ -3,10 +3,10 @@ package fake import ( "testing" + v1 "k8s.io/api/core/v1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" - - v1 "k8s.io/api/core/v1" ) var initContainerNames = []common.AgentContainerName{common.InitConfigContainerName, common.InitVolumeContainerName, common.SeccompSetupContainerName} diff --git a/internal/controller/datadogagent/merger/network_policy.go b/internal/controller/datadogagent/merger/network_policy.go index aa5576ec2..86c54af24 100644 --- a/internal/controller/datadogagent/merger/network_policy.go +++ b/internal/controller/datadogagent/merger/network_policy.go @@ -8,11 +8,11 @@ package merger import ( "fmt" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - netv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" + "github.com/DataDog/datadog-operator/pkg/kubernetes" ) // NetworkPolicyManager is used to manage network policy resources. diff --git a/internal/controller/datadogagent/merger/port.go b/internal/controller/datadogagent/merger/port.go index b15fdd5a6..2b9220bc4 100644 --- a/internal/controller/datadogagent/merger/port.go +++ b/internal/controller/datadogagent/merger/port.go @@ -6,8 +6,9 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // PortManager use to manage adding ports to a container in a PodTemplateSpec diff --git a/internal/controller/datadogagent/merger/rbac.go b/internal/controller/datadogagent/merger/rbac.go index 888a9bc16..c907e04c1 100644 --- a/internal/controller/datadogagent/merger/rbac.go +++ b/internal/controller/datadogagent/merger/rbac.go @@ -8,13 +8,13 @@ package merger import ( "fmt" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" - corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/util/errors" + + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" + "github.com/DataDog/datadog-operator/pkg/kubernetes" + "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" ) // RBACManager use to manage RBAC resources. diff --git a/internal/controller/datadogagent/merger/secret.go b/internal/controller/datadogagent/merger/secret.go index 9ef61904c..2fa3c9219 100644 --- a/internal/controller/datadogagent/merger/secret.go +++ b/internal/controller/datadogagent/merger/secret.go @@ -8,12 +8,12 @@ package merger import ( "fmt" + "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/go-logr/logr" ) // SecretManager Kubernetes Secret Manager interface diff --git a/internal/controller/datadogagent/merger/security_context.go b/internal/controller/datadogagent/merger/security_context.go index a814ea2fa..dc44c1016 100644 --- a/internal/controller/datadogagent/merger/security_context.go +++ b/internal/controller/datadogagent/merger/security_context.go @@ -8,8 +8,9 @@ package merger import ( "sort" - "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // SecurityContextManager use to add Security Context settings to containers. diff --git a/internal/controller/datadogagent/merger/service.go b/internal/controller/datadogagent/merger/service.go index bd8fd8f41..e325cd508 100644 --- a/internal/controller/datadogagent/merger/service.go +++ b/internal/controller/datadogagent/merger/service.go @@ -8,10 +8,10 @@ package merger import ( "fmt" + corev1 "k8s.io/api/core/v1" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - corev1 "k8s.io/api/core/v1" ) // ServiceManager is used to manage service resources. diff --git a/internal/controller/datadogagent/merger/volume_mount.go b/internal/controller/datadogagent/merger/volume_mount.go index 806c2be15..da626a585 100644 --- a/internal/controller/datadogagent/merger/volume_mount.go +++ b/internal/controller/datadogagent/merger/volume_mount.go @@ -6,8 +6,9 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // VolumeMountManager use to add a Volume to Pod and associated containers. diff --git a/internal/controller/datadogagent/object/configmap/configmap.go b/internal/controller/datadogagent/object/configmap/configmap.go index 87e7daff6..61d7fbfea 100644 --- a/internal/controller/datadogagent/object/configmap/configmap.go +++ b/internal/controller/datadogagent/object/configmap/configmap.go @@ -9,7 +9,6 @@ import ( "fmt" "gopkg.in/yaml.v2" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/errors" diff --git a/internal/controller/datadogagent/object/labels.go b/internal/controller/datadogagent/object/labels.go index 27193915c..8490a0c13 100644 --- a/internal/controller/datadogagent/object/labels.go +++ b/internal/controller/datadogagent/object/labels.go @@ -9,12 +9,12 @@ import ( "fmt" "strings" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/go-logr/logr" "github.com/gobwas/glob" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/pkg/constants" + "github.com/DataDog/datadog-operator/pkg/kubernetes" ) // GetDefaultLabels return default labels attached to a DatadogAgent resource. diff --git a/internal/controller/datadogagent/override/container.go b/internal/controller/datadogagent/override/container.go index 1cf8827f2..b562da2d8 100644 --- a/internal/controller/datadogagent/override/container.go +++ b/internal/controller/datadogagent/override/container.go @@ -9,14 +9,14 @@ import ( "fmt" "strconv" + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/util/intstr" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/pkg/constants" - - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/util/intstr" ) // Container use to override a corev1.Container with a v2alpha1.DatadogAgentGenericContainer. diff --git a/internal/controller/datadogagent/override/daemonset.go b/internal/controller/datadogagent/override/daemonset.go index 34624483c..709839403 100644 --- a/internal/controller/datadogagent/override/daemonset.go +++ b/internal/controller/datadogagent/override/daemonset.go @@ -6,9 +6,10 @@ package override import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" v1 "k8s.io/api/apps/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) // DaemonSet overrides a DaemonSet according to the given override options diff --git a/internal/controller/datadogagent/override/dependencies.go b/internal/controller/datadogagent/override/dependencies.go index dc284b96a..5f743d4aa 100644 --- a/internal/controller/datadogagent/override/dependencies.go +++ b/internal/controller/datadogagent/override/dependencies.go @@ -10,7 +10,6 @@ import ( "strings" "github.com/go-logr/logr" - "k8s.io/apimachinery/pkg/util/errors" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" diff --git a/internal/controller/datadogagent/override/deploymentspec.go b/internal/controller/datadogagent/override/deploymentspec.go index 0a6509577..19c864b3c 100644 --- a/internal/controller/datadogagent/override/deploymentspec.go +++ b/internal/controller/datadogagent/override/deploymentspec.go @@ -6,8 +6,9 @@ package override import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" v1 "k8s.io/api/apps/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) // Deployment overrides a v1.Deployment according to the given override options diff --git a/internal/controller/datadogagent/override/fips.go b/internal/controller/datadogagent/override/fips.go index f42f527dd..479f41802 100644 --- a/internal/controller/datadogagent/override/fips.go +++ b/internal/controller/datadogagent/override/fips.go @@ -9,6 +9,9 @@ import ( "fmt" "strconv" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -19,9 +22,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/kubernetes" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" ) // applyFIPSConfig applies FIPS related configs to a pod template spec diff --git a/internal/controller/datadogagent/override/global.go b/internal/controller/datadogagent/override/global.go index 9badf08e0..d83a5f4e1 100644 --- a/internal/controller/datadogagent/override/global.go +++ b/internal/controller/datadogagent/override/global.go @@ -9,9 +9,13 @@ import ( "encoding/json" "fmt" "path/filepath" - "strconv" + "github.com/go-logr/logr" + corev1 "k8s.io/api/core/v1" + rbacv1 "k8s.io/api/rbac/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" @@ -22,11 +26,6 @@ import ( "github.com/DataDog/datadog-operator/pkg/constants" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" - rbacv1 "k8s.io/api/rbac/v1" - - "github.com/go-logr/logr" - corev1 "k8s.io/api/core/v1" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) func ApplyGlobalSettingsClusterAgent(logger logr.Logger, manager feature.PodTemplateManagers, dda *v2alpha1.DatadogAgent, diff --git a/internal/controller/datadogagent/store/store.go b/internal/controller/datadogagent/store/store.go index d179d953a..a7a5977e7 100644 --- a/internal/controller/datadogagent/store/store.go +++ b/internal/controller/datadogagent/store/store.go @@ -12,12 +12,6 @@ import ( "sync" "github.com/go-logr/logr" - - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" - "github.com/DataDog/datadog-operator/pkg/equality" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" apimeta "k8s.io/apimachinery/pkg/api/meta" @@ -27,6 +21,11 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" + "github.com/DataDog/datadog-operator/pkg/equality" + "github.com/DataDog/datadog-operator/pkg/kubernetes" ) const ( diff --git a/internal/controller/datadogagent/testutils/client_utils.go b/internal/controller/datadogagent/testutils/client_utils.go index f6b94794c..720043311 100644 --- a/internal/controller/datadogagent/testutils/client_utils.go +++ b/internal/controller/datadogagent/testutils/client_utils.go @@ -6,8 +6,6 @@ package testutils_test import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -17,6 +15,9 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/scheme" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) // TestScheme return a runtime.Scheme for testing purposes diff --git a/internal/controller/datadogagent/testutils/podtemplate_utils.go b/internal/controller/datadogagent/testutils/podtemplate_utils.go index 4b27b5e83..df85bebf7 100644 --- a/internal/controller/datadogagent/testutils/podtemplate_utils.go +++ b/internal/controller/datadogagent/testutils/podtemplate_utils.go @@ -10,7 +10,6 @@ import ( "testing" corev1 "k8s.io/api/core/v1" - apiequality "k8s.io/apimachinery/pkg/api/equality" "github.com/DataDog/datadog-operator/pkg/testutils" diff --git a/internal/controller/datadogagent/utils.go b/internal/controller/datadogagent/utils.go index 507359c83..6839ec109 100644 --- a/internal/controller/datadogagent/utils.go +++ b/internal/controller/datadogagent/utils.go @@ -11,7 +11,6 @@ import ( "strings" "time" - apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/go-logr/logr" "github.com/gobwas/glob" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -19,6 +18,8 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + apiutils "github.com/DataDog/datadog-operator/api/utils" ) func init() { diff --git a/internal/controller/datadogagent_controller.go b/internal/controller/datadogagent_controller.go index 247bd3fc8..d2a2987b4 100644 --- a/internal/controller/datadogagent_controller.go +++ b/internal/controller/datadogagent_controller.go @@ -9,6 +9,7 @@ import ( "context" "reflect" + edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -32,8 +33,6 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/metrics" - edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" - "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" "github.com/DataDog/datadog-operator/pkg/kubernetes" ) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index 48dbaf116..e4ff96fec 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -6,11 +6,6 @@ import ( "time" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "github.com/DataDog/datadog-operator/pkg/controller/utils/condition" - "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" - "github.com/DataDog/datadog-operator/pkg/datadogclient" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" @@ -23,8 +18,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/utils" ctrutils "github.com/DataDog/datadog-operator/pkg/controller/utils" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" + "github.com/DataDog/datadog-operator/pkg/controller/utils/condition" + "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" + "github.com/DataDog/datadog-operator/pkg/datadogclient" ) const ( diff --git a/internal/controller/datadogdashboard/dashboard.go b/internal/controller/datadogdashboard/dashboard.go index 7d8ba1405..2b51af7f9 100644 --- a/internal/controller/datadogdashboard/dashboard.go +++ b/internal/controller/datadogdashboard/dashboard.go @@ -9,10 +9,10 @@ import ( "sort" datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" + + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) // Transform v1alpha1 dashboard into a datadogV1 Dashboard diff --git a/internal/controller/datadogdashboard/finalizer.go b/internal/controller/datadogdashboard/finalizer.go index 8ab1bb509..71eea5dcb 100644 --- a/internal/controller/datadogdashboard/finalizer.go +++ b/internal/controller/datadogdashboard/finalizer.go @@ -9,10 +9,10 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" ) diff --git a/internal/controller/datadogdashboard_controller.go b/internal/controller/datadogdashboard_controller.go index 97b261835..e17a4f605 100644 --- a/internal/controller/datadogdashboard_controller.go +++ b/internal/controller/datadogdashboard_controller.go @@ -8,6 +8,7 @@ package controller import ( "context" + "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" @@ -17,7 +18,6 @@ import ( "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogdashboard" "github.com/DataDog/datadog-operator/pkg/datadogclient" - "github.com/go-logr/logr" ) // DatadogDashboardReconciler reconciles a DatadogDashboard object diff --git a/internal/controller/datadoggenericresource/controller.go b/internal/controller/datadoggenericresource/controller.go index dde6fa0af..73c996c6f 100644 --- a/internal/controller/datadoggenericresource/controller.go +++ b/internal/controller/datadoggenericresource/controller.go @@ -6,11 +6,6 @@ import ( "time" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "github.com/DataDog/datadog-operator/pkg/controller/utils/condition" - "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" - "github.com/DataDog/datadog-operator/pkg/datadogclient" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" @@ -23,8 +18,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/utils" ctrutils "github.com/DataDog/datadog-operator/pkg/controller/utils" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" + "github.com/DataDog/datadog-operator/pkg/controller/utils/condition" + "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" + "github.com/DataDog/datadog-operator/pkg/datadogclient" ) const ( diff --git a/internal/controller/datadoggenericresource/finalizer.go b/internal/controller/datadoggenericresource/finalizer.go index 9a22f2496..ed40267c0 100644 --- a/internal/controller/datadoggenericresource/finalizer.go +++ b/internal/controller/datadoggenericresource/finalizer.go @@ -9,10 +9,10 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" ) diff --git a/internal/controller/datadoggenericresource/notebooks.go b/internal/controller/datadoggenericresource/notebooks.go index 2f91f6081..d5dbddca6 100644 --- a/internal/controller/datadoggenericresource/notebooks.go +++ b/internal/controller/datadoggenericresource/notebooks.go @@ -4,11 +4,11 @@ import ( "context" "encoding/json" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) type NotebookHandler struct{} diff --git a/internal/controller/datadoggenericresource/resource_handler.go b/internal/controller/datadoggenericresource/resource_handler.go index 0fe4a7ba7..e4f8800b3 100644 --- a/internal/controller/datadoggenericresource/resource_handler.go +++ b/internal/controller/datadoggenericresource/resource_handler.go @@ -1,9 +1,10 @@ package datadoggenericresource import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) type ResourceHandler interface { diff --git a/internal/controller/datadoggenericresource/synthetics.go b/internal/controller/datadoggenericresource/synthetics.go index 05c824848..9a45e7379 100644 --- a/internal/controller/datadoggenericresource/synthetics.go +++ b/internal/controller/datadoggenericresource/synthetics.go @@ -5,11 +5,11 @@ import ( "encoding/json" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) type SyntheticsAPITestHandler struct{} diff --git a/internal/controller/datadoggenericresource/utils.go b/internal/controller/datadoggenericresource/utils.go index affe51163..378d9de51 100644 --- a/internal/controller/datadoggenericresource/utils.go +++ b/internal/controller/datadoggenericresource/utils.go @@ -6,11 +6,11 @@ import ( "net/url" "strconv" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/go-logr/logr" - datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" + "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) // mockSubresource is used to mock the subresource in tests diff --git a/internal/controller/datadoggenericresource_controller.go b/internal/controller/datadoggenericresource_controller.go index 2868d672a..e7147071f 100644 --- a/internal/controller/datadoggenericresource_controller.go +++ b/internal/controller/datadoggenericresource_controller.go @@ -8,6 +8,7 @@ package controller import ( "context" + "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" ctrl "sigs.k8s.io/controller-runtime" @@ -17,7 +18,6 @@ import ( "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ddgr "github.com/DataDog/datadog-operator/internal/controller/datadoggenericresource" "github.com/DataDog/datadog-operator/pkg/datadogclient" - "github.com/go-logr/logr" ) // DatadogGenericResourceReconciler reconciles a DatadogGenericResource object diff --git a/internal/controller/datadogmonitor/controller.go b/internal/controller/datadogmonitor/controller.go index c54dad590..749d3bf62 100644 --- a/internal/controller/datadogmonitor/controller.go +++ b/internal/controller/datadogmonitor/controller.go @@ -14,6 +14,7 @@ import ( "strings" "time" + datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" @@ -25,7 +26,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" ctrutils "github.com/DataDog/datadog-operator/pkg/controller/utils" diff --git a/internal/controller/datadogmonitor/finalizer.go b/internal/controller/datadogmonitor/finalizer.go index 7e5d3a1ec..e32bb6a8b 100644 --- a/internal/controller/datadogmonitor/finalizer.go +++ b/internal/controller/datadogmonitor/finalizer.go @@ -9,10 +9,10 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" ) diff --git a/internal/controller/datadogmonitor/monitor.go b/internal/controller/datadogmonitor/monitor.go index df104dbaa..114b92030 100644 --- a/internal/controller/datadogmonitor/monitor.go +++ b/internal/controller/datadogmonitor/monitor.go @@ -13,10 +13,10 @@ import ( "sort" "strconv" - "github.com/go-logr/logr" - datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" + "github.com/go-logr/logr" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) diff --git a/internal/controller/datadogmonitor_controller.go b/internal/controller/datadogmonitor_controller.go index 11f81a9da..91c1342dc 100644 --- a/internal/controller/datadogmonitor_controller.go +++ b/internal/controller/datadogmonitor_controller.go @@ -16,7 +16,6 @@ import ( datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogmonitor" - "github.com/DataDog/datadog-operator/pkg/datadogclient" ) diff --git a/internal/controller/datadogslo/controller.go b/internal/controller/datadogslo/controller.go index ad47ea877..8f735e7bf 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -10,6 +10,7 @@ import ( "strings" "time" + "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" @@ -22,8 +23,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/finalizer" diff --git a/internal/controller/datadogslo_controller.go b/internal/controller/datadogslo_controller.go index 77a93f08e..f5223bf33 100644 --- a/internal/controller/datadogslo_controller.go +++ b/internal/controller/datadogslo_controller.go @@ -8,9 +8,6 @@ package controller import ( "context" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - - "github.com/DataDog/datadog-operator/internal/controller/datadogslo" "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/tools/record" @@ -19,6 +16,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/internal/controller/datadogslo" "github.com/DataDog/datadog-operator/pkg/datadogclient" ) diff --git a/internal/controller/finalizer/finalizer.go b/internal/controller/finalizer/finalizer.go index 43c0b1139..fe495dbb5 100644 --- a/internal/controller/finalizer/finalizer.go +++ b/internal/controller/finalizer/finalizer.go @@ -9,11 +9,10 @@ import ( "context" "time" - "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) type ResourceDeleteFunc func(ctx context.Context, k8sObj client.Object, datadogID string) error diff --git a/internal/controller/setup.go b/internal/controller/setup.go index ae1334fb1..906a9c830 100644 --- a/internal/controller/setup.go +++ b/internal/controller/setup.go @@ -9,22 +9,20 @@ import ( "fmt" "time" + "github.com/go-logr/logr" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "k8s.io/client-go/discovery" + "k8s.io/client-go/rest" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" "github.com/DataDog/datadog-operator/internal/controller/datadogagent" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" - "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" "github.com/DataDog/datadog-operator/pkg/datadogclient" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/utils" - - "github.com/go-logr/logr" - "k8s.io/client-go/discovery" - "k8s.io/client-go/rest" ) const ( diff --git a/internal/controller/testutils/node.go b/internal/controller/testutils/node.go index 7ac4b1b70..77fc2fd0a 100644 --- a/internal/controller/testutils/node.go +++ b/internal/controller/testutils/node.go @@ -6,10 +6,9 @@ package testutils import ( + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - corev1 "k8s.io/api/core/v1" ) // NewNode returns a fake, but ready, K8S node diff --git a/pkg/agentprofile/agent_profile.go b/pkg/agentprofile/agent_profile.go index 2f1ecb723..21318da87 100644 --- a/pkg/agentprofile/agent_profile.go +++ b/pkg/agentprofile/agent_profile.go @@ -10,14 +10,6 @@ import ( "os" "sort" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" - "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" - "github.com/DataDog/datadog-operator/internal/controller/metrics" - "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" - "github.com/go-logr/logr" "github.com/prometheus/client_golang/prometheus" v1 "k8s.io/api/core/v1" @@ -26,6 +18,14 @@ import ( "k8s.io/apimachinery/pkg/selection" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" + + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" + "github.com/DataDog/datadog-operator/internal/controller/metrics" + "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" ) const ( diff --git a/pkg/agentprofile/status.go b/pkg/agentprofile/status.go index e5968e0b5..26a847dd4 100644 --- a/pkg/agentprofile/status.go +++ b/pkg/agentprofile/status.go @@ -9,11 +9,11 @@ import ( "fmt" "os" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/common" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) const ( diff --git a/pkg/condition/condition.go b/pkg/condition/condition.go index 8040bf692..14f14a6dd 100644 --- a/pkg/condition/condition.go +++ b/pkg/condition/condition.go @@ -8,12 +8,11 @@ package condition import ( "fmt" + edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/constants" ) diff --git a/pkg/config/config.go b/pkg/config/config.go index fde51747c..7cf1d0060 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -10,21 +10,20 @@ import ( "os" "strings" + "github.com/go-logr/logr" "golang.org/x/exp/maps" corev1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/go-logr/logr" - "github.com/DataDog/datadog-operator/api/datadoghq/common" datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/constants" + + _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" ) // These constants are only used within pkg/config diff --git a/pkg/config/creds.go b/pkg/config/creds.go index 45eefe71a..596ca5b5f 100644 --- a/pkg/config/creds.go +++ b/pkg/config/creds.go @@ -11,11 +11,11 @@ import ( "sync" "time" - "github.com/DataDog/datadog-operator/pkg/constants" - "github.com/DataDog/datadog-operator/pkg/secrets" - "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/util/retry" + + "github.com/DataDog/datadog-operator/pkg/constants" + "github.com/DataDog/datadog-operator/pkg/secrets" ) // Creds holds the api and app keys. diff --git a/pkg/constants/utils.go b/pkg/constants/utils.go index 483f62349..ec2b4e411 100644 --- a/pkg/constants/utils.go +++ b/pkg/constants/utils.go @@ -8,13 +8,13 @@ package constants import ( "fmt" - "github.com/DataDog/datadog-operator/pkg/defaulting" - - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/pkg/defaulting" ) // GetConfName get the name of the Configmap for a CustomConfigSpec diff --git a/pkg/controller/utils/condition/datadogmonitor.go b/pkg/controller/utils/condition/datadogmonitor.go index ac56daefc..c698c7bad 100644 --- a/pkg/controller/utils/condition/datadogmonitor.go +++ b/pkg/controller/utils/condition/datadogmonitor.go @@ -8,10 +8,10 @@ package condition import ( "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) // SetErrorActiveConditions sets the Error and Active DatadogMonitorConditionTypes to True or False diff --git a/pkg/controller/utils/datadog/metrics_forwarder.go b/pkg/controller/utils/datadog/metrics_forwarder.go index 96362c159..7d11be5b5 100644 --- a/pkg/controller/utils/datadog/metrics_forwarder.go +++ b/pkg/controller/utils/datadog/metrics_forwarder.go @@ -14,11 +14,6 @@ import ( "sync" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - "github.com/DataDog/datadog-operator/pkg/config" - "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/DataDog/datadog-operator/pkg/secrets" - "github.com/go-logr/logr" api "github.com/zorkian/go-datadog-api" corev1 "k8s.io/api/core/v1" @@ -28,6 +23,11 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" "sigs.k8s.io/controller-runtime/pkg/client" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/pkg/config" + "github.com/DataDog/datadog-operator/pkg/kubernetes" + "github.com/DataDog/datadog-operator/pkg/secrets" ) const ( diff --git a/pkg/controller/utils/shared_utils.go b/pkg/controller/utils/shared_utils.go index 09fbbac2e..9b3033669 100644 --- a/pkg/controller/utils/shared_utils.go +++ b/pkg/controller/utils/shared_utils.go @@ -9,9 +9,8 @@ import ( "fmt" "strconv" - "sigs.k8s.io/controller-runtime/pkg/reconcile" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/reconcile" ) // ShouldReturn returns if we should stop the reconcile loop based on result diff --git a/pkg/datadogclient/client.go b/pkg/datadogclient/client.go index 5d4d576e2..70272d2a3 100644 --- a/pkg/datadogclient/client.go +++ b/pkg/datadogclient/client.go @@ -13,13 +13,12 @@ import ( "os" "strings" + datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" + datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/constants" - - datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" - datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" ) const prefix = "https://api." diff --git a/pkg/plugin/common/client.go b/pkg/plugin/common/client.go index afb3f9513..7b84bdfce 100644 --- a/pkg/plugin/common/client.go +++ b/pkg/plugin/common/client.go @@ -8,14 +8,15 @@ package common import ( "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" + + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) // NewClient returns a new controller-runtime client instance diff --git a/pkg/plugin/common/statuswrapper.go b/pkg/plugin/common/statuswrapper.go index 179c77231..94b9f9120 100644 --- a/pkg/plugin/common/statuswrapper.go +++ b/pkg/plugin/common/statuswrapper.go @@ -6,8 +6,9 @@ package common import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) type StatusWrapper interface { diff --git a/pkg/remoteconfig/orchestrator_k8s_crd.go b/pkg/remoteconfig/orchestrator_k8s_crd.go index 3abc149c1..f6080cc9e 100644 --- a/pkg/remoteconfig/orchestrator_k8s_crd.go +++ b/pkg/remoteconfig/orchestrator_k8s_crd.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" + "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" apiequality "k8s.io/apimachinery/pkg/api/equality" apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) diff --git a/pkg/remoteconfig/updater.go b/pkg/remoteconfig/updater.go index 129481965..b43433919 100644 --- a/pkg/remoteconfig/updater.go +++ b/pkg/remoteconfig/updater.go @@ -16,6 +16,10 @@ import ( "sync" "time" + "github.com/DataDog/datadog-agent/pkg/config/model" + "github.com/DataDog/datadog-agent/pkg/config/remote/client" + "github.com/DataDog/datadog-agent/pkg/config/remote/service" + "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" "github.com/cenkalti/backoff" "github.com/go-logr/logr" "github.com/google/uuid" @@ -23,11 +27,6 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" kubeclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/DataDog/datadog-agent/pkg/config/model" - "github.com/DataDog/datadog-agent/pkg/config/remote/client" - "github.com/DataDog/datadog-agent/pkg/config/remote/service" - "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/constants" diff --git a/pkg/testutils/builder.go b/pkg/testutils/builder.go index 9419f41a0..2be80b29a 100644 --- a/pkg/testutils/builder.go +++ b/pkg/testutils/builder.go @@ -6,14 +6,15 @@ package testutils import ( + corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/defaults" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/otelcollector/defaultconfig" "github.com/DataDog/datadog-operator/pkg/defaulting" - corev1 "k8s.io/api/core/v1" - "k8s.io/apimachinery/pkg/api/resource" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) type DatadogAgentBuilder struct { diff --git a/pkg/testutils/testutils.go b/pkg/testutils/testutils.go index 9d15cee24..e02f1dd47 100644 --- a/pkg/testutils/testutils.go +++ b/pkg/testutils/testutils.go @@ -9,10 +9,9 @@ import ( "fmt" "reflect" - corev1 "k8s.io/api/core/v1" - "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + corev1 "k8s.io/api/core/v1" ) var (