From 880fa5ecdf175334b180940a35be746cf07234a8 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Fri, 6 Dec 2024 16:07:35 -0500 Subject: [PATCH 01/12] create new go module for crds --- api/go.mod | 70 +++++++++++++++++++++++++++++++++++++++++++++++++ api/go.sum | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ go.work | 5 ++-- 3 files changed, 149 insertions(+), 3 deletions(-) create mode 100644 api/go.mod create mode 100644 api/go.sum diff --git a/api/go.mod b/api/go.mod new file mode 100644 index 000000000..6210bb069 --- /dev/null +++ b/api/go.mod @@ -0,0 +1,70 @@ +module github.com/DataDog/datadog-operator/api + +go 1.23.2 + +require ( + github.com/DataDog/datadog-api-client-go/v2 v2.27.0 + github.com/DataDog/extendeddaemonset v0.10.0-rc.4 + github.com/google/go-cmp v0.6.0 + github.com/pkg/errors v0.9.1 + github.com/stretchr/testify v1.9.0 + k8s.io/api v0.31.1 + k8s.io/apimachinery v0.31.1 + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 + sigs.k8s.io/controller-runtime v0.19.0 + sigs.k8s.io/yaml v1.4.0 +) + +require ( + github.com/DataDog/zstd v1.5.2 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.4 // indirect + github.com/goccy/go-json v0.10.2 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/imdario/mergo v0.3.16 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_golang v1.19.1 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/x448/float16 v0.8.4 // indirect + golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/oauth2 v0.21.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/time v0.6.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + k8s.io/apiextensions-apiserver v0.31.1 // indirect + k8s.io/client-go v0.31.1 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect +) diff --git a/api/go.sum b/api/go.sum new file mode 100644 index 000000000..fdffdd844 --- /dev/null +++ b/api/go.sum @@ -0,0 +1,77 @@ +github.com/DataDog/datadog-api-client-go/v2 v2.27.0 h1:AGZj41frjnjMufQHQbJH2fzmifOs20wpmVDtIBCv33E= +github.com/DataDog/extendeddaemonset v0.10.0-rc.4 h1:m88E+emuRHIqKgi7kHMd9N0S/NtruCCOISp3cjB7DNs= +github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= +github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af h1:kmjWCqn2qkEml422C2Rrd27c3VGxi6a/6HNq8QmHRKM= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= +go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= +sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= +sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/go.work b/go.work index 1dd9c2902..99b370299 100644 --- a/go.work +++ b/go.work @@ -1,8 +1,7 @@ -go 1.22.7 - -toolchain go1.22.7 +go 1.23.2 use ( . + ./api ./test/e2e ) From 0f095ec19cb9d0c88152c97d4244ad2a8b4c787d Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Fri, 6 Dec 2024 16:24:15 -0500 Subject: [PATCH 02/12] rename crd go module --- .../v1alpha1/datadogagentprofile_types.go | 2 +- .../datadogagentprofile_validation_test.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../v1alpha1/zz_generated.openapi.go | 174 ++++++------ api/datadoghq/v2alpha1/condition.go | 2 +- api/datadoghq/v2alpha1/condition_test.go | 2 +- .../v2alpha1/datadogagent_default.go | 4 +- .../v2alpha1/datadogagent_default_test.go | 4 +- api/datadoghq/v2alpha1/test/new.go | 2 +- api/datadoghq/v2alpha1/utils.go | 2 +- api/datadoghq/v2alpha1/utils_test.go | 2 +- .../v2alpha1/zz_generated.openapi.go | 268 +++++++++--------- api/go.mod | 2 +- cmd/check-operator/upgrade/upgrade.go | 2 +- cmd/kubectl-datadog/agent/upgrade/upgrade.go | 4 +- .../agent/upgrade/upgrade_test.go | 4 +- .../clusteragent/upgrade/upgrade.go | 4 +- .../clusteragent/upgrade/upgrade_test.go | 6 +- cmd/kubectl-datadog/flare/flare.go | 2 +- cmd/kubectl-datadog/get/get.go | 2 +- cmd/kubectl-datadog/metrics/get/get.go | 2 +- cmd/main.go | 4 +- .../controller/datadogagent/common/utils.go | 4 +- .../controller/datadogagent/common/volumes.go | 2 +- .../datadogagent/component/agent/default.go | 6 +- .../datadogagent/component/agent/new.go | 2 +- .../component/clusteragent/default.go | 6 +- .../component/clusteragent/default_test.go | 6 +- .../component/clusteragent/utils.go | 4 +- .../component/clusterchecksrunner/default.go | 6 +- .../clusterchecksrunner/default_test.go | 2 +- .../datadogagent/component/objects/network.go | 2 +- .../controller_reconcile_agent.go | 8 +- .../controller_reconcile_agent_test.go | 8 +- .../datadogagent/controller_reconcile_ccr.go | 6 +- .../controller_reconcile_ccr_test.go | 6 +- .../datadogagent/controller_reconcile_dca.go | 6 +- .../controller_reconcile_dca_test.go | 6 +- .../datadogagent/controller_reconcile_v2.go | 4 +- .../controller_reconcile_v2_common.go | 4 +- .../controller_reconcile_v2_common_test.go | 4 +- .../controller_reconcile_v2_test.go | 6 +- .../datadogagent/controller_v2_test.go | 8 +- .../feature/admissioncontroller/feature.go | 6 +- .../admissioncontroller/feature_test.go | 8 +- .../datadogagent/feature/apm/feature.go | 6 +- .../datadogagent/feature/apm/feature_test.go | 10 +- .../datadogagent/feature/asm/feature.go | 6 +- .../datadogagent/feature/asm/feature_test.go | 4 +- .../feature/autoscaling/feature.go | 6 +- .../feature/autoscaling/feature_test.go | 6 +- .../feature/clusterchecks/feature.go | 6 +- .../feature/clusterchecks/feature_test.go | 8 +- .../datadogagent/feature/cspm/feature.go | 6 +- .../datadogagent/feature/cspm/feature_test.go | 6 +- .../datadogagent/feature/cws/feature.go | 6 +- .../datadogagent/feature/cws/feature_test.go | 6 +- .../datadogagent/feature/dogstatsd/feature.go | 6 +- .../feature/dogstatsd/feature_test.go | 8 +- .../datadogagent/feature/dummy/feature.go | 2 +- .../datadogagent/feature/ebpfcheck/feature.go | 6 +- .../feature/ebpfcheck/feature_test.go | 6 +- .../feature/enabledefault/feature.go | 6 +- .../feature/enabledefault/feature_test.go | 4 +- .../feature/enabledefault/rbac.go | 2 +- .../feature/enabledefault/utils.go | 2 +- .../feature/enabledefault/utils_test.go | 4 +- .../feature/eventcollection/configmap.go | 2 +- .../feature/eventcollection/feature.go | 6 +- .../feature/eventcollection/feature_test.go | 8 +- .../feature/externalmetrics/feature.go | 6 +- .../feature/externalmetrics/feature_test.go | 6 +- .../datadogagent/feature/factory.go | 4 +- .../feature/helmcheck/configmap_test.go | 2 +- .../datadogagent/feature/helmcheck/feature.go | 6 +- .../feature/helmcheck/feature_test.go | 8 +- .../kubernetesstatecore/configmap_test.go | 2 +- .../feature/kubernetesstatecore/feature.go | 6 +- .../kubernetesstatecore/feature_test.go | 8 +- .../feature/livecontainer/feature.go | 6 +- .../feature/livecontainer/feature_test.go | 10 +- .../feature/liveprocess/feature.go | 6 +- .../feature/liveprocess/feature_test.go | 10 +- .../feature/logcollection/feature.go | 6 +- .../feature/logcollection/feature_test.go | 6 +- .../datadogagent/feature/npm/feature.go | 6 +- .../datadogagent/feature/npm/feature_test.go | 6 +- .../datadogagent/feature/oomkill/feature.go | 6 +- .../feature/oomkill/feature_test.go | 6 +- .../orchestratorexplorer/configmap_test.go | 2 +- .../feature/orchestratorexplorer/env.go | 4 +- .../feature/orchestratorexplorer/feature.go | 6 +- .../orchestratorexplorer/feature_test.go | 8 +- .../datadogagent/feature/otlp/feature.go | 6 +- .../datadogagent/feature/otlp/feature_test.go | 8 +- .../feature/processdiscovery/feature.go | 6 +- .../feature/processdiscovery/feature_test.go | 10 +- .../feature/prometheusscrape/feature.go | 6 +- .../feature/prometheusscrape/feature_test.go | 6 +- .../feature/remoteconfig/feature.go | 6 +- .../feature/remoteconfig/feature_test.go | 6 +- .../datadogagent/feature/sbom/feature.go | 6 +- .../datadogagent/feature/sbom/feature_test.go | 6 +- .../feature/servicediscovery/feature.go | 6 +- .../feature/servicediscovery/feature_test.go | 6 +- .../feature/tcpqueuelength/feature.go | 6 +- .../feature/tcpqueuelength/feature_test.go | 6 +- .../datadogagent/feature/test/factory_test.go | 6 +- .../datadogagent/feature/test/testsuite.go | 4 +- .../controller/datadogagent/feature/types.go | 6 +- .../datadogagent/feature/types_test.go | 2 +- .../datadogagent/feature/usm/feature.go | 6 +- .../datadogagent/feature/usm/feature_test.go | 6 +- .../datadogagent/feature/utils/utils.go | 4 +- internal/controller/datadogagent/finalizer.go | 2 +- .../controller/datadogagent/finalizer_test.go | 2 +- .../datadogagent/merger/cilium_test.go | 2 +- .../datadogagent/merger/configmap_test.go | 2 +- .../datadogagent/merger/envvarfrom.go | 2 +- .../datadogagent/merger/envvarfrom_test.go | 2 +- .../controller/datadogagent/merger/envvars.go | 2 +- .../datadogagent/merger/envvars_test.go | 2 +- .../datadogagent/merger/fake/const.go | 2 +- .../merger/fake/envfromvar_manager.go | 2 +- .../merger/fake/envvar_manager.go | 2 +- .../datadogagent/merger/fake/port_manager.go | 2 +- .../merger/fake/security_context_manager.go | 2 +- .../merger/fake/volume_mount_manager.go | 2 +- .../merger/network_policy_test.go | 2 +- .../controller/datadogagent/merger/port.go | 2 +- .../datadogagent/merger/rbac_test.go | 2 +- .../datadogagent/merger/secret_test.go | 2 +- .../datadogagent/merger/security_context.go | 2 +- .../merger/security_context_test.go | 2 +- .../datadogagent/merger/service_test.go | 4 +- .../controller/datadogagent/merger/utils.go | 2 +- .../datadogagent/merger/volume_mount.go | 2 +- .../datadogagent/merger/volume_mount_test.go | 2 +- .../controller/datadogagent/object/labels.go | 2 +- .../datadogagent/object/volume/volumes.go | 4 +- .../datadogagent/override/container.go | 4 +- .../datadogagent/override/container_test.go | 6 +- .../datadogagent/override/daemonset.go | 2 +- .../datadogagent/override/daemonset_test.go | 6 +- .../datadogagent/override/dependencies.go | 2 +- .../override/dependencies_test.go | 4 +- .../datadogagent/override/deploymentspec.go | 2 +- .../override/deploymentspec_test.go | 4 +- .../controller/datadogagent/override/fips.go | 6 +- .../datadogagent/override/fips_test.go | 8 +- .../datadogagent/override/global.go | 6 +- .../datadogagent/override/global_test.go | 8 +- .../datadogagent/override/podtemplatespec.go | 4 +- .../override/podtemplatespec_test.go | 6 +- .../datadogagent/store/store_test.go | 2 +- .../datadogagent/testutils/client_utils.go | 4 +- internal/controller/datadogagent/utils.go | 2 +- .../controller/datadogagent_controller.go | 4 +- .../datadogagent_controller_profiles_test.go | 8 +- .../datadogagent_controller_test.go | 2 +- .../datadogagentprofile_controller.go | 2 +- .../controller/datadogdashboard/controller.go | 2 +- .../datadogdashboard/controller_test.go | 2 +- .../controller/datadogdashboard/dashboard.go | 2 +- .../datadogdashboard/dashboard_test.go | 4 +- .../controller/datadogdashboard/finalizer.go | 2 +- .../datadogdashboard/finalizer_test.go | 2 +- .../controller/datadogdashboard_controller.go | 2 +- .../controller/datadogmonitor/controller.go | 4 +- .../datadogmonitor/controller_test.go | 2 +- internal/controller/datadogmonitor/event.go | 2 +- .../controller/datadogmonitor/finalizer.go | 2 +- .../datadogmonitor/finalizer_test.go | 2 +- internal/controller/datadogmonitor/monitor.go | 2 +- .../controller/datadogmonitor/monitor_test.go | 2 +- .../controller/datadogmonitor_controller.go | 2 +- internal/controller/datadogslo/controller.go | 4 +- .../controller/datadogslo/controller_test.go | 2 +- internal/controller/datadogslo/slo.go | 2 +- internal/controller/datadogslo/slo_test.go | 2 +- internal/controller/datadogslo_controller.go | 2 +- .../controller/finalizer/finalizer_test.go | 7 +- internal/controller/suite_v2_test.go | 4 +- internal/controller/testutils/agent.go | 6 +- pkg/agentprofile/agent_profile.go | 8 +- pkg/agentprofile/agent_profile_test.go | 8 +- pkg/agentprofile/status.go | 4 +- pkg/agentprofile/status_test.go | 4 +- pkg/config/config.go | 6 +- pkg/config/creds.go | 2 +- pkg/controller/utils/comparison/comparison.go | 2 +- .../utils/condition/datadogmonitor.go | 2 +- .../utils/condition/datadogmonitor_test.go | 2 +- .../utils/datadog/metrics_forwarder.go | 4 +- .../utils/datadog/metrics_forwarder_test.go | 8 +- pkg/datadogclient/client.go | 2 +- pkg/equality/equality.go | 2 +- pkg/kubernetes/provider.go | 4 +- pkg/plugin/common/client.go | 4 +- pkg/plugin/common/statuswrapper.go | 2 +- pkg/plugin/common/v2support.go | 4 +- pkg/remoteconfig/orchestrator_k8s_crd.go | 2 +- pkg/remoteconfig/updater.go | 4 +- 203 files changed, 651 insertions(+), 650 deletions(-) diff --git a/api/datadoghq/v1alpha1/datadogagentprofile_types.go b/api/datadoghq/v1alpha1/datadogagentprofile_types.go index 2413d2e85..9cba1989c 100644 --- a/api/datadoghq/v1alpha1/datadogagentprofile_types.go +++ b/api/datadoghq/v1alpha1/datadogagentprofile_types.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go b/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go index 85cda252b..1d82b7800 100644 --- a/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go +++ b/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go @@ -8,7 +8,7 @@ package v1alpha1 import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/api/datadoghq/v1alpha1/zz_generated.deepcopy.go b/api/datadoghq/v1alpha1/zz_generated.deepcopy.go index 490cdf21b..af91dea04 100644 --- a/api/datadoghq/v1alpha1/zz_generated.deepcopy.go +++ b/api/datadoghq/v1alpha1/zz_generated.deepcopy.go @@ -11,7 +11,7 @@ package v1alpha1 import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/api/datadoghq/v1alpha1/zz_generated.openapi.go b/api/datadoghq/v1alpha1/zz_generated.openapi.go index 7f485515c..b9f15494a 100644 --- a/api/datadoghq/v1alpha1/zz_generated.openapi.go +++ b/api/datadoghq/v1alpha1/zz_generated.openapi.go @@ -17,36 +17,36 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.CreateStrategy": schema_datadog_operator_api_datadoghq_v1alpha1_CreateStrategy(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariable": schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariable(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePreset": schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue": schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfile": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfile(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboard": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboard(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardSpec": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetric": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetric(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricCondition": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetricCondition(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitor": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitor(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorCondition": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorCondition(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorControllerOptions": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptions": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptions(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorSpec": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorSpec(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorTriggeredState": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLO": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLO(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOControllerOptions": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOQuery": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOQuery(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOSpec": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.CreateStrategy": schema_api_crds_datadoghq_v1alpha1_CreateStrategy(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariable": schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariable(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePreset": schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue": schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfile": schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfile(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileStatus": schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboard": schema_api_crds_datadoghq_v1alpha1_DatadogDashboard(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardSpec": schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardStatus": schema_api_crds_datadoghq_v1alpha1_DatadogDashboardStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetric": schema_api_crds_datadoghq_v1alpha1_DatadogMetric(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricCondition": schema_api_crds_datadoghq_v1alpha1_DatadogMetricCondition(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitor": schema_api_crds_datadoghq_v1alpha1_DatadogMonitor(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorCondition": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorCondition(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorControllerOptions": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptions": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptions(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorSpec": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorSpec(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorStatus": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorTriggeredState": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLO": schema_api_crds_datadoghq_v1alpha1_DatadogSLO(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOControllerOptions": schema_api_crds_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOQuery": schema_api_crds_datadoghq_v1alpha1_DatadogSLOQuery(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOSpec": schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOStatus": schema_api_crds_datadoghq_v1alpha1_DatadogSLOStatus(ref), } } -func schema_datadog_operator_api_datadoghq_v1alpha1_CreateStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_CreateStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -98,7 +98,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_CreateStrategy(ref common.Re } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariable(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariable(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -162,7 +162,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariable(re } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -192,7 +192,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePre Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"), }, }, }, @@ -203,11 +203,11 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePre }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -248,7 +248,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePre } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfile(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfile(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -278,24 +278,24 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfile(ref comm "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -354,18 +354,18 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfileStatus(re "createStrategy": { SchemaProps: spec.SchemaProps{ Description: "CreateStrategy is the state of the create strategy feature.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.CreateStrategy"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.CreateStrategy"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.CreateStrategy", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.CreateStrategy", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboard(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogDashboard(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -395,24 +395,24 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboard(ref common. "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -496,7 +496,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref com Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePreset"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePreset"), }, }, }, @@ -518,7 +518,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref com Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariable"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariable"), }, }, }, @@ -542,11 +542,11 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref com }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariable", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePreset"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariable", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePreset"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -623,7 +623,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardStatus(ref c } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetric(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMetric(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -653,24 +653,24 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetric(ref common.Ref "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetricCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMetricCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -728,7 +728,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetricCondition(ref c } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitor(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitor(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -758,24 +758,24 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitor(ref common.Re "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -833,7 +833,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorCondition(ref } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -853,7 +853,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorControllerOpti } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -880,7 +880,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1042,24 +1042,24 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptions(ref co "thresholds": { SchemaProps: spec.SchemaProps{ Description: "A struct of the different monitor threshold values.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"), }, }, "thresholdWindows": { SchemaProps: spec.SchemaProps{ Description: "A struct of the alerting time window options.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1086,7 +1086,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresho } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1141,7 +1141,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresho } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1227,25 +1227,25 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorSpec(ref commo SchemaProps: spec.SchemaProps{ Description: "Options are the optional parameters associated with your monitor", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptions"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptions"), }, }, "controllerOptions": { SchemaProps: spec.SchemaProps{ Description: "ControllerOptions are the optional parameters in the DatadogMonitor controller", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorControllerOptions"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorControllerOptions"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorControllerOptions", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptions"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorControllerOptions", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptions"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1268,7 +1268,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref com Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorCondition"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorCondition"), }, }, }, @@ -1342,7 +1342,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref com Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorTriggeredState"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorTriggeredState"), }, }, }, @@ -1352,7 +1352,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref com SchemaProps: spec.SchemaProps{ Description: "DowntimeStatus defines whether the monitor is downtimed", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus"), }, }, "primary": { @@ -1373,11 +1373,11 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref com }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorCondition", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorTriggeredState", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorCondition", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorTriggeredState", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1412,7 +1412,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorTriggeredState } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLO(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogSLO(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1442,24 +1442,24 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLO(ref common.Refere "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1479,7 +1479,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOControllerOptions( } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOQuery(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogSLOQuery(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1508,7 +1508,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOQuery(ref common.R } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1592,7 +1592,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref common.Re "query": { SchemaProps: spec.SchemaProps{ Description: "Query is the query for a metric-based SLO. Required if type is metric. Note that only the `sum by` aggregator is allowed, which sums all request counts. `Average`, `max`, nor `min` request aggregators are not supported.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOQuery"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOQuery"), }, }, "type": { @@ -1626,7 +1626,7 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref common.Re "controllerOptions": { SchemaProps: spec.SchemaProps{ Description: "ControllerOptions are the optional parameters in the DatadogSLO controller", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOControllerOptions"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOControllerOptions"), }, }, }, @@ -1634,11 +1634,11 @@ func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref common.Re }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOControllerOptions", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOQuery", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOControllerOptions", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOQuery", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, } } -func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v1alpha1_DatadogSLOStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/api/datadoghq/v2alpha1/condition.go b/api/datadoghq/v2alpha1/condition.go index e86322476..cc9289ab0 100644 --- a/api/datadoghq/v2alpha1/condition.go +++ b/api/datadoghq/v2alpha1/condition.go @@ -3,7 +3,7 @@ package v2alpha1 import ( "fmt" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/api/datadoghq/v2alpha1/condition_test.go b/api/datadoghq/v2alpha1/condition_test.go index ac63f0cd1..1f58c32be 100644 --- a/api/datadoghq/v2alpha1/condition_test.go +++ b/api/datadoghq/v2alpha1/condition_test.go @@ -3,7 +3,7 @@ package v2alpha1 import ( "testing" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/google/go-cmp/cmp" assert "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/datadoghq/v2alpha1/datadogagent_default.go b/api/datadoghq/v2alpha1/datadogagent_default.go index ccaf1602d..341b018f5 100644 --- a/api/datadoghq/v2alpha1/datadogagent_default.go +++ b/api/datadoghq/v2alpha1/datadogagent_default.go @@ -6,8 +6,8 @@ package v2alpha1 import ( - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" ) diff --git a/api/datadoghq/v2alpha1/datadogagent_default_test.go b/api/datadoghq/v2alpha1/datadogagent_default_test.go index ee4b32bbe..2359ff000 100644 --- a/api/datadoghq/v2alpha1/datadogagent_default_test.go +++ b/api/datadoghq/v2alpha1/datadogagent_default_test.go @@ -8,8 +8,8 @@ package v2alpha1 import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/google/go-cmp/cmp" assert "github.com/stretchr/testify/require" diff --git a/api/datadoghq/v2alpha1/test/new.go b/api/datadoghq/v2alpha1/test/new.go index 97b00084b..91cb2230a 100644 --- a/api/datadoghq/v2alpha1/test/new.go +++ b/api/datadoghq/v2alpha1/test/new.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" ) var apiVersion = fmt.Sprintf("%s/%s", v2alpha1.GroupVersion.Group, v2alpha1.GroupVersion.Version) diff --git a/api/datadoghq/v2alpha1/utils.go b/api/datadoghq/v2alpha1/utils.go index ba3b10685..71b3e8cb8 100644 --- a/api/datadoghq/v2alpha1/utils.go +++ b/api/datadoghq/v2alpha1/utils.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-operator/pkg/defaulting" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/api/datadoghq/v2alpha1/utils_test.go b/api/datadoghq/v2alpha1/utils_test.go index bcef5620b..6174c2148 100644 --- a/api/datadoghq/v2alpha1/utils_test.go +++ b/api/datadoghq/v2alpha1/utils_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/datadoghq/v2alpha1/zz_generated.openapi.go b/api/datadoghq/v2alpha1/zz_generated.openapi.go index 813a4d3b1..c4d86e28b 100644 --- a/api/datadoghq/v2alpha1/zz_generated.openapi.go +++ b/api/datadoghq/v2alpha1/zz_generated.openapi.go @@ -17,39 +17,39 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CSPMHostBenchmarksConfig": schema_datadog_operator_api_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig": schema_datadog_operator_api_datadoghq_v2alpha1_CustomConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus": schema_datadog_operator_api_datadoghq_v2alpha1_DaemonSetStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgent": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgent(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentGenericContainer": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentStatus": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogCredentials": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogCredentials(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogFeatures": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogFeatures(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus": schema_datadog_operator_api_datadoghq_v2alpha1_DeploymentStatus(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DogstatsdFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventCollectionFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.FIPSConfig": schema_datadog_operator_api_datadoghq_v2alpha1_FIPSConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HelmCheckFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LocalService": schema_datadog_operator_api_datadoghq_v2alpha1_LocalService(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.MultiCustomConfig": schema_datadog_operator_api_datadoghq_v2alpha1_MultiCustomConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.NetworkPolicyConfig": schema_datadog_operator_api_datadoghq_v2alpha1_NetworkPolicyConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPGRPCConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPGRPCConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPHTTPConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPHTTPConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPProtocolsConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPProtocolsConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPReceiverConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPReceiverConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigConfiguration": schema_datadog_operator_api_datadoghq_v2alpha1_RemoteConfigConfiguration(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SeccompConfig": schema_datadog_operator_api_datadoghq_v2alpha1_SeccompConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendConfig": schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendRolesConfig": schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendRolesConfig(ref), - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.UnixDomainSocketConfig": schema_datadog_operator_api_datadoghq_v2alpha1_UnixDomainSocketConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CSPMHostBenchmarksConfig": schema_api_crds_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig": schema_api_crds_datadoghq_v2alpha1_CustomConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus": schema_api_crds_datadoghq_v2alpha1_DaemonSetStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgent": schema_api_crds_datadoghq_v2alpha1_DatadogAgent(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentGenericContainer": schema_api_crds_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentStatus": schema_api_crds_datadoghq_v2alpha1_DatadogAgentStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogCredentials": schema_api_crds_datadoghq_v2alpha1_DatadogCredentials(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogFeatures": schema_api_crds_datadoghq_v2alpha1_DatadogFeatures(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus": schema_api_crds_datadoghq_v2alpha1_DeploymentStatus(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DogstatsdFeatureConfig": schema_api_crds_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventCollectionFeatureConfig": schema_api_crds_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.FIPSConfig": schema_api_crds_datadoghq_v2alpha1_FIPSConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HelmCheckFeatureConfig": schema_api_crds_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig": schema_api_crds_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LocalService": schema_api_crds_datadoghq_v2alpha1_LocalService(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.MultiCustomConfig": schema_api_crds_datadoghq_v2alpha1_MultiCustomConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.NetworkPolicyConfig": schema_api_crds_datadoghq_v2alpha1_NetworkPolicyConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPFeatureConfig": schema_api_crds_datadoghq_v2alpha1_OTLPFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPGRPCConfig": schema_api_crds_datadoghq_v2alpha1_OTLPGRPCConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPHTTPConfig": schema_api_crds_datadoghq_v2alpha1_OTLPHTTPConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPProtocolsConfig": schema_api_crds_datadoghq_v2alpha1_OTLPProtocolsConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPReceiverConfig": schema_api_crds_datadoghq_v2alpha1_OTLPReceiverConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig": schema_api_crds_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig": schema_api_crds_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigConfiguration": schema_api_crds_datadoghq_v2alpha1_RemoteConfigConfiguration(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SeccompConfig": schema_api_crds_datadoghq_v2alpha1_SeccompConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendConfig": schema_api_crds_datadoghq_v2alpha1_SecretBackendConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendRolesConfig": schema_api_crds_datadoghq_v2alpha1_SecretBackendRolesConfig(ref), + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.UnixDomainSocketConfig": schema_api_crds_datadoghq_v2alpha1_UnixDomainSocketConfig(ref), } } -func schema_datadog_operator_api_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -69,7 +69,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref } } -func schema_datadog_operator_api_datadoghq_v2alpha1_CustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_CustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -86,18 +86,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_CustomConfig(ref common.Refe "configMap": { SchemaProps: spec.SchemaProps{ Description: "ConfigMap references an existing ConfigMap with the configuration file content.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DaemonSetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DaemonSetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -187,7 +187,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DaemonSetStatus(ref common.R } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgent(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DatadogAgent(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -217,24 +217,24 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgent(ref common.Refe "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -380,7 +380,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentGenericContainer "seccompConfig": { SchemaProps: spec.SchemaProps{ Description: "Seccomp configurations to override Operator actions. For all other Seccomp Profile manipulation, use SecurityContext.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SeccompConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SeccompConfig"), }, }, "appArmorProfileName": { @@ -394,11 +394,11 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentGenericContainer }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SeccompConfig", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext", "k8s.io/api/core/v1.VolumeMount"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SeccompConfig", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext", "k8s.io/api/core/v1.VolumeMount"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DatadogAgentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -439,7 +439,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentStatus(ref commo Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus"), }, }, }, @@ -448,36 +448,36 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentStatus(ref commo "agent": { SchemaProps: spec.SchemaProps{ Description: "The combined actual state of all Agents as daemonsets or extended daemonsets.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus"), }, }, "clusterAgent": { SchemaProps: spec.SchemaProps{ Description: "The actual state of the Cluster Agent as a deployment.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus"), }, }, "clusterChecksRunner": { SchemaProps: spec.SchemaProps{ Description: "The actual state of the Cluster Checks Runner as a deployment.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus"), }, }, "remoteConfigConfiguration": { SchemaProps: spec.SchemaProps{ Description: "RemoteConfigConfiguration stores the configuration received from RemoteConfig.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigConfiguration"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigConfiguration"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigConfiguration", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigConfiguration", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogCredentials(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DatadogCredentials(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -494,7 +494,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogCredentials(ref commo "apiSecret": { SchemaProps: spec.SchemaProps{ Description: "APISecret references an existing Secret which stores the API key instead of creating a new one. If set, this parameter takes precedence over \"APIKey\".", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretConfig"), }, }, "appKey": { @@ -507,18 +507,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogCredentials(ref commo "appSecret": { SchemaProps: spec.SchemaProps{ Description: "AppSecret references an existing Secret which stores the application key instead of creating a new one. If set, this parameter takes precedence over \"AppKey\".", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogFeatures(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DatadogFeatures(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -528,174 +528,174 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogFeatures(ref common.R "logCollection": { SchemaProps: spec.SchemaProps{ Description: "LogCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LogCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LogCollectionFeatureConfig"), }, }, "liveProcessCollection": { SchemaProps: spec.SchemaProps{ Description: "LiveProcessCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig"), }, }, "liveContainerCollection": { SchemaProps: spec.SchemaProps{ Description: "LiveContainerCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig"), }, }, "processDiscovery": { SchemaProps: spec.SchemaProps{ Description: "ProcessDiscovery configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig"), }, }, "oomKill": { SchemaProps: spec.SchemaProps{ Description: "OOMKill configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OOMKillFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OOMKillFeatureConfig"), }, }, "tcpQueueLength": { SchemaProps: spec.SchemaProps{ Description: "TCPQueueLength configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig"), }, }, "ebpfCheck": { SchemaProps: spec.SchemaProps{ Description: "EBPFCheck configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EBPFCheckFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EBPFCheckFeatureConfig"), }, }, "apm": { SchemaProps: spec.SchemaProps{ Description: "APM (Application Performance Monitoring) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.APMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.APMFeatureConfig"), }, }, "asm": { SchemaProps: spec.SchemaProps{ Description: "ASM (Application Security Management) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ASMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ASMFeatureConfig"), }, }, "cspm": { SchemaProps: spec.SchemaProps{ Description: "CSPM (Cloud Security Posture Management) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CSPMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CSPMFeatureConfig"), }, }, "cws": { SchemaProps: spec.SchemaProps{ Description: "CWS (Cloud Workload Security) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CWSFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CWSFeatureConfig"), }, }, "npm": { SchemaProps: spec.SchemaProps{ Description: "NPM (Network Performance Monitoring) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.NPMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.NPMFeatureConfig"), }, }, "usm": { SchemaProps: spec.SchemaProps{ Description: "USM (Universal Service Monitoring) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.USMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.USMFeatureConfig"), }, }, "dogstatsd": { SchemaProps: spec.SchemaProps{ Description: "Dogstatsd configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DogstatsdFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DogstatsdFeatureConfig"), }, }, "otlp": { SchemaProps: spec.SchemaProps{ Description: "OTLP ingest configuration", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPFeatureConfig"), }, }, "remoteConfiguration": { SchemaProps: spec.SchemaProps{ Description: "Remote Configuration configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig"), }, }, "sbom": { SchemaProps: spec.SchemaProps{ Description: "SBOM collection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SBOMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SBOMFeatureConfig"), }, }, "serviceDiscovery": { SchemaProps: spec.SchemaProps{ Description: "ServiceDiscovery", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig"), }, }, "eventCollection": { SchemaProps: spec.SchemaProps{ Description: "EventCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventCollectionFeatureConfig"), }, }, "orchestratorExplorer": { SchemaProps: spec.SchemaProps{ Description: "OrchestratorExplorer check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig"), }, }, "kubeStateMetricsCore": { SchemaProps: spec.SchemaProps{ Description: "KubeStateMetricsCore check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig"), }, }, "admissionController": { SchemaProps: spec.SchemaProps{ Description: "AdmissionController configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AdmissionControllerFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AdmissionControllerFeatureConfig"), }, }, "externalMetricsServer": { SchemaProps: spec.SchemaProps{ Description: "ExternalMetricsServer configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig"), }, }, "autoscaling": { SchemaProps: spec.SchemaProps{ Description: "Autoscaling configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AutoscalingFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AutoscalingFeatureConfig"), }, }, "clusterChecks": { SchemaProps: spec.SchemaProps{ Description: "ClusterChecks configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ClusterChecksFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ClusterChecksFeatureConfig"), }, }, "prometheusScrape": { SchemaProps: spec.SchemaProps{ Description: "PrometheusScrape configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig"), }, }, "helmCheck": { SchemaProps: spec.SchemaProps{ Description: "HelmCheck configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HelmCheckFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HelmCheckFeatureConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.APMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ASMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AdmissionControllerFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AutoscalingFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CSPMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CWSFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ClusterChecksFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DogstatsdFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EBPFCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HelmCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LogCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.NPMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OOMKillFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SBOMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.USMFeatureConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.APMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ASMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AdmissionControllerFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AutoscalingFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CSPMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CWSFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ClusterChecksFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DogstatsdFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EBPFCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HelmCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LogCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.NPMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OOMKillFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SBOMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.USMFeatureConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DeploymentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DeploymentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -786,7 +786,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DeploymentStatus(ref common. } } -func schema_datadog_operator_api_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -810,30 +810,30 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref c "hostPortConfig": { SchemaProps: spec.SchemaProps{ Description: "HostPortConfig contains host port configuration. Enabled Default: false Port Default: 8125", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"), }, }, "unixDomainSocketConfig": { SchemaProps: spec.SchemaProps{ Description: "UnixDomainSocketConfig contains socket configuration. See also: https://docs.datadoghq.com/agent/kubernetes/apm/?tab=helm#agent-environment-variables Enabled Default: true Path Default: `/var/run/datadog/dsd.socket`", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.UnixDomainSocketConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.UnixDomainSocketConfig"), }, }, "mapperProfiles": { SchemaProps: spec.SchemaProps{ Description: "Configure the Dogstasd Mapper Profiles. Can be passed as raw data or via a json encoded string in a config map. See also: https://docs.datadoghq.com/developers/dogstatsd/dogstatsd_mapper/", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.UnixDomainSocketConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.UnixDomainSocketConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -867,7 +867,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_EventCollectionFeatureConfig Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventTypes"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventTypes"), }, }, }, @@ -877,11 +877,11 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_EventCollectionFeatureConfig }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventTypes"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventTypes"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_FIPSConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_FIPSConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -898,7 +898,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_FIPSConfig(ref common.Refere "image": { SchemaProps: spec.SchemaProps{ Description: "The container image of the FIPS sidecar.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AgentImageConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AgentImageConfig"), }, }, "localAddress": { @@ -938,18 +938,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_FIPSConfig(ref common.Refere "customFIPSConfig": { SchemaProps: spec.SchemaProps{ Description: "CustomFIPSConfig configures a custom configMap to provide the FIPS configuration. Specify custom contents for the FIPS proxy sidecar container config (/etc/datadog-fips-proxy/datadog-fips-proxy.cfg). If empty, the default FIPS proxy sidecar container config is used.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AgentImageConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig", "k8s.io/api/core/v1.ResourceRequirements"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AgentImageConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig", "k8s.io/api/core/v1.ResourceRequirements"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -992,7 +992,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref c } } -func schema_datadog_operator_api_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1009,18 +1009,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureC "conf": { SchemaProps: spec.SchemaProps{ Description: "Conf overrides the configuration for the default Kubernetes State Metrics Core check. This must point to a ConfigMap containing a valid cluster check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_LocalService(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_LocalService(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1047,7 +1047,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_LocalService(ref common.Refe } } -func schema_datadog_operator_api_datadoghq_v2alpha1_MultiCustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_MultiCustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1073,18 +1073,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_MultiCustomConfig(ref common "configMap": { SchemaProps: spec.SchemaProps{ Description: "ConfigMap references an existing ConfigMap with the content of the configuration files.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_NetworkPolicyConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_NetworkPolicyConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1132,7 +1132,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_NetworkPolicyConfig(ref comm } } -func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_OTLPFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1143,18 +1143,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPFeatureConfig(ref common SchemaProps: spec.SchemaProps{ Description: "Receiver contains configuration for the OTLP ingest receiver.", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPReceiverConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPReceiverConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPReceiverConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPReceiverConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1171,7 +1171,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.Re "hostPortConfig": { SchemaProps: spec.SchemaProps{ Description: "Enable hostPort for OTLP/gRPC Default: true", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"), }, }, "endpoint": { @@ -1185,11 +1185,11 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.Re }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1206,7 +1206,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.Re "hostPortConfig": { SchemaProps: spec.SchemaProps{ Description: "Enable hostPorts for OTLP/HTTP Default: true", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"), }, }, "endpoint": { @@ -1220,11 +1220,11 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.Re }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPProtocolsConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_OTLPProtocolsConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1234,24 +1234,24 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPProtocolsConfig(ref comm "grpc": { SchemaProps: spec.SchemaProps{ Description: "GRPC contains configuration for the OTLP ingest OTLP/gRPC receiver.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPGRPCConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPGRPCConfig"), }, }, "http": { SchemaProps: spec.SchemaProps{ Description: "HTTP contains configuration for the OTLP ingest OTLP/HTTP receiver.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPHTTPConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPHTTPConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPGRPCConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPHTTPConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPGRPCConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPHTTPConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPReceiverConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_OTLPReceiverConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1262,18 +1262,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPReceiverConfig(ref commo SchemaProps: spec.SchemaProps{ Description: "Protocols contains configuration for the OTLP ingest receiver protocols.", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPProtocolsConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPProtocolsConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPProtocolsConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPProtocolsConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1290,7 +1290,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OrchestratorExplorerFeatureC "conf": { SchemaProps: spec.SchemaProps{ Description: "Conf overrides the configuration for the default Orchestrator Explorer check. This must point to a ConfigMap containing a valid cluster check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), }, }, "scrubContainers": { @@ -1351,11 +1351,11 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_OrchestratorExplorerFeatureC }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1396,7 +1396,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_PrometheusScrapeFeatureConfi } } -func schema_datadog_operator_api_datadoghq_v2alpha1_RemoteConfigConfiguration(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_RemoteConfigConfiguration(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1405,18 +1405,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_RemoteConfigConfiguration(re Properties: map[string]spec.Schema{ "features": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogFeatures"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogFeatures"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogFeatures"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogFeatures"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_SeccompConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_SeccompConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1433,18 +1433,18 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_SeccompConfig(ref common.Ref "customProfile": { SchemaProps: spec.SchemaProps{ Description: "CustomProfile specifies a ConfigMap containing a custom Seccomp Profile. ConfigMap data must either have the key `system-probe-seccomp.json` or CustomProfile.Items must include a corev1.KeytoPath that maps the key to the path `system-probe-seccomp.json`.", - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_SecretBackendConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1491,7 +1491,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendConfig(ref comm Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendRolesConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendRolesConfig"), }, }, }, @@ -1501,11 +1501,11 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendConfig(ref comm }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendRolesConfig"}, + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendRolesConfig"}, } } -func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendRolesConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_SecretBackendRolesConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1546,7 +1546,7 @@ func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendRolesConfig(ref } } -func schema_datadog_operator_api_datadoghq_v2alpha1_UnixDomainSocketConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_api_crds_datadoghq_v2alpha1_UnixDomainSocketConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/api/go.mod b/api/go.mod index 6210bb069..d113c3a9c 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/DataDog/datadog-operator/api +module github.com/DataDog/datadog-operator/api/crds go 1.23.2 diff --git a/cmd/check-operator/upgrade/upgrade.go b/cmd/check-operator/upgrade/upgrade.go index 829e7036e..1de08949c 100644 --- a/cmd/check-operator/upgrade/upgrade.go +++ b/cmd/check-operator/upgrade/upgrade.go @@ -18,7 +18,7 @@ import ( "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/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cmd/kubectl-datadog/agent/upgrade/upgrade.go b/cmd/kubectl-datadog/agent/upgrade/upgrade.go index 8a60269a0..501761d8a 100644 --- a/cmd/kubectl-datadog/agent/upgrade/upgrade.go +++ b/cmd/kubectl-datadog/agent/upgrade/upgrade.go @@ -10,8 +10,8 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/plugin/common" diff --git a/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go b/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go index be54247e4..9aeed6990 100644 --- a/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go +++ b/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go @@ -10,8 +10,8 @@ import ( "fmt" "testing" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/plugin/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go index 3bb3f9145..8775080ac 100644 --- a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go +++ b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go @@ -10,8 +10,8 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/plugin/common" diff --git a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go index 8639c111f..7a1de4b07 100644 --- a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go +++ b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go @@ -12,9 +12,9 @@ package upgrade // "fmt" // "testing" -// commonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1" -// datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" -// apiutils "github.com/DataDog/datadog-operator/api/utils" +// commonv1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/common/v1" +// datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" +// apiutils "github.com/DataDog/datadog-operator/api/crds/utils" // "github.com/DataDog/datadog-operator/pkg/defaulting" // metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/kubectl-datadog/flare/flare.go b/cmd/kubectl-datadog/flare/flare.go index 2ef29e47e..1caa589df 100644 --- a/cmd/kubectl-datadog/flare/flare.go +++ b/cmd/kubectl-datadog/flare/flare.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" "github.com/DataDog/datadog-operator/pkg/version" diff --git a/cmd/kubectl-datadog/get/get.go b/cmd/kubectl-datadog/get/get.go index 9108646eb..57cb03691 100644 --- a/cmd/kubectl-datadog/get/get.go +++ b/cmd/kubectl-datadog/get/get.go @@ -11,7 +11,7 @@ import ( "fmt" "io" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" "github.com/olekukonko/tablewriter" diff --git a/cmd/kubectl-datadog/metrics/get/get.go b/cmd/kubectl-datadog/metrics/get/get.go index 798a991de..8cb48d78d 100644 --- a/cmd/kubectl-datadog/metrics/get/get.go +++ b/cmd/kubectl-datadog/metrics/get/get.go @@ -7,7 +7,7 @@ import ( "io" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" "k8s.io/apimachinery/pkg/util/duration" diff --git a/cmd/main.go b/cmd/main.go index 5fe587c12..fe60a3444 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -34,8 +34,8 @@ import ( "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" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller" "github.com/DataDog/datadog-operator/internal/controller/metrics" diff --git a/internal/controller/datadogagent/common/utils.go b/internal/controller/datadogagent/common/utils.go index 91f2b8877..058534288 100644 --- a/internal/controller/datadogagent/common/utils.go +++ b/internal/controller/datadogagent/common/utils.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/utils" diff --git a/internal/controller/datadogagent/common/volumes.go b/internal/controller/datadogagent/common/volumes.go index ea306af12..d8439f2a2 100644 --- a/internal/controller/datadogagent/common/volumes.go +++ b/internal/controller/datadogagent/common/volumes.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" ) // This file contains definitions of volumes used in the agent specs diff --git a/internal/controller/datadogagent/component/agent/default.go b/internal/controller/datadogagent/component/agent/default.go index e16a9bb01..78940c65b 100644 --- a/internal/controller/datadogagent/component/agent/default.go +++ b/internal/controller/datadogagent/component/agent/default.go @@ -11,9 +11,9 @@ import ( edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/component/agent/new.go b/internal/controller/datadogagent/component/agent/new.go index 11dd031fe..793484195 100644 --- a/internal/controller/datadogagent/component/agent/new.go +++ b/internal/controller/datadogagent/component/agent/new.go @@ -8,7 +8,7 @@ package agent import ( "time" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" diff --git a/internal/controller/datadogagent/component/clusteragent/default.go b/internal/controller/datadogagent/component/clusteragent/default.go index 73503a86e..4fe2ac837 100644 --- a/internal/controller/datadogagent/component/clusteragent/default.go +++ b/internal/controller/datadogagent/component/clusteragent/default.go @@ -14,9 +14,9 @@ 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/controller/utils" diff --git a/internal/controller/datadogagent/component/clusteragent/default_test.go b/internal/controller/datadogagent/component/clusteragent/default_test.go index 567fb7d09..76283a93f 100644 --- a/internal/controller/datadogagent/component/clusteragent/default_test.go +++ b/internal/controller/datadogagent/component/clusteragent/default_test.go @@ -5,9 +5,9 @@ import ( "strconv" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/testutils" diff --git a/internal/controller/datadogagent/component/clusteragent/utils.go b/internal/controller/datadogagent/component/clusteragent/utils.go index b608c621c..ed455c545 100644 --- a/internal/controller/datadogagent/component/clusteragent/utils.go +++ b/internal/controller/datadogagent/component/clusteragent/utils.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" diff --git a/internal/controller/datadogagent/component/clusterchecksrunner/default.go b/internal/controller/datadogagent/component/clusterchecksrunner/default.go index f554834db..8656503bd 100644 --- a/internal/controller/datadogagent/component/clusterchecksrunner/default.go +++ b/internal/controller/datadogagent/component/clusterchecksrunner/default.go @@ -15,9 +15,9 @@ import ( 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/pkg/defaulting" diff --git a/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go b/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go index eb1177de9..dcc1f9b22 100644 --- a/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go +++ b/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go @@ -8,7 +8,7 @@ package clusterchecksrunner import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/internal/controller/datadogagent/component/objects/network.go b/internal/controller/datadogagent/component/objects/network.go index 3d1588bed..86d8286e6 100644 --- a/internal/controller/datadogagent/component/objects/network.go +++ b/internal/controller/datadogagent/component/objects/network.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" componentccr "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusterchecksrunner" diff --git a/internal/controller/datadogagent/controller_reconcile_agent.go b/internal/controller/datadogagent/controller_reconcile_agent.go index 26b856673..d8db1ac3d 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent.go +++ b/internal/controller/datadogagent/controller_reconcile_agent.go @@ -9,10 +9,10 @@ import ( "context" "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" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" componentagent "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/override" diff --git a/internal/controller/datadogagent/controller_reconcile_agent_test.go b/internal/controller/datadogagent/controller_reconcile_agent_test.go index 9a28fdbcb..ee11d4d45 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent_test.go +++ b/internal/controller/datadogagent/controller_reconcile_agent_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - 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" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/pkg/agentprofile" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/controller_reconcile_ccr.go b/internal/controller/datadogagent/controller_reconcile_ccr.go index dff82d3e7..80ba9410e 100644 --- a/internal/controller/datadogagent/controller_reconcile_ccr.go +++ b/internal/controller/datadogagent/controller_reconcile_ccr.go @@ -9,9 +9,9 @@ import ( "context" "time" - 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" componentccr "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusterchecksrunner" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" diff --git a/internal/controller/datadogagent/controller_reconcile_ccr_test.go b/internal/controller/datadogagent/controller_reconcile_ccr_test.go index 7151931c3..074169f4c 100644 --- a/internal/controller/datadogagent/controller_reconcile_ccr_test.go +++ b/internal/controller/datadogagent/controller_reconcile_ccr_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/controller/datadogagent/controller_reconcile_dca.go b/internal/controller/datadogagent/controller_reconcile_dca.go index 48528c8c9..acd2d92d0 100644 --- a/internal/controller/datadogagent/controller_reconcile_dca.go +++ b/internal/controller/datadogagent/controller_reconcile_dca.go @@ -9,9 +9,9 @@ import ( "context" "time" - 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" diff --git a/internal/controller/datadogagent/controller_reconcile_dca_test.go b/internal/controller/datadogagent/controller_reconcile_dca_test.go index 0c43a730b..e747b65db 100644 --- a/internal/controller/datadogagent/controller_reconcile_dca_test.go +++ b/internal/controller/datadogagent/controller_reconcile_dca_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/controller_reconcile_v2.go b/internal/controller/datadogagent/controller_reconcile_v2.go index ee893fb15..00410ae66 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2.go +++ b/internal/controller/datadogagent/controller_reconcile_v2.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/controller_reconcile_v2_common.go b/internal/controller/datadogagent/controller_reconcile_v2_common.go index 631251665..fe41efee3 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_common.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_common.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/agentprofile" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" diff --git a/internal/controller/datadogagent/controller_reconcile_v2_common_test.go b/internal/controller/datadogagent/controller_reconcile_v2_common_test.go index 8c449ee5e..c9f0e9252 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_common_test.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_common_test.go @@ -3,8 +3,8 @@ package datadogagent import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" assert "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/controller_reconcile_v2_test.go b/internal/controller/datadogagent/controller_reconcile_v2_test.go index 32b5e706a..038aadfb6 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_test.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/controller/datadogagent/controller_v2_test.go b/internal/controller/datadogagent/controller_v2_test.go index f7b5b533a..ea6d488f0 100644 --- a/internal/controller/datadogagent/controller_v2_test.go +++ b/internal/controller/datadogagent/controller_v2_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" testutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/feature/admissioncontroller/feature.go b/internal/controller/datadogagent/feature/admissioncontroller/feature.go index 3bf2ce501..902d70263 100644 --- a/internal/controller/datadogagent/feature/admissioncontroller/feature.go +++ b/internal/controller/datadogagent/feature/admissioncontroller/feature.go @@ -9,9 +9,9 @@ import ( "encoding/json" "strconv" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/objects" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go b/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go index 2642822e3..9da69d27c 100644 --- a/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go +++ b/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go @@ -7,10 +7,10 @@ package admissioncontroller import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/apm/feature.go b/internal/controller/datadogagent/feature/apm/feature.go index 0c5e57d84..77d13455f 100644 --- a/internal/controller/datadogagent/feature/apm/feature.go +++ b/internal/controller/datadogagent/feature/apm/feature.go @@ -16,9 +16,9 @@ import ( 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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" diff --git a/internal/controller/datadogagent/feature/apm/feature_test.go b/internal/controller/datadogagent/feature/apm/feature_test.go index ea0d3673c..0c56f1ac6 100644 --- a/internal/controller/datadogagent/feature/apm/feature_test.go +++ b/internal/controller/datadogagent/feature/apm/feature_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/utils" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/asm/feature.go b/internal/controller/datadogagent/feature/asm/feature.go index 2f73a5910..6e9b5f3d9 100644 --- a/internal/controller/datadogagent/feature/asm/feature.go +++ b/internal/controller/datadogagent/feature/asm/feature.go @@ -6,9 +6,9 @@ package asm import ( - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/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" diff --git a/internal/controller/datadogagent/feature/asm/feature_test.go b/internal/controller/datadogagent/feature/asm/feature_test.go index a9da36f43..d94b0f879 100644 --- a/internal/controller/datadogagent/feature/asm/feature_test.go +++ b/internal/controller/datadogagent/feature/asm/feature_test.go @@ -8,8 +8,8 @@ package asm import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/autoscaling/feature.go b/internal/controller/datadogagent/feature/autoscaling/feature.go index 0c9a0d40e..d4d87a049 100644 --- a/internal/controller/datadogagent/feature/autoscaling/feature.go +++ b/internal/controller/datadogagent/feature/autoscaling/feature.go @@ -8,9 +8,9 @@ package autoscaling import ( "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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/feature/autoscaling/feature_test.go b/internal/controller/datadogagent/feature/autoscaling/feature_test.go index 31e84e97c..e0328329f 100644 --- a/internal/controller/datadogagent/feature/autoscaling/feature_test.go +++ b/internal/controller/datadogagent/feature/autoscaling/feature_test.go @@ -9,9 +9,9 @@ import ( "fmt" "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/clusterchecks/feature.go b/internal/controller/datadogagent/feature/clusterchecks/feature.go index 168c56ebd..20a2cf2e2 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature.go @@ -6,9 +6,9 @@ package clusterchecks import ( - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/objects" "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/clusterchecks/feature_test.go b/internal/controller/datadogagent/feature/clusterchecks/feature_test.go index 2a87930b6..7bc30e932 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature_test.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature_test.go @@ -13,10 +13,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/cspm/feature.go b/internal/controller/datadogagent/feature/cspm/feature.go index 8216cbaa7..84d89476f 100644 --- a/internal/controller/datadogagent/feature/cspm/feature.go +++ b/internal/controller/datadogagent/feature/cspm/feature.go @@ -8,9 +8,9 @@ package cspm import ( "strconv" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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" diff --git a/internal/controller/datadogagent/feature/cspm/feature_test.go b/internal/controller/datadogagent/feature/cspm/feature_test.go index 3c670804e..a00a9020d 100644 --- a/internal/controller/datadogagent/feature/cspm/feature_test.go +++ b/internal/controller/datadogagent/feature/cspm/feature_test.go @@ -13,9 +13,9 @@ 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/cws/feature.go b/internal/controller/datadogagent/feature/cws/feature.go index 03d35aa15..d0ca7befe 100644 --- a/internal/controller/datadogagent/feature/cws/feature.go +++ b/internal/controller/datadogagent/feature/cws/feature.go @@ -11,8 +11,8 @@ import ( corev1 "k8s.io/api/core/v1" 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/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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/cws/feature_test.go b/internal/controller/datadogagent/feature/cws/feature_test.go index d30b1328b..ec303cf3d 100644 --- a/internal/controller/datadogagent/feature/cws/feature_test.go +++ b/internal/controller/datadogagent/feature/cws/feature_test.go @@ -13,9 +13,9 @@ import ( "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature.go b/internal/controller/datadogagent/feature/dogstatsd/feature.go index 180cf41f0..4f91533a5 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature.go @@ -13,9 +13,9 @@ import ( 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featureutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature_test.go b/internal/controller/datadogagent/feature/dogstatsd/feature_test.go index 8bbc3d052..78453651c 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature_test.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature_test.go @@ -9,10 +9,10 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/dummy/feature.go b/internal/controller/datadogagent/feature/dummy/feature.go index fdfbd4112..a82922b3f 100644 --- a/internal/controller/datadogagent/feature/dummy/feature.go +++ b/internal/controller/datadogagent/feature/dummy/feature.go @@ -6,7 +6,7 @@ package dummy import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" ) diff --git a/internal/controller/datadogagent/feature/ebpfcheck/feature.go b/internal/controller/datadogagent/feature/ebpfcheck/feature.go index 89d46893c..ce1f8f282 100644 --- a/internal/controller/datadogagent/feature/ebpfcheck/feature.go +++ b/internal/controller/datadogagent/feature/ebpfcheck/feature.go @@ -3,9 +3,9 @@ package ebpfcheck 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/ebpfcheck/feature_test.go b/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go index c91543cf5..695c21df0 100644 --- a/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go +++ b/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/feature/fake" diff --git a/internal/controller/datadogagent/feature/enabledefault/feature.go b/internal/controller/datadogagent/feature/enabledefault/feature.go index 762decf48..dec76f3a6 100644 --- a/internal/controller/datadogagent/feature/enabledefault/feature.go +++ b/internal/controller/datadogagent/feature/enabledefault/feature.go @@ -10,9 +10,9 @@ import ( "fmt" "os" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" diff --git a/internal/controller/datadogagent/feature/enabledefault/feature_test.go b/internal/controller/datadogagent/feature/enabledefault/feature_test.go index c6f756e96..07597a282 100644 --- a/internal/controller/datadogagent/feature/enabledefault/feature_test.go +++ b/internal/controller/datadogagent/feature/enabledefault/feature_test.go @@ -15,8 +15,8 @@ import ( "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/enabledefault/rbac.go b/internal/controller/datadogagent/feature/enabledefault/rbac.go index cb7872d82..678694ad5 100644 --- a/internal/controller/datadogagent/feature/enabledefault/rbac.go +++ b/internal/controller/datadogagent/feature/enabledefault/rbac.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" diff --git a/internal/controller/datadogagent/feature/enabledefault/utils.go b/internal/controller/datadogagent/feature/enabledefault/utils.go index 779790cda..791c73c4c 100644 --- a/internal/controller/datadogagent/feature/enabledefault/utils.go +++ b/internal/controller/datadogagent/feature/enabledefault/utils.go @@ -6,7 +6,7 @@ package enabledefault import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" ) diff --git a/internal/controller/datadogagent/feature/enabledefault/utils_test.go b/internal/controller/datadogagent/feature/enabledefault/utils_test.go index 99495cd82..da08ee388 100644 --- a/internal/controller/datadogagent/feature/enabledefault/utils_test.go +++ b/internal/controller/datadogagent/feature/enabledefault/utils_test.go @@ -8,8 +8,8 @@ package enabledefault import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/datadogagent/feature/eventcollection/configmap.go b/internal/controller/datadogagent/feature/eventcollection/configmap.go index 65a654c18..190188f5b 100644 --- a/internal/controller/datadogagent/feature/eventcollection/configmap.go +++ b/internal/controller/datadogagent/feature/eventcollection/configmap.go @@ -6,7 +6,7 @@ package eventcollection import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/feature/eventcollection/feature.go b/internal/controller/datadogagent/feature/eventcollection/feature.go index 61671e177..1d63c394a 100644 --- a/internal/controller/datadogagent/feature/eventcollection/feature.go +++ b/internal/controller/datadogagent/feature/eventcollection/feature.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" 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/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/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/eventcollection/feature_test.go b/internal/controller/datadogagent/feature/eventcollection/feature_test.go index 3cc570d76..26b1afb48 100644 --- a/internal/controller/datadogagent/feature/eventcollection/feature_test.go +++ b/internal/controller/datadogagent/feature/eventcollection/feature_test.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature.go b/internal/controller/datadogagent/feature/externalmetrics/feature.go index b39a80362..f6edc076e 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature.go @@ -9,9 +9,9 @@ import ( "fmt" "strconv" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/objects" diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature_test.go b/internal/controller/datadogagent/feature/externalmetrics/feature_test.go index 97ed4c4ab..b5e184014 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature_test.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature_test.go @@ -8,9 +8,9 @@ package externalmetrics import ( "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/factory.go b/internal/controller/datadogagent/feature/factory.go index c4fac2183..e17b1e80f 100644 --- a/internal/controller/datadogagent/feature/factory.go +++ b/internal/controller/datadogagent/feature/factory.go @@ -10,8 +10,8 @@ import ( "sort" "sync" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" ) func init() { diff --git a/internal/controller/datadogagent/feature/helmcheck/configmap_test.go b/internal/controller/datadogagent/feature/helmcheck/configmap_test.go index 1073f4f4e..5d811cda4 100644 --- a/internal/controller/datadogagent/feature/helmcheck/configmap_test.go +++ b/internal/controller/datadogagent/feature/helmcheck/configmap_test.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/equality" ) diff --git a/internal/controller/datadogagent/feature/helmcheck/feature.go b/internal/controller/datadogagent/feature/helmcheck/feature.go index 7b16acf07..f0ddbf3a2 100644 --- a/internal/controller/datadogagent/feature/helmcheck/feature.go +++ b/internal/controller/datadogagent/feature/helmcheck/feature.go @@ -12,9 +12,9 @@ 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/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/object" diff --git a/internal/controller/datadogagent/feature/helmcheck/feature_test.go b/internal/controller/datadogagent/feature/helmcheck/feature_test.go index 0e9e911fa..556a7fde5 100644 --- a/internal/controller/datadogagent/feature/helmcheck/feature_test.go +++ b/internal/controller/datadogagent/feature/helmcheck/feature_test.go @@ -16,10 +16,10 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go index 1cea9f5af..75f90ff24 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go index 7e29eb0c7..175f1628a 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go @@ -13,9 +13,9 @@ import ( "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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/utils" diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go index 207ad0971..88f024f23 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go @@ -9,10 +9,10 @@ import ( "fmt" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/livecontainer/feature.go b/internal/controller/datadogagent/feature/livecontainer/feature.go index 8e7d403d2..20145fd20 100644 --- a/internal/controller/datadogagent/feature/livecontainer/feature.go +++ b/internal/controller/datadogagent/feature/livecontainer/feature.go @@ -8,10 +8,10 @@ package livecontainer import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/livecontainer/feature_test.go b/internal/controller/datadogagent/feature/livecontainer/feature_test.go index c17777480..f457ed528 100644 --- a/internal/controller/datadogagent/feature/livecontainer/feature_test.go +++ b/internal/controller/datadogagent/feature/livecontainer/feature_test.go @@ -8,11 +8,11 @@ package livecontainer import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/utils" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/liveprocess/feature.go b/internal/controller/datadogagent/feature/liveprocess/feature.go index 1a3f06b85..bdb4aa39c 100644 --- a/internal/controller/datadogagent/feature/liveprocess/feature.go +++ b/internal/controller/datadogagent/feature/liveprocess/feature.go @@ -8,10 +8,10 @@ package liveprocess import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/liveprocess/feature_test.go b/internal/controller/datadogagent/feature/liveprocess/feature_test.go index c38a33d06..f3858aa71 100644 --- a/internal/controller/datadogagent/feature/liveprocess/feature_test.go +++ b/internal/controller/datadogagent/feature/liveprocess/feature_test.go @@ -8,11 +8,11 @@ package liveprocess import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/utils" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/logcollection/feature.go b/internal/controller/datadogagent/feature/logcollection/feature.go index 41539edf9..8f72e20d4 100644 --- a/internal/controller/datadogagent/feature/logcollection/feature.go +++ b/internal/controller/datadogagent/feature/logcollection/feature.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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/logcollection/feature_test.go b/internal/controller/datadogagent/feature/logcollection/feature_test.go index 1f5c87d98..1d70ad732 100644 --- a/internal/controller/datadogagent/feature/logcollection/feature_test.go +++ b/internal/controller/datadogagent/feature/logcollection/feature_test.go @@ -8,9 +8,9 @@ package logcollection import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/npm/feature.go b/internal/controller/datadogagent/feature/npm/feature.go index a85a8aeb7..9abb42105 100644 --- a/internal/controller/datadogagent/feature/npm/feature.go +++ b/internal/controller/datadogagent/feature/npm/feature.go @@ -9,10 +9,10 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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_test.go b/internal/controller/datadogagent/feature/npm/feature_test.go index d382ef558..1b3f8135e 100644 --- a/internal/controller/datadogagent/feature/npm/feature_test.go +++ b/internal/controller/datadogagent/feature/npm/feature_test.go @@ -8,9 +8,9 @@ package npm import ( "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/feature/fake" diff --git a/internal/controller/datadogagent/feature/oomkill/feature.go b/internal/controller/datadogagent/feature/oomkill/feature.go index ad8e0ee48..01fef749d 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature.go +++ b/internal/controller/datadogagent/feature/oomkill/feature.go @@ -10,10 +10,10 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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/oomkill/feature_test.go b/internal/controller/datadogagent/feature/oomkill/feature_test.go index efa661056..2e5e4d1b5 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature_test.go +++ b/internal/controller/datadogagent/feature/oomkill/feature_test.go @@ -8,9 +8,9 @@ package oomkill import ( "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/feature/fake" diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go index 87cb218b1..ea3ca7caf 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/env.go b/internal/controller/datadogagent/feature/orchestratorexplorer/env.go index 1aaef527e..323e113c0 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/env.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/env.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" ) func (f *orchestratorExplorerFeature) getEnvVars() []*corev1.EnvVar { diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go index 7a41b10a1..e810c8af4 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go @@ -11,14 +11,14 @@ import ( corev1 "k8s.io/api/core/v1" 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/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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" + apicommon "github.com/DataDog/datadog-operator/api/crds/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" diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go index d86f4a1ce..f6eb4e3f1 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go @@ -9,10 +9,10 @@ import ( "fmt" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/otlp/feature.go b/internal/controller/datadogagent/feature/otlp/feature.go index a725c8660..c4711067e 100644 --- a/internal/controller/datadogagent/feature/otlp/feature.go +++ b/internal/controller/datadogagent/feature/otlp/feature.go @@ -16,12 +16,12 @@ import ( 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/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/cilium/v1" "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/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" diff --git a/internal/controller/datadogagent/feature/otlp/feature_test.go b/internal/controller/datadogagent/feature/otlp/feature_test.go index 32e4b6698..a14390caf 100644 --- a/internal/controller/datadogagent/feature/otlp/feature_test.go +++ b/internal/controller/datadogagent/feature/otlp/feature_test.go @@ -8,10 +8,10 @@ package otlp import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/processdiscovery/feature.go b/internal/controller/datadogagent/feature/processdiscovery/feature.go index 38bce2fe9..2b9327833 100644 --- a/internal/controller/datadogagent/feature/processdiscovery/feature.go +++ b/internal/controller/datadogagent/feature/processdiscovery/feature.go @@ -3,9 +3,9 @@ package processdiscovery 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/processdiscovery/feature_test.go b/internal/controller/datadogagent/feature/processdiscovery/feature_test.go index 2363d5a4e..4a8b1ebc4 100644 --- a/internal/controller/datadogagent/feature/processdiscovery/feature_test.go +++ b/internal/controller/datadogagent/feature/processdiscovery/feature_test.go @@ -3,11 +3,11 @@ package processdiscovery import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/utils" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/prometheusscrape/feature.go b/internal/controller/datadogagent/feature/prometheusscrape/feature.go index 26ea8ab64..b7f9dba0d 100644 --- a/internal/controller/datadogagent/feature/prometheusscrape/feature.go +++ b/internal/controller/datadogagent/feature/prometheusscrape/feature.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" ) diff --git a/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go b/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go index 2c5533b60..2c0255df2 100644 --- a/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go +++ b/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go @@ -8,9 +8,9 @@ package prometheusscrape import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/remoteconfig/feature.go b/internal/controller/datadogagent/feature/remoteconfig/feature.go index ae1229007..ed195f059 100644 --- a/internal/controller/datadogagent/feature/remoteconfig/feature.go +++ b/internal/controller/datadogagent/feature/remoteconfig/feature.go @@ -9,11 +9,11 @@ import ( corev1 "k8s.io/api/core/v1" 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/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" ) diff --git a/internal/controller/datadogagent/feature/remoteconfig/feature_test.go b/internal/controller/datadogagent/feature/remoteconfig/feature_test.go index be4aa3175..cf0da85aa 100644 --- a/internal/controller/datadogagent/feature/remoteconfig/feature_test.go +++ b/internal/controller/datadogagent/feature/remoteconfig/feature_test.go @@ -10,9 +10,9 @@ import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/sbom/feature.go b/internal/controller/datadogagent/feature/sbom/feature.go index a41732caa..2a4d333f4 100644 --- a/internal/controller/datadogagent/feature/sbom/feature.go +++ b/internal/controller/datadogagent/feature/sbom/feature.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" 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/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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/sbom/feature_test.go b/internal/controller/datadogagent/feature/sbom/feature_test.go index 3c3442ffe..cf1f4dc12 100644 --- a/internal/controller/datadogagent/feature/sbom/feature_test.go +++ b/internal/controller/datadogagent/feature/sbom/feature_test.go @@ -8,9 +8,9 @@ package sbom import ( "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/servicediscovery/feature.go b/internal/controller/datadogagent/feature/servicediscovery/feature.go index 44396d4cf..ad8987467 100644 --- a/internal/controller/datadogagent/feature/servicediscovery/feature.go +++ b/internal/controller/datadogagent/feature/servicediscovery/feature.go @@ -3,9 +3,9 @@ package servicediscovery 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/servicediscovery/feature_test.go b/internal/controller/datadogagent/feature/servicediscovery/feature_test.go index cdd00f70b..af7f4e746 100644 --- a/internal/controller/datadogagent/feature/servicediscovery/feature_test.go +++ b/internal/controller/datadogagent/feature/servicediscovery/feature_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/feature/fake" diff --git a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go index 8fa1c557b..11acd8eeb 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go @@ -11,10 +11,10 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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_test.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go index 25796c3ee..f6f964223 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go @@ -8,9 +8,9 @@ package tcpqueuelength import ( "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/feature/fake" diff --git a/internal/controller/datadogagent/feature/test/factory_test.go b/internal/controller/datadogagent/feature/test/factory_test.go index 0ef867e9d..c67acf5ea 100644 --- a/internal/controller/datadogagent/feature/test/factory_test.go +++ b/internal/controller/datadogagent/feature/test/factory_test.go @@ -3,11 +3,11 @@ package test import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" "github.com/stretchr/testify/assert" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" _ "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/apm" _ "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/cspm" diff --git a/internal/controller/datadogagent/feature/test/testsuite.go b/internal/controller/datadogagent/feature/test/testsuite.go index 2d3a8be54..83471329c 100644 --- a/internal/controller/datadogagent/feature/test/testsuite.go +++ b/internal/controller/datadogagent/feature/test/testsuite.go @@ -3,8 +3,8 @@ package test import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/feature/types.go b/internal/controller/datadogagent/feature/types.go index 04767246d..8b1151acd 100644 --- a/internal/controller/datadogagent/feature/types.go +++ b/internal/controller/datadogagent/feature/types.go @@ -6,9 +6,9 @@ package feature import ( - "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/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/feature/types_test.go b/internal/controller/datadogagent/feature/types_test.go index bb8fdc2e5..0e3510c5f 100644 --- a/internal/controller/datadogagent/feature/types_test.go +++ b/internal/controller/datadogagent/feature/types_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - common "github.com/DataDog/datadog-operator/api/datadoghq/common" + common "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" ) func Test_merge(t *testing.T) { diff --git a/internal/controller/datadogagent/feature/usm/feature.go b/internal/controller/datadogagent/feature/usm/feature.go index 3a6f289ba..9adb62cca 100644 --- a/internal/controller/datadogagent/feature/usm/feature.go +++ b/internal/controller/datadogagent/feature/usm/feature.go @@ -9,10 +9,10 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/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/usm/feature_test.go b/internal/controller/datadogagent/feature/usm/feature_test.go index 630d12eea..d19d6012b 100644 --- a/internal/controller/datadogagent/feature/usm/feature_test.go +++ b/internal/controller/datadogagent/feature/usm/feature_test.go @@ -8,9 +8,9 @@ package usm import ( "testing" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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/feature/fake" diff --git a/internal/controller/datadogagent/feature/utils/utils.go b/internal/controller/datadogagent/feature/utils/utils.go index d298f5ff9..8bc8133b4 100644 --- a/internal/controller/datadogagent/feature/utils/utils.go +++ b/internal/controller/datadogagent/feature/utils/utils.go @@ -8,8 +8,8 @@ package utils import ( "strconv" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/utils" diff --git a/internal/controller/datadogagent/finalizer.go b/internal/controller/datadogagent/finalizer.go index 4b5e39370..12deb0a76 100644 --- a/internal/controller/datadogagent/finalizer.go +++ b/internal/controller/datadogagent/finalizer.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/finalizer_test.go b/internal/controller/datadogagent/finalizer_test.go index fce9e75b8..b2f5b028f 100644 --- a/internal/controller/datadogagent/finalizer_test.go +++ b/internal/controller/datadogagent/finalizer_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" agenttestutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" diff --git a/internal/controller/datadogagent/merger/cilium_test.go b/internal/controller/datadogagent/merger/cilium_test.go index 5ae45fd6a..d1bb28e7a 100644 --- a/internal/controller/datadogagent/merger/cilium_test.go +++ b/internal/controller/datadogagent/merger/cilium_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" cilium "github.com/DataDog/datadog-operator/pkg/cilium/v1" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/configmap_test.go b/internal/controller/datadogagent/merger/configmap_test.go index 5592cc572..9c6f23f44 100644 --- a/internal/controller/datadogagent/merger/configmap_test.go +++ b/internal/controller/datadogagent/merger/configmap_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/envvarfrom.go b/internal/controller/datadogagent/merger/envvarfrom.go index 212ca49cd..d4adca3a0 100644 --- a/internal/controller/datadogagent/merger/envvarfrom.go +++ b/internal/controller/datadogagent/merger/envvarfrom.go @@ -6,7 +6,7 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/envvarfrom_test.go b/internal/controller/datadogagent/merger/envvarfrom_test.go index 4f9a0110e..b9a27e03e 100644 --- a/internal/controller/datadogagent/merger/envvarfrom_test.go +++ b/internal/controller/datadogagent/merger/envvarfrom_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/envvars.go b/internal/controller/datadogagent/merger/envvars.go index 499fd6404..1e91e83e1 100644 --- a/internal/controller/datadogagent/merger/envvars.go +++ b/internal/controller/datadogagent/merger/envvars.go @@ -8,7 +8,7 @@ package merger import ( "strings" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/envvars_test.go b/internal/controller/datadogagent/merger/envvars_test.go index 937231b20..81dd78266 100644 --- a/internal/controller/datadogagent/merger/envvars_test.go +++ b/internal/controller/datadogagent/merger/envvars_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/fake/const.go b/internal/controller/datadogagent/merger/fake/const.go index 8e1d6097d..998606c39 100644 --- a/internal/controller/datadogagent/merger/fake/const.go +++ b/internal/controller/datadogagent/merger/fake/const.go @@ -1,6 +1,6 @@ package fake -import "github.com/DataDog/datadog-operator/api/datadoghq/common" +import "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" const ( // AllContainers all containers container name diff --git a/internal/controller/datadogagent/merger/fake/envfromvar_manager.go b/internal/controller/datadogagent/merger/fake/envfromvar_manager.go index 8af5bc69b..118320b0a 100644 --- a/internal/controller/datadogagent/merger/fake/envfromvar_manager.go +++ b/internal/controller/datadogagent/merger/fake/envfromvar_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" v1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/fake/envvar_manager.go b/internal/controller/datadogagent/merger/fake/envvar_manager.go index d7857ca78..827a7f783 100644 --- a/internal/controller/datadogagent/merger/fake/envvar_manager.go +++ b/internal/controller/datadogagent/merger/fake/envvar_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" v1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/fake/port_manager.go b/internal/controller/datadogagent/merger/fake/port_manager.go index 801f5c4bc..fb84d2ac7 100644 --- a/internal/controller/datadogagent/merger/fake/port_manager.go +++ b/internal/controller/datadogagent/merger/fake/port_manager.go @@ -8,7 +8,7 @@ package fake import ( "testing" - common "github.com/DataDog/datadog-operator/api/datadoghq/common" + common "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" merger "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" v1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/fake/security_context_manager.go b/internal/controller/datadogagent/merger/fake/security_context_manager.go index 4fb498110..138adaab5 100644 --- a/internal/controller/datadogagent/merger/fake/security_context_manager.go +++ b/internal/controller/datadogagent/merger/fake/security_context_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" v1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/fake/volume_mount_manager.go b/internal/controller/datadogagent/merger/fake/volume_mount_manager.go index db2d41469..c4edeff1c 100644 --- a/internal/controller/datadogagent/merger/fake/volume_mount_manager.go +++ b/internal/controller/datadogagent/merger/fake/volume_mount_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" v1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/network_policy_test.go b/internal/controller/datadogagent/merger/network_policy_test.go index 23883b504..6fe7e3f82 100644 --- a/internal/controller/datadogagent/merger/network_policy_test.go +++ b/internal/controller/datadogagent/merger/network_policy_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/port.go b/internal/controller/datadogagent/merger/port.go index b15fdd5a6..7a6f7eb58 100644 --- a/internal/controller/datadogagent/merger/port.go +++ b/internal/controller/datadogagent/merger/port.go @@ -6,7 +6,7 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/rbac_test.go b/internal/controller/datadogagent/merger/rbac_test.go index ab09b96e3..d9714f544 100644 --- a/internal/controller/datadogagent/merger/rbac_test.go +++ b/internal/controller/datadogagent/merger/rbac_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/secret_test.go b/internal/controller/datadogagent/merger/secret_test.go index fe06ce0a7..2857ca133 100644 --- a/internal/controller/datadogagent/merger/secret_test.go +++ b/internal/controller/datadogagent/merger/secret_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "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" diff --git a/internal/controller/datadogagent/merger/security_context.go b/internal/controller/datadogagent/merger/security_context.go index a814ea2fa..ddbb3ff44 100644 --- a/internal/controller/datadogagent/merger/security_context.go +++ b/internal/controller/datadogagent/merger/security_context.go @@ -8,7 +8,7 @@ package merger import ( "sort" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/security_context_test.go b/internal/controller/datadogagent/merger/security_context_test.go index 346d72e0b..7c3e836d3 100644 --- a/internal/controller/datadogagent/merger/security_context_test.go +++ b/internal/controller/datadogagent/merger/security_context_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/service_test.go b/internal/controller/datadogagent/merger/service_test.go index 5d74faa45..c65e139bd 100644 --- a/internal/controller/datadogagent/merger/service_test.go +++ b/internal/controller/datadogagent/merger/service_test.go @@ -8,8 +8,8 @@ package merger import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/utils.go b/internal/controller/datadogagent/merger/utils.go index 712a093c2..b204c5e8a 100644 --- a/internal/controller/datadogagent/merger/utils.go +++ b/internal/controller/datadogagent/merger/utils.go @@ -5,7 +5,7 @@ package merger -import "github.com/DataDog/datadog-operator/api/datadoghq/common" +import "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" // AllAgentContainers is a map of all agent containers var AllAgentContainers = map[common.AgentContainerName]struct{}{ diff --git a/internal/controller/datadogagent/merger/volume_mount.go b/internal/controller/datadogagent/merger/volume_mount.go index 806c2be15..f425a2038 100644 --- a/internal/controller/datadogagent/merger/volume_mount.go +++ b/internal/controller/datadogagent/merger/volume_mount.go @@ -6,7 +6,7 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/volume_mount_test.go b/internal/controller/datadogagent/merger/volume_mount_test.go index 6b915561a..69296cba9 100644 --- a/internal/controller/datadogagent/merger/volume_mount_test.go +++ b/internal/controller/datadogagent/merger/volume_mount_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/object/labels.go b/internal/controller/datadogagent/object/labels.go index d903706db..aba238a20 100644 --- a/internal/controller/datadogagent/object/labels.go +++ b/internal/controller/datadogagent/object/labels.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/go-logr/logr" diff --git a/internal/controller/datadogagent/object/volume/volumes.go b/internal/controller/datadogagent/object/volume/volumes.go index 2438d697a..fb7d3d350 100644 --- a/internal/controller/datadogagent/object/volume/volumes.go +++ b/internal/controller/datadogagent/object/volume/volumes.go @@ -12,8 +12,8 @@ import ( "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" ) // GetVolumes creates a corev1.Volume and corev1.VolumeMount corresponding to a host path. diff --git a/internal/controller/datadogagent/override/container.go b/internal/controller/datadogagent/override/container.go index ceee2364b..99768b946 100644 --- a/internal/controller/datadogagent/override/container.go +++ b/internal/controller/datadogagent/override/container.go @@ -9,8 +9,8 @@ import ( "fmt" "strconv" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/override/container_test.go b/internal/controller/datadogagent/override/container_test.go index 6799f3187..0029d6318 100644 --- a/internal/controller/datadogagent/override/container_test.go +++ b/internal/controller/datadogagent/override/container_test.go @@ -10,9 +10,9 @@ import ( "reflect" "testing" - "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/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/stretchr/testify/assert" diff --git a/internal/controller/datadogagent/override/daemonset.go b/internal/controller/datadogagent/override/daemonset.go index 34624483c..daeec05b6 100644 --- a/internal/controller/datadogagent/override/daemonset.go +++ b/internal/controller/datadogagent/override/daemonset.go @@ -6,7 +6,7 @@ package override import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" v1 "k8s.io/api/apps/v1" ) diff --git a/internal/controller/datadogagent/override/daemonset_test.go b/internal/controller/datadogagent/override/daemonset_test.go index b965259b2..5930978fa 100644 --- a/internal/controller/datadogagent/override/daemonset_test.go +++ b/internal/controller/datadogagent/override/daemonset_test.go @@ -8,9 +8,9 @@ package override import ( "testing" - "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/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/stretchr/testify/assert" v1 "k8s.io/api/apps/v1" diff --git a/internal/controller/datadogagent/override/dependencies.go b/internal/controller/datadogagent/override/dependencies.go index 18006de15..753162e75 100644 --- a/internal/controller/datadogagent/override/dependencies.go +++ b/internal/controller/datadogagent/override/dependencies.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/errors" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" 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/feature" diff --git a/internal/controller/datadogagent/override/dependencies_test.go b/internal/controller/datadogagent/override/dependencies_test.go index 1c836a3b2..59029079c 100644 --- a/internal/controller/datadogagent/override/dependencies_test.go +++ b/internal/controller/datadogagent/override/dependencies_test.go @@ -8,8 +8,8 @@ package override import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/override/deploymentspec.go b/internal/controller/datadogagent/override/deploymentspec.go index 0a6509577..99092c74f 100644 --- a/internal/controller/datadogagent/override/deploymentspec.go +++ b/internal/controller/datadogagent/override/deploymentspec.go @@ -6,7 +6,7 @@ package override import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" v1 "k8s.io/api/apps/v1" ) diff --git a/internal/controller/datadogagent/override/deploymentspec_test.go b/internal/controller/datadogagent/override/deploymentspec_test.go index c84cab91b..d5690f3f5 100644 --- a/internal/controller/datadogagent/override/deploymentspec_test.go +++ b/internal/controller/datadogagent/override/deploymentspec_test.go @@ -8,8 +8,8 @@ package override import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/stretchr/testify/assert" v1 "k8s.io/api/apps/v1" diff --git a/internal/controller/datadogagent/override/fips.go b/internal/controller/datadogagent/override/fips.go index 4ec143b0b..4e64dd21c 100644 --- a/internal/controller/datadogagent/override/fips.go +++ b/internal/controller/datadogagent/override/fips.go @@ -9,9 +9,9 @@ import ( "fmt" "strconv" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "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" diff --git a/internal/controller/datadogagent/override/fips_test.go b/internal/controller/datadogagent/override/fips_test.go index 3c9a27851..e05a81ca4 100644 --- a/internal/controller/datadogagent/override/fips_test.go +++ b/internal/controller/datadogagent/override/fips_test.go @@ -10,10 +10,10 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/override/global.go b/internal/controller/datadogagent/override/global.go index 90d0f7bff..5d6857fec 100644 --- a/internal/controller/datadogagent/override/global.go +++ b/internal/controller/datadogagent/override/global.go @@ -12,9 +12,9 @@ import ( "strconv" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/objects" "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/override/global_test.go b/internal/controller/datadogagent/override/global_test.go index 21441418d..06931e9d6 100644 --- a/internal/controller/datadogagent/override/global_test.go +++ b/internal/controller/datadogagent/override/global_test.go @@ -12,10 +12,10 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" diff --git a/internal/controller/datadogagent/override/podtemplatespec.go b/internal/controller/datadogagent/override/podtemplatespec.go index b055b3378..561ffb820 100644 --- a/internal/controller/datadogagent/override/podtemplatespec.go +++ b/internal/controller/datadogagent/override/podtemplatespec.go @@ -13,8 +13,8 @@ import ( "github.com/go-logr/logr" v1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "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" diff --git a/internal/controller/datadogagent/override/podtemplatespec_test.go b/internal/controller/datadogagent/override/podtemplatespec_test.go index 053db9747..07b3b1a6a 100644 --- a/internal/controller/datadogagent/override/podtemplatespec_test.go +++ b/internal/controller/datadogagent/override/podtemplatespec_test.go @@ -15,9 +15,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "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/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" ) diff --git a/internal/controller/datadogagent/store/store_test.go b/internal/controller/datadogagent/store/store_test.go index 8665c8956..fa0b3cce8 100644 --- a/internal/controller/datadogagent/store/store_test.go +++ b/internal/controller/datadogagent/store/store_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" testutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" "github.com/DataDog/datadog-operator/pkg/kubernetes" assert "github.com/stretchr/testify/require" diff --git a/internal/controller/datadogagent/testutils/client_utils.go b/internal/controller/datadogagent/testutils/client_utils.go index 86cd4cb0b..bce168bc9 100644 --- a/internal/controller/datadogagent/testutils/client_utils.go +++ b/internal/controller/datadogagent/testutils/client_utils.go @@ -6,8 +6,8 @@ package testutils_test import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" edsdatadoghqv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/utils.go b/internal/controller/datadogagent/utils.go index 507359c83..2ba95d118 100644 --- a/internal/controller/datadogagent/utils.go +++ b/internal/controller/datadogagent/utils.go @@ -11,7 +11,7 @@ import ( "strings" "time" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/go-logr/logr" "github.com/gobwas/glob" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent_controller.go b/internal/controller/datadogagent_controller.go index 2e80cdf20..5cad91936 100644 --- a/internal/controller/datadogagent_controller.go +++ b/internal/controller/datadogagent_controller.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "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" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "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" diff --git a/internal/controller/datadogagent_controller_profiles_test.go b/internal/controller/datadogagent_controller_profiles_test.go index ddc1aa4de..569e8495c 100644 --- a/internal/controller/datadogagent_controller_profiles_test.go +++ b/internal/controller/datadogagent_controller_profiles_test.go @@ -13,10 +13,10 @@ import ( "strings" "time" - 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" - "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/utils" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/testutils" "github.com/DataDog/datadog-operator/pkg/agentprofile" diff --git a/internal/controller/datadogagent_controller_test.go b/internal/controller/datadogagent_controller_test.go index b8442043a..430666e03 100644 --- a/internal/controller/datadogagent_controller_test.go +++ b/internal/controller/datadogagent_controller_test.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/testutils" ) diff --git a/internal/controller/datadogagentprofile_controller.go b/internal/controller/datadogagentprofile_controller.go index 6f61dc53b..89c1b693a 100644 --- a/internal/controller/datadogagentprofile_controller.go +++ b/internal/controller/datadogagentprofile_controller.go @@ -14,7 +14,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" dap "github.com/DataDog/datadog-operator/internal/controller/datadogagentprofile" ) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index 48dbaf116..7ddbcd729 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -6,7 +6,7 @@ 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/api/crds/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" diff --git a/internal/controller/datadogdashboard/controller_test.go b/internal/controller/datadogdashboard/controller_test.go index 6e4b611ce..aeb826c73 100644 --- a/internal/controller/datadogdashboard/controller_test.go +++ b/internal/controller/datadogdashboard/controller_test.go @@ -21,7 +21,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/datadogdashboard/dashboard.go b/internal/controller/datadogdashboard/dashboard.go index 7d8ba1405..3b3059056 100644 --- a/internal/controller/datadogdashboard/dashboard.go +++ b/internal/controller/datadogdashboard/dashboard.go @@ -9,7 +9,7 @@ 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-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" diff --git a/internal/controller/datadogdashboard/dashboard_test.go b/internal/controller/datadogdashboard/dashboard_test.go index af5a7e3de..47710151c 100644 --- a/internal/controller/datadogdashboard/dashboard_test.go +++ b/internal/controller/datadogdashboard/dashboard_test.go @@ -16,8 +16,8 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - v1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + v1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/datadogdashboard/finalizer.go b/internal/controller/datadogdashboard/finalizer.go index 8ab1bb509..988b2edcd 100644 --- a/internal/controller/datadogdashboard/finalizer.go +++ b/internal/controller/datadogdashboard/finalizer.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/datadogdashboard/finalizer_test.go b/internal/controller/datadogdashboard/finalizer_test.go index 0903ce392..5ce297bee 100644 --- a/internal/controller/datadogdashboard/finalizer_test.go +++ b/internal/controller/datadogdashboard/finalizer_test.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/log/zap" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" ) diff --git a/internal/controller/datadogdashboard_controller.go b/internal/controller/datadogdashboard_controller.go index 97b261835..c97499ad1 100644 --- a/internal/controller/datadogdashboard_controller.go +++ b/internal/controller/datadogdashboard_controller.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogdashboard" "github.com/DataDog/datadog-operator/pkg/datadogclient" "github.com/go-logr/logr" diff --git a/internal/controller/datadogmonitor/controller.go b/internal/controller/datadogmonitor/controller.go index c54dad590..b80a2cb2c 100644 --- a/internal/controller/datadogmonitor/controller.go +++ b/internal/controller/datadogmonitor/controller.go @@ -26,8 +26,8 @@ import ( "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" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/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" diff --git a/internal/controller/datadogmonitor/controller_test.go b/internal/controller/datadogmonitor/controller_test.go index 6b63b0be7..177afeb26 100644 --- a/internal/controller/datadogmonitor/controller_test.go +++ b/internal/controller/datadogmonitor/controller_test.go @@ -28,7 +28,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" ) diff --git a/internal/controller/datadogmonitor/event.go b/internal/controller/datadogmonitor/event.go index 16b1a9ee7..8fe4afc14 100644 --- a/internal/controller/datadogmonitor/event.go +++ b/internal/controller/datadogmonitor/event.go @@ -8,7 +8,7 @@ package datadogmonitor import ( corev1 "k8s.io/api/core/v1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/utils" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" ) diff --git a/internal/controller/datadogmonitor/finalizer.go b/internal/controller/datadogmonitor/finalizer.go index 7e5d3a1ec..e5f8e60e7 100644 --- a/internal/controller/datadogmonitor/finalizer.go +++ b/internal/controller/datadogmonitor/finalizer.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/datadogmonitor/finalizer_test.go b/internal/controller/datadogmonitor/finalizer_test.go index 61898925b..179f7288e 100644 --- a/internal/controller/datadogmonitor/finalizer_test.go +++ b/internal/controller/datadogmonitor/finalizer_test.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/log/zap" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" ) diff --git a/internal/controller/datadogmonitor/monitor.go b/internal/controller/datadogmonitor/monitor.go index df104dbaa..0304e94b9 100644 --- a/internal/controller/datadogmonitor/monitor.go +++ b/internal/controller/datadogmonitor/monitor.go @@ -17,7 +17,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" ) func buildMonitor(logger logr.Logger, dm *datadoghqv1alpha1.DatadogMonitor) (*datadogV1.Monitor, *datadogV1.MonitorUpdateRequest) { diff --git a/internal/controller/datadogmonitor/monitor_test.go b/internal/controller/datadogmonitor/monitor_test.go index ae74b3500..53049c03d 100644 --- a/internal/controller/datadogmonitor/monitor_test.go +++ b/internal/controller/datadogmonitor/monitor_test.go @@ -21,7 +21,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" ) const dateFormat = "2006-01-02 15:04:05.999999999 -0700 MST" diff --git a/internal/controller/datadogmonitor_controller.go b/internal/controller/datadogmonitor_controller.go index 11f81a9da..916b9be59 100644 --- a/internal/controller/datadogmonitor_controller.go +++ b/internal/controller/datadogmonitor_controller.go @@ -14,7 +14,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/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..066e9f387 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -24,8 +24,8 @@ import ( "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/api/crds/datadoghq/v1alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/finalizer" "github.com/DataDog/datadog-operator/internal/controller/utils" ctrutils "github.com/DataDog/datadog-operator/pkg/controller/utils" diff --git a/internal/controller/datadogslo/controller_test.go b/internal/controller/datadogslo/controller_test.go index 85d73667c..170d4c8f1 100644 --- a/internal/controller/datadogslo/controller_test.go +++ b/internal/controller/datadogslo/controller_test.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/DataDog/datadog-operator/internal/controller/utils" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" ) const ( diff --git a/internal/controller/datadogslo/slo.go b/internal/controller/datadogslo/slo.go index e99596ed9..50be589e9 100644 --- a/internal/controller/datadogslo/slo.go +++ b/internal/controller/datadogslo/slo.go @@ -15,7 +15,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" ) func buildSLO(crdSLO *v1alpha1.DatadogSLO) (*datadogV1.ServiceLevelObjectiveRequest, *datadogV1.ServiceLevelObjective) { diff --git a/internal/controller/datadogslo/slo_test.go b/internal/controller/datadogslo/slo_test.go index c3c4c7676..f26ecfc73 100644 --- a/internal/controller/datadogslo/slo_test.go +++ b/internal/controller/datadogslo/slo_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/resource" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" ) func Test_buildThreshold(t *testing.T) { diff --git a/internal/controller/datadogslo_controller.go b/internal/controller/datadogslo_controller.go index 77a93f08e..387f104e6 100644 --- a/internal/controller/datadogslo_controller.go +++ b/internal/controller/datadogslo_controller.go @@ -8,7 +8,7 @@ package controller import ( "context" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogslo" "github.com/go-logr/logr" diff --git a/internal/controller/finalizer/finalizer_test.go b/internal/controller/finalizer/finalizer_test.go index 54ed8a402..a0cb98d44 100644 --- a/internal/controller/finalizer/finalizer_test.go +++ b/internal/controller/finalizer/finalizer_test.go @@ -7,7 +7,10 @@ package finalizer import ( "context" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "testing" + "time" + + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -17,8 +20,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "testing" - "time" ) type testResource struct { diff --git a/internal/controller/suite_v2_test.go b/internal/controller/suite_v2_test.go index da5ddfffa..5e5f4d270 100644 --- a/internal/controller/suite_v2_test.go +++ b/internal/controller/suite_v2_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/client-go/rest" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" gc "github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/reporters" @@ -34,7 +34,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/testutils" "github.com/DataDog/datadog-operator/pkg/config" diff --git a/internal/controller/testutils/agent.go b/internal/controller/testutils/agent.go index fc4ea3288..f091368de 100644 --- a/internal/controller/testutils/agent.go +++ b/internal/controller/testutils/agent.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" controllerruntime "sigs.k8s.io/controller-runtime" - 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/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" ) // NewDatadogAgentWithoutFeatures returns an agent without any features enabled diff --git a/pkg/agentprofile/agent_profile.go b/pkg/agentprofile/agent_profile.go index 7c53db872..952847d96 100644 --- a/pkg/agentprofile/agent_profile.go +++ b/pkg/agentprofile/agent_profile.go @@ -10,10 +10,10 @@ 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/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" diff --git a/pkg/agentprofile/agent_profile_test.go b/pkg/agentprofile/agent_profile_test.go index f83660e31..6e6529884 100644 --- a/pkg/agentprofile/agent_profile_test.go +++ b/pkg/agentprofile/agent_profile_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - 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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/stretchr/testify/assert" diff --git a/pkg/agentprofile/status.go b/pkg/agentprofile/status.go index e5968e0b5..094f3f4c8 100644 --- a/pkg/agentprofile/status.go +++ b/pkg/agentprofile/status.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/go-logr/logr" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/agentprofile/status_test.go b/pkg/agentprofile/status_test.go index 13148dfa2..a1744f303 100644 --- a/pkg/agentprofile/status_test.go +++ b/pkg/agentprofile/status_test.go @@ -8,8 +8,8 @@ package agentprofile import ( "testing" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/config/config.go b/pkg/config/config.go index 8e9698764..0ad9b9942 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -21,9 +21,9 @@ import ( "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/api/crds/datadoghq/common" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" ) // These constants are only used within pkg/config diff --git a/pkg/config/creds.go b/pkg/config/creds.go index 7e2e16696..731a596a0 100644 --- a/pkg/config/creds.go +++ b/pkg/config/creds.go @@ -11,7 +11,7 @@ import ( "sync" "time" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" "github.com/DataDog/datadog-operator/pkg/secrets" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/controller/utils/comparison/comparison.go b/pkg/controller/utils/comparison/comparison.go index 0f0545e02..970b62a2e 100644 --- a/pkg/controller/utils/comparison/comparison.go +++ b/pkg/controller/utils/comparison/comparison.go @@ -15,7 +15,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" ) // IsSameSpecMD5Hash used to compare the DatadogAgent.spec md5 hash with the one set in annotations diff --git a/pkg/controller/utils/condition/datadogmonitor.go b/pkg/controller/utils/condition/datadogmonitor.go index ac56daefc..7667089ef 100644 --- a/pkg/controller/utils/condition/datadogmonitor.go +++ b/pkg/controller/utils/condition/datadogmonitor.go @@ -8,7 +8,7 @@ package condition import ( "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/utils/condition/datadogmonitor_test.go b/pkg/controller/utils/condition/datadogmonitor_test.go index 66a3b895b..5e5f47399 100644 --- a/pkg/controller/utils/condition/datadogmonitor_test.go +++ b/pkg/controller/utils/condition/datadogmonitor_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/utils/datadog/metrics_forwarder.go b/pkg/controller/utils/datadog/metrics_forwarder.go index 0910783f4..5822af1af 100644 --- a/pkg/controller/utils/datadog/metrics_forwarder.go +++ b/pkg/controller/utils/datadog/metrics_forwarder.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/secrets" diff --git a/pkg/controller/utils/datadog/metrics_forwarder_test.go b/pkg/controller/utils/datadog/metrics_forwarder_test.go index cb105d217..11e271706 100644 --- a/pkg/controller/utils/datadog/metrics_forwarder_test.go +++ b/pkg/controller/utils/datadog/metrics_forwarder_test.go @@ -15,10 +15,10 @@ import ( "sync" "testing" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/secrets" diff --git a/pkg/datadogclient/client.go b/pkg/datadogclient/client.go index 2db5c7c28..58d267353 100644 --- a/pkg/datadogclient/client.go +++ b/pkg/datadogclient/client.go @@ -19,7 +19,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" ) const prefix = "https://api." diff --git a/pkg/equality/equality.go b/pkg/equality/equality.go index aa4fce456..730598b6a 100644 --- a/pkg/equality/equality.go +++ b/pkg/equality/equality.go @@ -17,7 +17,7 @@ import ( apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" "sigs.k8s.io/controller-runtime/pkg/client" - apiutils "github.com/DataDog/datadog-operator/api/utils" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes" ) diff --git a/pkg/kubernetes/provider.go b/pkg/kubernetes/provider.go index f330f71f6..c53f0ac04 100644 --- a/pkg/kubernetes/provider.go +++ b/pkg/kubernetes/provider.go @@ -12,8 +12,8 @@ import ( "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" + apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" ) const ( diff --git a/pkg/plugin/common/client.go b/pkg/plugin/common/client.go index afb3f9513..f913e3a36 100644 --- a/pkg/plugin/common/client.go +++ b/pkg/plugin/common/client.go @@ -8,8 +8,8 @@ package common import ( "fmt" - "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" diff --git a/pkg/plugin/common/statuswrapper.go b/pkg/plugin/common/statuswrapper.go index 179c77231..5c24d8a60 100644 --- a/pkg/plugin/common/statuswrapper.go +++ b/pkg/plugin/common/statuswrapper.go @@ -6,7 +6,7 @@ package common import ( - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/plugin/common/v2support.go b/pkg/plugin/common/v2support.go index 3a18fd9b5..fba0f72b2 100644 --- a/pkg/plugin/common/v2support.go +++ b/pkg/plugin/common/v2support.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/utils" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/crds/utils" ) func OverrideComponentImage(spec *v2alpha1.DatadogAgentSpec, cmpName v2alpha1.ComponentName, imageName, imageTag string) error { diff --git a/pkg/remoteconfig/orchestrator_k8s_crd.go b/pkg/remoteconfig/orchestrator_k8s_crd.go index 3abc149c1..708ffae29 100644 --- a/pkg/remoteconfig/orchestrator_k8s_crd.go +++ b/pkg/remoteconfig/orchestrator_k8s_crd.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" ) // CustomResourceDefinitionURLs defines model for CustomResourceDefinitionURLs. diff --git a/pkg/remoteconfig/updater.go b/pkg/remoteconfig/updater.go index 770fd6a99..01589cedf 100644 --- a/pkg/remoteconfig/updater.go +++ b/pkg/remoteconfig/updater.go @@ -28,8 +28,8 @@ import ( "github.com/DataDog/datadog-agent/pkg/config/remote/service" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" - "github.com/DataDog/datadog-operator/api/datadoghq/common" - "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/version" ) From fe3814d70f2a48ad84179a62a7c7dc7341c673ff Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Mon, 9 Dec 2024 11:29:44 -0500 Subject: [PATCH 03/12] Revert "rename crd go module" This reverts commit 0f095ec19cb9d0c88152c97d4244ad2a8b4c787d. --- .../v1alpha1/datadogagentprofile_types.go | 2 +- .../datadogagentprofile_validation_test.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../v1alpha1/zz_generated.openapi.go | 174 ++++++------ api/datadoghq/v2alpha1/condition.go | 2 +- api/datadoghq/v2alpha1/condition_test.go | 2 +- .../v2alpha1/datadogagent_default.go | 4 +- .../v2alpha1/datadogagent_default_test.go | 4 +- api/datadoghq/v2alpha1/test/new.go | 2 +- api/datadoghq/v2alpha1/utils.go | 2 +- api/datadoghq/v2alpha1/utils_test.go | 2 +- .../v2alpha1/zz_generated.openapi.go | 268 +++++++++--------- api/go.mod | 2 +- cmd/check-operator/upgrade/upgrade.go | 2 +- cmd/kubectl-datadog/agent/upgrade/upgrade.go | 4 +- .../agent/upgrade/upgrade_test.go | 4 +- .../clusteragent/upgrade/upgrade.go | 4 +- .../clusteragent/upgrade/upgrade_test.go | 6 +- cmd/kubectl-datadog/flare/flare.go | 2 +- cmd/kubectl-datadog/get/get.go | 2 +- cmd/kubectl-datadog/metrics/get/get.go | 2 +- cmd/main.go | 4 +- .../controller/datadogagent/common/utils.go | 4 +- .../controller/datadogagent/common/volumes.go | 2 +- .../datadogagent/component/agent/default.go | 6 +- .../datadogagent/component/agent/new.go | 2 +- .../component/clusteragent/default.go | 6 +- .../component/clusteragent/default_test.go | 6 +- .../component/clusteragent/utils.go | 4 +- .../component/clusterchecksrunner/default.go | 6 +- .../clusterchecksrunner/default_test.go | 2 +- .../datadogagent/component/objects/network.go | 2 +- .../controller_reconcile_agent.go | 8 +- .../controller_reconcile_agent_test.go | 8 +- .../datadogagent/controller_reconcile_ccr.go | 6 +- .../controller_reconcile_ccr_test.go | 6 +- .../datadogagent/controller_reconcile_dca.go | 6 +- .../controller_reconcile_dca_test.go | 6 +- .../datadogagent/controller_reconcile_v2.go | 4 +- .../controller_reconcile_v2_common.go | 4 +- .../controller_reconcile_v2_common_test.go | 4 +- .../controller_reconcile_v2_test.go | 6 +- .../datadogagent/controller_v2_test.go | 8 +- .../feature/admissioncontroller/feature.go | 6 +- .../admissioncontroller/feature_test.go | 8 +- .../datadogagent/feature/apm/feature.go | 6 +- .../datadogagent/feature/apm/feature_test.go | 10 +- .../datadogagent/feature/asm/feature.go | 6 +- .../datadogagent/feature/asm/feature_test.go | 4 +- .../feature/autoscaling/feature.go | 6 +- .../feature/autoscaling/feature_test.go | 6 +- .../feature/clusterchecks/feature.go | 6 +- .../feature/clusterchecks/feature_test.go | 8 +- .../datadogagent/feature/cspm/feature.go | 6 +- .../datadogagent/feature/cspm/feature_test.go | 6 +- .../datadogagent/feature/cws/feature.go | 6 +- .../datadogagent/feature/cws/feature_test.go | 6 +- .../datadogagent/feature/dogstatsd/feature.go | 6 +- .../feature/dogstatsd/feature_test.go | 8 +- .../datadogagent/feature/dummy/feature.go | 2 +- .../datadogagent/feature/ebpfcheck/feature.go | 6 +- .../feature/ebpfcheck/feature_test.go | 6 +- .../feature/enabledefault/feature.go | 6 +- .../feature/enabledefault/feature_test.go | 4 +- .../feature/enabledefault/rbac.go | 2 +- .../feature/enabledefault/utils.go | 2 +- .../feature/enabledefault/utils_test.go | 4 +- .../feature/eventcollection/configmap.go | 2 +- .../feature/eventcollection/feature.go | 6 +- .../feature/eventcollection/feature_test.go | 8 +- .../feature/externalmetrics/feature.go | 6 +- .../feature/externalmetrics/feature_test.go | 6 +- .../datadogagent/feature/factory.go | 4 +- .../feature/helmcheck/configmap_test.go | 2 +- .../datadogagent/feature/helmcheck/feature.go | 6 +- .../feature/helmcheck/feature_test.go | 8 +- .../kubernetesstatecore/configmap_test.go | 2 +- .../feature/kubernetesstatecore/feature.go | 6 +- .../kubernetesstatecore/feature_test.go | 8 +- .../feature/livecontainer/feature.go | 6 +- .../feature/livecontainer/feature_test.go | 10 +- .../feature/liveprocess/feature.go | 6 +- .../feature/liveprocess/feature_test.go | 10 +- .../feature/logcollection/feature.go | 6 +- .../feature/logcollection/feature_test.go | 6 +- .../datadogagent/feature/npm/feature.go | 6 +- .../datadogagent/feature/npm/feature_test.go | 6 +- .../datadogagent/feature/oomkill/feature.go | 6 +- .../feature/oomkill/feature_test.go | 6 +- .../orchestratorexplorer/configmap_test.go | 2 +- .../feature/orchestratorexplorer/env.go | 4 +- .../feature/orchestratorexplorer/feature.go | 6 +- .../orchestratorexplorer/feature_test.go | 8 +- .../datadogagent/feature/otlp/feature.go | 6 +- .../datadogagent/feature/otlp/feature_test.go | 8 +- .../feature/processdiscovery/feature.go | 6 +- .../feature/processdiscovery/feature_test.go | 10 +- .../feature/prometheusscrape/feature.go | 6 +- .../feature/prometheusscrape/feature_test.go | 6 +- .../feature/remoteconfig/feature.go | 6 +- .../feature/remoteconfig/feature_test.go | 6 +- .../datadogagent/feature/sbom/feature.go | 6 +- .../datadogagent/feature/sbom/feature_test.go | 6 +- .../feature/servicediscovery/feature.go | 6 +- .../feature/servicediscovery/feature_test.go | 6 +- .../feature/tcpqueuelength/feature.go | 6 +- .../feature/tcpqueuelength/feature_test.go | 6 +- .../datadogagent/feature/test/factory_test.go | 6 +- .../datadogagent/feature/test/testsuite.go | 4 +- .../controller/datadogagent/feature/types.go | 6 +- .../datadogagent/feature/types_test.go | 2 +- .../datadogagent/feature/usm/feature.go | 6 +- .../datadogagent/feature/usm/feature_test.go | 6 +- .../datadogagent/feature/utils/utils.go | 4 +- internal/controller/datadogagent/finalizer.go | 2 +- .../controller/datadogagent/finalizer_test.go | 2 +- .../datadogagent/merger/cilium_test.go | 2 +- .../datadogagent/merger/configmap_test.go | 2 +- .../datadogagent/merger/envvarfrom.go | 2 +- .../datadogagent/merger/envvarfrom_test.go | 2 +- .../controller/datadogagent/merger/envvars.go | 2 +- .../datadogagent/merger/envvars_test.go | 2 +- .../datadogagent/merger/fake/const.go | 2 +- .../merger/fake/envfromvar_manager.go | 2 +- .../merger/fake/envvar_manager.go | 2 +- .../datadogagent/merger/fake/port_manager.go | 2 +- .../merger/fake/security_context_manager.go | 2 +- .../merger/fake/volume_mount_manager.go | 2 +- .../merger/network_policy_test.go | 2 +- .../controller/datadogagent/merger/port.go | 2 +- .../datadogagent/merger/rbac_test.go | 2 +- .../datadogagent/merger/secret_test.go | 2 +- .../datadogagent/merger/security_context.go | 2 +- .../merger/security_context_test.go | 2 +- .../datadogagent/merger/service_test.go | 4 +- .../controller/datadogagent/merger/utils.go | 2 +- .../datadogagent/merger/volume_mount.go | 2 +- .../datadogagent/merger/volume_mount_test.go | 2 +- .../controller/datadogagent/object/labels.go | 2 +- .../datadogagent/object/volume/volumes.go | 4 +- .../datadogagent/override/container.go | 4 +- .../datadogagent/override/container_test.go | 6 +- .../datadogagent/override/daemonset.go | 2 +- .../datadogagent/override/daemonset_test.go | 6 +- .../datadogagent/override/dependencies.go | 2 +- .../override/dependencies_test.go | 4 +- .../datadogagent/override/deploymentspec.go | 2 +- .../override/deploymentspec_test.go | 4 +- .../controller/datadogagent/override/fips.go | 6 +- .../datadogagent/override/fips_test.go | 8 +- .../datadogagent/override/global.go | 6 +- .../datadogagent/override/global_test.go | 8 +- .../datadogagent/override/podtemplatespec.go | 4 +- .../override/podtemplatespec_test.go | 6 +- .../datadogagent/store/store_test.go | 2 +- .../datadogagent/testutils/client_utils.go | 4 +- internal/controller/datadogagent/utils.go | 2 +- .../controller/datadogagent_controller.go | 4 +- .../datadogagent_controller_profiles_test.go | 8 +- .../datadogagent_controller_test.go | 2 +- .../datadogagentprofile_controller.go | 2 +- .../controller/datadogdashboard/controller.go | 2 +- .../datadogdashboard/controller_test.go | 2 +- .../controller/datadogdashboard/dashboard.go | 2 +- .../datadogdashboard/dashboard_test.go | 4 +- .../controller/datadogdashboard/finalizer.go | 2 +- .../datadogdashboard/finalizer_test.go | 2 +- .../controller/datadogdashboard_controller.go | 2 +- .../controller/datadogmonitor/controller.go | 4 +- .../datadogmonitor/controller_test.go | 2 +- internal/controller/datadogmonitor/event.go | 2 +- .../controller/datadogmonitor/finalizer.go | 2 +- .../datadogmonitor/finalizer_test.go | 2 +- internal/controller/datadogmonitor/monitor.go | 2 +- .../controller/datadogmonitor/monitor_test.go | 2 +- .../controller/datadogmonitor_controller.go | 2 +- internal/controller/datadogslo/controller.go | 4 +- .../controller/datadogslo/controller_test.go | 2 +- internal/controller/datadogslo/slo.go | 2 +- internal/controller/datadogslo/slo_test.go | 2 +- internal/controller/datadogslo_controller.go | 2 +- .../controller/finalizer/finalizer_test.go | 7 +- internal/controller/suite_v2_test.go | 4 +- internal/controller/testutils/agent.go | 6 +- pkg/agentprofile/agent_profile.go | 8 +- pkg/agentprofile/agent_profile_test.go | 8 +- pkg/agentprofile/status.go | 4 +- pkg/agentprofile/status_test.go | 4 +- pkg/config/config.go | 6 +- pkg/config/creds.go | 2 +- pkg/controller/utils/comparison/comparison.go | 2 +- .../utils/condition/datadogmonitor.go | 2 +- .../utils/condition/datadogmonitor_test.go | 2 +- .../utils/datadog/metrics_forwarder.go | 4 +- .../utils/datadog/metrics_forwarder_test.go | 8 +- pkg/datadogclient/client.go | 2 +- pkg/equality/equality.go | 2 +- pkg/kubernetes/provider.go | 4 +- pkg/plugin/common/client.go | 4 +- pkg/plugin/common/statuswrapper.go | 2 +- pkg/plugin/common/v2support.go | 4 +- pkg/remoteconfig/orchestrator_k8s_crd.go | 2 +- pkg/remoteconfig/updater.go | 4 +- 203 files changed, 650 insertions(+), 651 deletions(-) diff --git a/api/datadoghq/v1alpha1/datadogagentprofile_types.go b/api/datadoghq/v1alpha1/datadogagentprofile_types.go index 9cba1989c..2413d2e85 100644 --- a/api/datadoghq/v1alpha1/datadogagentprofile_types.go +++ b/api/datadoghq/v1alpha1/datadogagentprofile_types.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go b/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go index 1d82b7800..85cda252b 100644 --- a/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go +++ b/api/datadoghq/v1alpha1/datadogagentprofile_validation_test.go @@ -8,7 +8,7 @@ package v1alpha1 import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/api/datadoghq/v1alpha1/zz_generated.deepcopy.go b/api/datadoghq/v1alpha1/zz_generated.deepcopy.go index af91dea04..490cdf21b 100644 --- a/api/datadoghq/v1alpha1/zz_generated.deepcopy.go +++ b/api/datadoghq/v1alpha1/zz_generated.deepcopy.go @@ -11,7 +11,7 @@ package v1alpha1 import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" diff --git a/api/datadoghq/v1alpha1/zz_generated.openapi.go b/api/datadoghq/v1alpha1/zz_generated.openapi.go index b9f15494a..7f485515c 100644 --- a/api/datadoghq/v1alpha1/zz_generated.openapi.go +++ b/api/datadoghq/v1alpha1/zz_generated.openapi.go @@ -17,36 +17,36 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.CreateStrategy": schema_api_crds_datadoghq_v1alpha1_CreateStrategy(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariable": schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariable(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePreset": schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue": schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfile": schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfile(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileStatus": schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboard": schema_api_crds_datadoghq_v1alpha1_DatadogDashboard(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardSpec": schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardStatus": schema_api_crds_datadoghq_v1alpha1_DatadogDashboardStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetric": schema_api_crds_datadoghq_v1alpha1_DatadogMetric(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricCondition": schema_api_crds_datadoghq_v1alpha1_DatadogMetricCondition(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitor": schema_api_crds_datadoghq_v1alpha1_DatadogMonitor(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorCondition": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorCondition(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorControllerOptions": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptions": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptions(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorSpec": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorSpec(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorStatus": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorTriggeredState": schema_api_crds_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLO": schema_api_crds_datadoghq_v1alpha1_DatadogSLO(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOControllerOptions": schema_api_crds_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOQuery": schema_api_crds_datadoghq_v1alpha1_DatadogSLOQuery(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOSpec": schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOStatus": schema_api_crds_datadoghq_v1alpha1_DatadogSLOStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.CreateStrategy": schema_datadog_operator_api_datadoghq_v1alpha1_CreateStrategy(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariable": schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariable(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePreset": schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue": schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfile": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfile(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboard": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboard(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardSpec": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetric": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetric(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricCondition": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetricCondition(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitor": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitor(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorCondition": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorCondition(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorControllerOptions": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptions": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptions(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorSpec": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorSpec(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorTriggeredState": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLO": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLO(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOControllerOptions": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOQuery": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOQuery(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOSpec": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOStatus": schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOStatus(ref), } } -func schema_api_crds_datadoghq_v1alpha1_CreateStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_CreateStrategy(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -98,7 +98,7 @@ func schema_api_crds_datadoghq_v1alpha1_CreateStrategy(ref common.ReferenceCallb } } -func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariable(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariable(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -162,7 +162,7 @@ func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariable(ref common.Ref } } -func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -192,7 +192,7 @@ func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref comm Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"), }, }, }, @@ -203,11 +203,11 @@ func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePreset(ref comm }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePresetValue"}, } } -func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -248,7 +248,7 @@ func schema_api_crds_datadoghq_v1alpha1_DashboardTemplateVariablePresetValue(ref } } -func schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfile(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfile(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -278,24 +278,24 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfile(ref common.Reference "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogAgentProfileStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogAgentProfileStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -354,18 +354,18 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogAgentProfileStatus(ref common.Ref "createStrategy": { SchemaProps: spec.SchemaProps{ Description: "CreateStrategy is the state of the create strategy feature.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.CreateStrategy"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.CreateStrategy"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.CreateStrategy", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.CreateStrategy", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogDashboard(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboard(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -395,24 +395,24 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogDashboard(ref common.ReferenceCal "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogDashboardStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogDashboardStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -496,7 +496,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePreset"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePreset"), }, }, }, @@ -518,7 +518,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariable"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariable"), }, }, }, @@ -542,11 +542,11 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardSpec(ref common.Referenc }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariable", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DashboardTemplateVariablePreset"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariable", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DashboardTemplateVariablePreset"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogDashboardStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -623,7 +623,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogDashboardStatus(ref common.Refere } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMetric(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetric(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -653,24 +653,24 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMetric(ref common.ReferenceCallba "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMetricStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMetricStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMetricCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMetricCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -728,7 +728,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMetricCondition(ref common.Refere } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitor(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitor(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -758,24 +758,24 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitor(ref common.ReferenceCallb "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorCondition(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -833,7 +833,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorCondition(ref common.Refer } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -853,7 +853,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorControllerOptions(ref comm } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -880,7 +880,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorDowntimeStatus(ref common. } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1042,24 +1042,24 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptions(ref common.Referen "thresholds": { SchemaProps: spec.SchemaProps{ Description: "A struct of the different monitor threshold values.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"), }, }, "thresholdWindows": { SchemaProps: spec.SchemaProps{ Description: "A struct of the alerting time window options.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholdWindows", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptionsThresholds"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1086,7 +1086,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholdWindows(re } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1141,7 +1141,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorOptionsThresholds(ref comm } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1227,25 +1227,25 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorSpec(ref common.ReferenceC SchemaProps: spec.SchemaProps{ Description: "Options are the optional parameters associated with your monitor", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptions"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptions"), }, }, "controllerOptions": { SchemaProps: spec.SchemaProps{ Description: "ControllerOptions are the optional parameters in the DatadogMonitor controller", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorControllerOptions"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorControllerOptions"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorControllerOptions", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorOptions"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorControllerOptions", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorOptions"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1268,7 +1268,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorCondition"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorCondition"), }, }, }, @@ -1342,7 +1342,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.Referenc Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorTriggeredState"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorTriggeredState"), }, }, }, @@ -1352,7 +1352,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.Referenc SchemaProps: spec.SchemaProps{ Description: "DowntimeStatus defines whether the monitor is downtimed", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus"), }, }, "primary": { @@ -1373,11 +1373,11 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorStatus(ref common.Referenc }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorCondition", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogMonitorTriggeredState", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorCondition", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorDowntimeStatus", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogMonitorTriggeredState", "k8s.io/apimachinery/pkg/apis/meta/v1.Time"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1412,7 +1412,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogMonitorTriggeredState(ref common. } } -func schema_api_crds_datadoghq_v1alpha1_DatadogSLO(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLO(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1442,24 +1442,24 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogSLO(ref common.ReferenceCallback) "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1479,7 +1479,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogSLOControllerOptions(ref common.R } } -func schema_api_crds_datadoghq_v1alpha1_DatadogSLOQuery(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOQuery(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1508,7 +1508,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogSLOQuery(ref common.ReferenceCall } } -func schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1592,7 +1592,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallb "query": { SchemaProps: spec.SchemaProps{ Description: "Query is the query for a metric-based SLO. Required if type is metric. Note that only the `sum by` aggregator is allowed, which sums all request counts. `Average`, `max`, nor `min` request aggregators are not supported.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOQuery"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOQuery"), }, }, "type": { @@ -1626,7 +1626,7 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallb "controllerOptions": { SchemaProps: spec.SchemaProps{ Description: "ControllerOptions are the optional parameters in the DatadogSLO controller", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOControllerOptions"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOControllerOptions"), }, }, }, @@ -1634,11 +1634,11 @@ func schema_api_crds_datadoghq_v1alpha1_DatadogSLOSpec(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOControllerOptions", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1.DatadogSLOQuery", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOControllerOptions", "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1.DatadogSLOQuery", "k8s.io/apimachinery/pkg/api/resource.Quantity"}, } } -func schema_api_crds_datadoghq_v1alpha1_DatadogSLOStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v1alpha1_DatadogSLOStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/api/datadoghq/v2alpha1/condition.go b/api/datadoghq/v2alpha1/condition.go index cc9289ab0..e86322476 100644 --- a/api/datadoghq/v2alpha1/condition.go +++ b/api/datadoghq/v2alpha1/condition.go @@ -3,7 +3,7 @@ package v2alpha1 import ( "fmt" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/api/datadoghq/v2alpha1/condition_test.go b/api/datadoghq/v2alpha1/condition_test.go index 1f58c32be..ac63f0cd1 100644 --- a/api/datadoghq/v2alpha1/condition_test.go +++ b/api/datadoghq/v2alpha1/condition_test.go @@ -3,7 +3,7 @@ package v2alpha1 import ( "testing" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/google/go-cmp/cmp" assert "github.com/stretchr/testify/require" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/datadoghq/v2alpha1/datadogagent_default.go b/api/datadoghq/v2alpha1/datadogagent_default.go index 341b018f5..ccaf1602d 100644 --- a/api/datadoghq/v2alpha1/datadogagent_default.go +++ b/api/datadoghq/v2alpha1/datadogagent_default.go @@ -6,8 +6,8 @@ package v2alpha1 import ( - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" ) diff --git a/api/datadoghq/v2alpha1/datadogagent_default_test.go b/api/datadoghq/v2alpha1/datadogagent_default_test.go index 2359ff000..ee4b32bbe 100644 --- a/api/datadoghq/v2alpha1/datadogagent_default_test.go +++ b/api/datadoghq/v2alpha1/datadogagent_default_test.go @@ -8,8 +8,8 @@ package v2alpha1 import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/google/go-cmp/cmp" assert "github.com/stretchr/testify/require" diff --git a/api/datadoghq/v2alpha1/test/new.go b/api/datadoghq/v2alpha1/test/new.go index 91cb2230a..97b00084b 100644 --- a/api/datadoghq/v2alpha1/test/new.go +++ b/api/datadoghq/v2alpha1/test/new.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) var apiVersion = fmt.Sprintf("%s/%s", v2alpha1.GroupVersion.Group, v2alpha1.GroupVersion.Version) diff --git a/api/datadoghq/v2alpha1/utils.go b/api/datadoghq/v2alpha1/utils.go index 71b3e8cb8..ba3b10685 100644 --- a/api/datadoghq/v2alpha1/utils.go +++ b/api/datadoghq/v2alpha1/utils.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/datadog-operator/pkg/defaulting" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" diff --git a/api/datadoghq/v2alpha1/utils_test.go b/api/datadoghq/v2alpha1/utils_test.go index 6174c2148..bcef5620b 100644 --- a/api/datadoghq/v2alpha1/utils_test.go +++ b/api/datadoghq/v2alpha1/utils_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/pkg/defaulting" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/api/datadoghq/v2alpha1/zz_generated.openapi.go b/api/datadoghq/v2alpha1/zz_generated.openapi.go index c4d86e28b..813a4d3b1 100644 --- a/api/datadoghq/v2alpha1/zz_generated.openapi.go +++ b/api/datadoghq/v2alpha1/zz_generated.openapi.go @@ -17,39 +17,39 @@ import ( func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition { return map[string]common.OpenAPIDefinition{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CSPMHostBenchmarksConfig": schema_api_crds_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig": schema_api_crds_datadoghq_v2alpha1_CustomConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus": schema_api_crds_datadoghq_v2alpha1_DaemonSetStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgent": schema_api_crds_datadoghq_v2alpha1_DatadogAgent(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentGenericContainer": schema_api_crds_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentStatus": schema_api_crds_datadoghq_v2alpha1_DatadogAgentStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogCredentials": schema_api_crds_datadoghq_v2alpha1_DatadogCredentials(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogFeatures": schema_api_crds_datadoghq_v2alpha1_DatadogFeatures(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus": schema_api_crds_datadoghq_v2alpha1_DeploymentStatus(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DogstatsdFeatureConfig": schema_api_crds_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventCollectionFeatureConfig": schema_api_crds_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.FIPSConfig": schema_api_crds_datadoghq_v2alpha1_FIPSConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HelmCheckFeatureConfig": schema_api_crds_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig": schema_api_crds_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LocalService": schema_api_crds_datadoghq_v2alpha1_LocalService(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.MultiCustomConfig": schema_api_crds_datadoghq_v2alpha1_MultiCustomConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.NetworkPolicyConfig": schema_api_crds_datadoghq_v2alpha1_NetworkPolicyConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPFeatureConfig": schema_api_crds_datadoghq_v2alpha1_OTLPFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPGRPCConfig": schema_api_crds_datadoghq_v2alpha1_OTLPGRPCConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPHTTPConfig": schema_api_crds_datadoghq_v2alpha1_OTLPHTTPConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPProtocolsConfig": schema_api_crds_datadoghq_v2alpha1_OTLPProtocolsConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPReceiverConfig": schema_api_crds_datadoghq_v2alpha1_OTLPReceiverConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig": schema_api_crds_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig": schema_api_crds_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigConfiguration": schema_api_crds_datadoghq_v2alpha1_RemoteConfigConfiguration(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SeccompConfig": schema_api_crds_datadoghq_v2alpha1_SeccompConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendConfig": schema_api_crds_datadoghq_v2alpha1_SecretBackendConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendRolesConfig": schema_api_crds_datadoghq_v2alpha1_SecretBackendRolesConfig(ref), - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.UnixDomainSocketConfig": schema_api_crds_datadoghq_v2alpha1_UnixDomainSocketConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CSPMHostBenchmarksConfig": schema_datadog_operator_api_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig": schema_datadog_operator_api_datadoghq_v2alpha1_CustomConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus": schema_datadog_operator_api_datadoghq_v2alpha1_DaemonSetStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgent": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgent(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentGenericContainer": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentStatus": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogCredentials": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogCredentials(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogFeatures": schema_datadog_operator_api_datadoghq_v2alpha1_DatadogFeatures(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus": schema_datadog_operator_api_datadoghq_v2alpha1_DeploymentStatus(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DogstatsdFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventCollectionFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.FIPSConfig": schema_datadog_operator_api_datadoghq_v2alpha1_FIPSConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HelmCheckFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LocalService": schema_datadog_operator_api_datadoghq_v2alpha1_LocalService(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.MultiCustomConfig": schema_datadog_operator_api_datadoghq_v2alpha1_MultiCustomConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.NetworkPolicyConfig": schema_datadog_operator_api_datadoghq_v2alpha1_NetworkPolicyConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPGRPCConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPGRPCConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPHTTPConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPHTTPConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPProtocolsConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPProtocolsConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPReceiverConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OTLPReceiverConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig": schema_datadog_operator_api_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigConfiguration": schema_datadog_operator_api_datadoghq_v2alpha1_RemoteConfigConfiguration(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SeccompConfig": schema_datadog_operator_api_datadoghq_v2alpha1_SeccompConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendConfig": schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendRolesConfig": schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendRolesConfig(ref), + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.UnixDomainSocketConfig": schema_datadog_operator_api_datadoghq_v2alpha1_UnixDomainSocketConfig(ref), } } -func schema_api_crds_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -69,7 +69,7 @@ func schema_api_crds_datadoghq_v2alpha1_CSPMHostBenchmarksConfig(ref common.Refe } } -func schema_api_crds_datadoghq_v2alpha1_CustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_CustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -86,18 +86,18 @@ func schema_api_crds_datadoghq_v2alpha1_CustomConfig(ref common.ReferenceCallbac "configMap": { SchemaProps: spec.SchemaProps{ Description: "ConfigMap references an existing ConfigMap with the configuration file content.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_DaemonSetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DaemonSetStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -187,7 +187,7 @@ func schema_api_crds_datadoghq_v2alpha1_DaemonSetStatus(ref common.ReferenceCall } } -func schema_api_crds_datadoghq_v2alpha1_DatadogAgent(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgent(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -217,24 +217,24 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogAgent(ref common.ReferenceCallbac "spec": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentSpec"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentSpec"), }, }, "status": { SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentStatus"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentSpec", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogAgentStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentSpec", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogAgentStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, } } -func schema_api_crds_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -380,7 +380,7 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref common. "seccompConfig": { SchemaProps: spec.SchemaProps{ Description: "Seccomp configurations to override Operator actions. For all other Seccomp Profile manipulation, use SecurityContext.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SeccompConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SeccompConfig"), }, }, "appArmorProfileName": { @@ -394,11 +394,11 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogAgentGenericContainer(ref common. }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SeccompConfig", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext", "k8s.io/api/core/v1.VolumeMount"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SeccompConfig", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.SecurityContext", "k8s.io/api/core/v1.VolumeMount"}, } } -func schema_api_crds_datadoghq_v2alpha1_DatadogAgentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogAgentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -439,7 +439,7 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogAgentStatus(ref common.ReferenceC Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus"), }, }, }, @@ -448,36 +448,36 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogAgentStatus(ref common.ReferenceC "agent": { SchemaProps: spec.SchemaProps{ Description: "The combined actual state of all Agents as daemonsets or extended daemonsets.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus"), }, }, "clusterAgent": { SchemaProps: spec.SchemaProps{ Description: "The actual state of the Cluster Agent as a deployment.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus"), }, }, "clusterChecksRunner": { SchemaProps: spec.SchemaProps{ Description: "The actual state of the Cluster Checks Runner as a deployment.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus"), }, }, "remoteConfigConfiguration": { SchemaProps: spec.SchemaProps{ Description: "RemoteConfigConfiguration stores the configuration received from RemoteConfig.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigConfiguration"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigConfiguration"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DaemonSetStatus", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DeploymentStatus", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigConfiguration", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DaemonSetStatus", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DeploymentStatus", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigConfiguration", "k8s.io/apimachinery/pkg/apis/meta/v1.Condition"}, } } -func schema_api_crds_datadoghq_v2alpha1_DatadogCredentials(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogCredentials(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -494,7 +494,7 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogCredentials(ref common.ReferenceC "apiSecret": { SchemaProps: spec.SchemaProps{ Description: "APISecret references an existing Secret which stores the API key instead of creating a new one. If set, this parameter takes precedence over \"APIKey\".", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretConfig"), }, }, "appKey": { @@ -507,18 +507,18 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogCredentials(ref common.ReferenceC "appSecret": { SchemaProps: spec.SchemaProps{ Description: "AppSecret references an existing Secret which stores the application key instead of creating a new one. If set, this parameter takes precedence over \"AppKey\".", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_DatadogFeatures(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DatadogFeatures(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -528,174 +528,174 @@ func schema_api_crds_datadoghq_v2alpha1_DatadogFeatures(ref common.ReferenceCall "logCollection": { SchemaProps: spec.SchemaProps{ Description: "LogCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LogCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LogCollectionFeatureConfig"), }, }, "liveProcessCollection": { SchemaProps: spec.SchemaProps{ Description: "LiveProcessCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig"), }, }, "liveContainerCollection": { SchemaProps: spec.SchemaProps{ Description: "LiveContainerCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig"), }, }, "processDiscovery": { SchemaProps: spec.SchemaProps{ Description: "ProcessDiscovery configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig"), }, }, "oomKill": { SchemaProps: spec.SchemaProps{ Description: "OOMKill configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OOMKillFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OOMKillFeatureConfig"), }, }, "tcpQueueLength": { SchemaProps: spec.SchemaProps{ Description: "TCPQueueLength configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig"), }, }, "ebpfCheck": { SchemaProps: spec.SchemaProps{ Description: "EBPFCheck configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EBPFCheckFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EBPFCheckFeatureConfig"), }, }, "apm": { SchemaProps: spec.SchemaProps{ Description: "APM (Application Performance Monitoring) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.APMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.APMFeatureConfig"), }, }, "asm": { SchemaProps: spec.SchemaProps{ Description: "ASM (Application Security Management) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ASMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ASMFeatureConfig"), }, }, "cspm": { SchemaProps: spec.SchemaProps{ Description: "CSPM (Cloud Security Posture Management) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CSPMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CSPMFeatureConfig"), }, }, "cws": { SchemaProps: spec.SchemaProps{ Description: "CWS (Cloud Workload Security) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CWSFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CWSFeatureConfig"), }, }, "npm": { SchemaProps: spec.SchemaProps{ Description: "NPM (Network Performance Monitoring) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.NPMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.NPMFeatureConfig"), }, }, "usm": { SchemaProps: spec.SchemaProps{ Description: "USM (Universal Service Monitoring) configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.USMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.USMFeatureConfig"), }, }, "dogstatsd": { SchemaProps: spec.SchemaProps{ Description: "Dogstatsd configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DogstatsdFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DogstatsdFeatureConfig"), }, }, "otlp": { SchemaProps: spec.SchemaProps{ Description: "OTLP ingest configuration", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPFeatureConfig"), }, }, "remoteConfiguration": { SchemaProps: spec.SchemaProps{ Description: "Remote Configuration configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig"), }, }, "sbom": { SchemaProps: spec.SchemaProps{ Description: "SBOM collection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SBOMFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SBOMFeatureConfig"), }, }, "serviceDiscovery": { SchemaProps: spec.SchemaProps{ Description: "ServiceDiscovery", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig"), }, }, "eventCollection": { SchemaProps: spec.SchemaProps{ Description: "EventCollection configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventCollectionFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventCollectionFeatureConfig"), }, }, "orchestratorExplorer": { SchemaProps: spec.SchemaProps{ Description: "OrchestratorExplorer check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig"), }, }, "kubeStateMetricsCore": { SchemaProps: spec.SchemaProps{ Description: "KubeStateMetricsCore check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig"), }, }, "admissionController": { SchemaProps: spec.SchemaProps{ Description: "AdmissionController configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AdmissionControllerFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AdmissionControllerFeatureConfig"), }, }, "externalMetricsServer": { SchemaProps: spec.SchemaProps{ Description: "ExternalMetricsServer configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig"), }, }, "autoscaling": { SchemaProps: spec.SchemaProps{ Description: "Autoscaling configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AutoscalingFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AutoscalingFeatureConfig"), }, }, "clusterChecks": { SchemaProps: spec.SchemaProps{ Description: "ClusterChecks configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ClusterChecksFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ClusterChecksFeatureConfig"), }, }, "prometheusScrape": { SchemaProps: spec.SchemaProps{ Description: "PrometheusScrape configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig"), }, }, "helmCheck": { SchemaProps: spec.SchemaProps{ Description: "HelmCheck configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HelmCheckFeatureConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HelmCheckFeatureConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.APMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ASMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AdmissionControllerFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AutoscalingFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CSPMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CWSFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ClusterChecksFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DogstatsdFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EBPFCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HelmCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.LogCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.NPMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OOMKillFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SBOMFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.USMFeatureConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.APMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ASMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AdmissionControllerFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AutoscalingFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CSPMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CWSFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ClusterChecksFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DogstatsdFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EBPFCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ExternalMetricsServerFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HelmCheckFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.KubeStateMetricsCoreFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveContainerCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LiveProcessCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.LogCollectionFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.NPMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OOMKillFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OrchestratorExplorerFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ProcessDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.PrometheusScrapeFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.RemoteConfigurationFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SBOMFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ServiceDiscoveryFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.TCPQueueLengthFeatureConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.USMFeatureConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_DeploymentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DeploymentStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -786,7 +786,7 @@ func schema_api_crds_datadoghq_v2alpha1_DeploymentStatus(ref common.ReferenceCal } } -func schema_api_crds_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -810,30 +810,30 @@ func schema_api_crds_datadoghq_v2alpha1_DogstatsdFeatureConfig(ref common.Refere "hostPortConfig": { SchemaProps: spec.SchemaProps{ Description: "HostPortConfig contains host port configuration. Enabled Default: false Port Default: 8125", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"), }, }, "unixDomainSocketConfig": { SchemaProps: spec.SchemaProps{ Description: "UnixDomainSocketConfig contains socket configuration. See also: https://docs.datadoghq.com/agent/kubernetes/apm/?tab=helm#agent-environment-variables Enabled Default: true Path Default: `/var/run/datadog/dsd.socket`", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.UnixDomainSocketConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.UnixDomainSocketConfig"), }, }, "mapperProfiles": { SchemaProps: spec.SchemaProps{ Description: "Configure the Dogstasd Mapper Profiles. Can be passed as raw data or via a json encoded string in a config map. See also: https://docs.datadoghq.com/developers/dogstatsd/dogstatsd_mapper/", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.UnixDomainSocketConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.UnixDomainSocketConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -867,7 +867,7 @@ func schema_api_crds_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref common. Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventTypes"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventTypes"), }, }, }, @@ -877,11 +877,11 @@ func schema_api_crds_datadoghq_v2alpha1_EventCollectionFeatureConfig(ref common. }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.EventTypes"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.EventTypes"}, } } -func schema_api_crds_datadoghq_v2alpha1_FIPSConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_FIPSConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -898,7 +898,7 @@ func schema_api_crds_datadoghq_v2alpha1_FIPSConfig(ref common.ReferenceCallback) "image": { SchemaProps: spec.SchemaProps{ Description: "The container image of the FIPS sidecar.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AgentImageConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AgentImageConfig"), }, }, "localAddress": { @@ -938,18 +938,18 @@ func schema_api_crds_datadoghq_v2alpha1_FIPSConfig(ref common.ReferenceCallback) "customFIPSConfig": { SchemaProps: spec.SchemaProps{ Description: "CustomFIPSConfig configures a custom configMap to provide the FIPS configuration. Specify custom contents for the FIPS proxy sidecar container config (/etc/datadog-fips-proxy/datadog-fips-proxy.cfg). If empty, the default FIPS proxy sidecar container config is used.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.AgentImageConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig", "k8s.io/api/core/v1.ResourceRequirements"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.AgentImageConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig", "k8s.io/api/core/v1.ResourceRequirements"}, } } -func schema_api_crds_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -992,7 +992,7 @@ func schema_api_crds_datadoghq_v2alpha1_HelmCheckFeatureConfig(ref common.Refere } } -func schema_api_crds_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1009,18 +1009,18 @@ func schema_api_crds_datadoghq_v2alpha1_KubeStateMetricsCoreFeatureConfig(ref co "conf": { SchemaProps: spec.SchemaProps{ Description: "Conf overrides the configuration for the default Kubernetes State Metrics Core check. This must point to a ConfigMap containing a valid cluster check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_LocalService(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_LocalService(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1047,7 +1047,7 @@ func schema_api_crds_datadoghq_v2alpha1_LocalService(ref common.ReferenceCallbac } } -func schema_api_crds_datadoghq_v2alpha1_MultiCustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_MultiCustomConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1073,18 +1073,18 @@ func schema_api_crds_datadoghq_v2alpha1_MultiCustomConfig(ref common.ReferenceCa "configMap": { SchemaProps: spec.SchemaProps{ Description: "ConfigMap references an existing ConfigMap with the content of the configuration files.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.ConfigMapConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.ConfigMapConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_NetworkPolicyConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_NetworkPolicyConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1132,7 +1132,7 @@ func schema_api_crds_datadoghq_v2alpha1_NetworkPolicyConfig(ref common.Reference } } -func schema_api_crds_datadoghq_v2alpha1_OTLPFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1143,18 +1143,18 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPFeatureConfig(ref common.ReferenceCa SchemaProps: spec.SchemaProps{ Description: "Receiver contains configuration for the OTLP ingest receiver.", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPReceiverConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPReceiverConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPReceiverConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPReceiverConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1171,7 +1171,7 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.ReferenceCallb "hostPortConfig": { SchemaProps: spec.SchemaProps{ Description: "Enable hostPort for OTLP/gRPC Default: true", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"), }, }, "endpoint": { @@ -1185,11 +1185,11 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPGRPCConfig(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1206,7 +1206,7 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.ReferenceCallb "hostPortConfig": { SchemaProps: spec.SchemaProps{ Description: "Enable hostPorts for OTLP/HTTP Default: true", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"), }, }, "endpoint": { @@ -1220,11 +1220,11 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPHTTPConfig(ref common.ReferenceCallb }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.HostPortConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.HostPortConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_OTLPProtocolsConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPProtocolsConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1234,24 +1234,24 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPProtocolsConfig(ref common.Reference "grpc": { SchemaProps: spec.SchemaProps{ Description: "GRPC contains configuration for the OTLP ingest OTLP/gRPC receiver.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPGRPCConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPGRPCConfig"), }, }, "http": { SchemaProps: spec.SchemaProps{ Description: "HTTP contains configuration for the OTLP ingest OTLP/HTTP receiver.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPHTTPConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPHTTPConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPGRPCConfig", "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPHTTPConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPGRPCConfig", "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPHTTPConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_OTLPReceiverConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_OTLPReceiverConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1262,18 +1262,18 @@ func schema_api_crds_datadoghq_v2alpha1_OTLPReceiverConfig(ref common.ReferenceC SchemaProps: spec.SchemaProps{ Description: "Protocols contains configuration for the OTLP ingest receiver protocols.", Default: map[string]interface{}{}, - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPProtocolsConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPProtocolsConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.OTLPProtocolsConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.OTLPProtocolsConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1290,7 +1290,7 @@ func schema_api_crds_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref co "conf": { SchemaProps: spec.SchemaProps{ Description: "Conf overrides the configuration for the default Orchestrator Explorer check. This must point to a ConfigMap containing a valid cluster check configuration.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), }, }, "scrubContainers": { @@ -1351,11 +1351,11 @@ func schema_api_crds_datadoghq_v2alpha1_OrchestratorExplorerFeatureConfig(ref co }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1396,7 +1396,7 @@ func schema_api_crds_datadoghq_v2alpha1_PrometheusScrapeFeatureConfig(ref common } } -func schema_api_crds_datadoghq_v2alpha1_RemoteConfigConfiguration(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_RemoteConfigConfiguration(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1405,18 +1405,18 @@ func schema_api_crds_datadoghq_v2alpha1_RemoteConfigConfiguration(ref common.Ref Properties: map[string]spec.Schema{ "features": { SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogFeatures"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogFeatures"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.DatadogFeatures"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.DatadogFeatures"}, } } -func schema_api_crds_datadoghq_v2alpha1_SeccompConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_SeccompConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1433,18 +1433,18 @@ func schema_api_crds_datadoghq_v2alpha1_SeccompConfig(ref common.ReferenceCallba "customProfile": { SchemaProps: spec.SchemaProps{ Description: "CustomProfile specifies a ConfigMap containing a custom Seccomp Profile. ConfigMap data must either have the key `system-probe-seccomp.json` or CustomProfile.Items must include a corev1.KeytoPath that maps the key to the path `system-probe-seccomp.json`.", - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"), }, }, }, }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.CustomConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.CustomConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_SecretBackendConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1491,7 +1491,7 @@ func schema_api_crds_datadoghq_v2alpha1_SecretBackendConfig(ref common.Reference Items: &spec.SchemaOrArray{ Schema: &spec.Schema{ SchemaProps: spec.SchemaProps{ - Ref: ref("github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendRolesConfig"), + Ref: ref("github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendRolesConfig"), }, }, }, @@ -1501,11 +1501,11 @@ func schema_api_crds_datadoghq_v2alpha1_SecretBackendConfig(ref common.Reference }, }, Dependencies: []string{ - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1.SecretBackendRolesConfig"}, + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1.SecretBackendRolesConfig"}, } } -func schema_api_crds_datadoghq_v2alpha1_SecretBackendRolesConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_SecretBackendRolesConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ @@ -1546,7 +1546,7 @@ func schema_api_crds_datadoghq_v2alpha1_SecretBackendRolesConfig(ref common.Refe } } -func schema_api_crds_datadoghq_v2alpha1_UnixDomainSocketConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { +func schema_datadog_operator_api_datadoghq_v2alpha1_UnixDomainSocketConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ diff --git a/api/go.mod b/api/go.mod index d113c3a9c..6210bb069 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,4 +1,4 @@ -module github.com/DataDog/datadog-operator/api/crds +module github.com/DataDog/datadog-operator/api go 1.23.2 diff --git a/cmd/check-operator/upgrade/upgrade.go b/cmd/check-operator/upgrade/upgrade.go index 1de08949c..829e7036e 100644 --- a/cmd/check-operator/upgrade/upgrade.go +++ b/cmd/check-operator/upgrade/upgrade.go @@ -18,7 +18,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cmd/kubectl-datadog/agent/upgrade/upgrade.go b/cmd/kubectl-datadog/agent/upgrade/upgrade.go index 501761d8a..8a60269a0 100644 --- a/cmd/kubectl-datadog/agent/upgrade/upgrade.go +++ b/cmd/kubectl-datadog/agent/upgrade/upgrade.go @@ -10,8 +10,8 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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" diff --git a/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go b/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go index 9aeed6990..be54247e4 100644 --- a/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go +++ b/cmd/kubectl-datadog/agent/upgrade/upgrade_test.go @@ -10,8 +10,8 @@ import ( "fmt" "testing" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/pkg/plugin/common" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go index 8775080ac..3bb3f9145 100644 --- a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go +++ b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade.go @@ -10,8 +10,8 @@ import ( "errors" "fmt" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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" diff --git a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go index 7a1de4b07..8639c111f 100644 --- a/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go +++ b/cmd/kubectl-datadog/clusteragent/upgrade/upgrade_test.go @@ -12,9 +12,9 @@ package upgrade // "fmt" // "testing" -// commonv1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/common/v1" -// datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" -// apiutils "github.com/DataDog/datadog-operator/api/crds/utils" +// commonv1 "github.com/DataDog/datadog-operator/api/datadoghq/common/v1" +// datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" +// apiutils "github.com/DataDog/datadog-operator/api/utils" // "github.com/DataDog/datadog-operator/pkg/defaulting" // metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cmd/kubectl-datadog/flare/flare.go b/cmd/kubectl-datadog/flare/flare.go index 1caa589df..2ef29e47e 100644 --- a/cmd/kubectl-datadog/flare/flare.go +++ b/cmd/kubectl-datadog/flare/flare.go @@ -23,7 +23,7 @@ import ( "strings" "time" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" "github.com/DataDog/datadog-operator/pkg/version" diff --git a/cmd/kubectl-datadog/get/get.go b/cmd/kubectl-datadog/get/get.go index 57cb03691..9108646eb 100644 --- a/cmd/kubectl-datadog/get/get.go +++ b/cmd/kubectl-datadog/get/get.go @@ -11,7 +11,7 @@ import ( "fmt" "io" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" "github.com/olekukonko/tablewriter" diff --git a/cmd/kubectl-datadog/metrics/get/get.go b/cmd/kubectl-datadog/metrics/get/get.go index 8cb48d78d..798a991de 100644 --- a/cmd/kubectl-datadog/metrics/get/get.go +++ b/cmd/kubectl-datadog/metrics/get/get.go @@ -7,7 +7,7 @@ import ( "io" "time" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/plugin/common" "k8s.io/apimachinery/pkg/util/duration" diff --git a/cmd/main.go b/cmd/main.go index fe60a3444..5fe587c12 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -34,8 +34,8 @@ import ( "github.com/go-logr/logr" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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" diff --git a/internal/controller/datadogagent/common/utils.go b/internal/controller/datadogagent/common/utils.go index 058534288..91f2b8877 100644 --- a/internal/controller/datadogagent/common/utils.go +++ b/internal/controller/datadogagent/common/utils.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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/kubernetes" "github.com/DataDog/datadog-operator/pkg/utils" diff --git a/internal/controller/datadogagent/common/volumes.go b/internal/controller/datadogagent/common/volumes.go index d8439f2a2..ea306af12 100644 --- a/internal/controller/datadogagent/common/volumes.go +++ b/internal/controller/datadogagent/common/volumes.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // This file contains definitions of volumes used in the agent specs diff --git a/internal/controller/datadogagent/component/agent/default.go b/internal/controller/datadogagent/component/agent/default.go index 78940c65b..e16a9bb01 100644 --- a/internal/controller/datadogagent/component/agent/default.go +++ b/internal/controller/datadogagent/component/agent/default.go @@ -11,9 +11,9 @@ import ( edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/component/agent/new.go b/internal/controller/datadogagent/component/agent/new.go index 793484195..11dd031fe 100644 --- a/internal/controller/datadogagent/component/agent/new.go +++ b/internal/controller/datadogagent/component/agent/new.go @@ -8,7 +8,7 @@ package agent import ( "time" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" diff --git a/internal/controller/datadogagent/component/clusteragent/default.go b/internal/controller/datadogagent/component/clusteragent/default.go index 4fe2ac837..73503a86e 100644 --- a/internal/controller/datadogagent/component/clusteragent/default.go +++ b/internal/controller/datadogagent/component/clusteragent/default.go @@ -14,9 +14,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/pkg/controller/utils" diff --git a/internal/controller/datadogagent/component/clusteragent/default_test.go b/internal/controller/datadogagent/component/clusteragent/default_test.go index 76283a93f..567fb7d09 100644 --- a/internal/controller/datadogagent/component/clusteragent/default_test.go +++ b/internal/controller/datadogagent/component/clusteragent/default_test.go @@ -5,9 +5,9 @@ import ( "strconv" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + datadoghqv2alpha1 "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/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/testutils" diff --git a/internal/controller/datadogagent/component/clusteragent/utils.go b/internal/controller/datadogagent/component/clusteragent/utils.go index ed455c545..b608c621c 100644 --- a/internal/controller/datadogagent/component/clusteragent/utils.go +++ b/internal/controller/datadogagent/component/clusteragent/utils.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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/controller/utils/comparison" diff --git a/internal/controller/datadogagent/component/clusterchecksrunner/default.go b/internal/controller/datadogagent/component/clusterchecksrunner/default.go index 8656503bd..f554834db 100644 --- a/internal/controller/datadogagent/component/clusterchecksrunner/default.go +++ b/internal/controller/datadogagent/component/clusterchecksrunner/default.go @@ -15,9 +15,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/pkg/defaulting" diff --git a/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go b/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go index dcc1f9b22..eb1177de9 100644 --- a/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go +++ b/internal/controller/datadogagent/component/clusterchecksrunner/default_test.go @@ -8,7 +8,7 @@ package clusterchecksrunner import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" diff --git a/internal/controller/datadogagent/component/objects/network.go b/internal/controller/datadogagent/component/objects/network.go index 86d8286e6..3d1588bed 100644 --- a/internal/controller/datadogagent/component/objects/network.go +++ b/internal/controller/datadogagent/component/objects/network.go @@ -14,7 +14,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" componentccr "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusterchecksrunner" diff --git a/internal/controller/datadogagent/controller_reconcile_agent.go b/internal/controller/datadogagent/controller_reconcile_agent.go index d8db1ac3d..26b856673 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent.go +++ b/internal/controller/datadogagent/controller_reconcile_agent.go @@ -9,10 +9,10 @@ import ( "context" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" + apiutils "github.com/DataDog/datadog-operator/api/utils" componentagent "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/override" diff --git a/internal/controller/datadogagent/controller_reconcile_agent_test.go b/internal/controller/datadogagent/controller_reconcile_agent_test.go index ee11d4d45..9a28fdbcb 100644 --- a/internal/controller/datadogagent/controller_reconcile_agent_test.go +++ b/internal/controller/datadogagent/controller_reconcile_agent_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/pkg/agentprofile" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/controller_reconcile_ccr.go b/internal/controller/datadogagent/controller_reconcile_ccr.go index 80ba9410e..dff82d3e7 100644 --- a/internal/controller/datadogagent/controller_reconcile_ccr.go +++ b/internal/controller/datadogagent/controller_reconcile_ccr.go @@ -9,9 +9,9 @@ import ( "context" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" componentccr "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusterchecksrunner" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" diff --git a/internal/controller/datadogagent/controller_reconcile_ccr_test.go b/internal/controller/datadogagent/controller_reconcile_ccr_test.go index 074169f4c..7151931c3 100644 --- a/internal/controller/datadogagent/controller_reconcile_ccr_test.go +++ b/internal/controller/datadogagent/controller_reconcile_ccr_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/stretchr/testify/assert" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/controller/datadogagent/controller_reconcile_dca.go b/internal/controller/datadogagent/controller_reconcile_dca.go index acd2d92d0..48528c8c9 100644 --- a/internal/controller/datadogagent/controller_reconcile_dca.go +++ b/internal/controller/datadogagent/controller_reconcile_dca.go @@ -9,9 +9,9 @@ import ( "context" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" diff --git a/internal/controller/datadogagent/controller_reconcile_dca_test.go b/internal/controller/datadogagent/controller_reconcile_dca_test.go index e747b65db..0c43a730b 100644 --- a/internal/controller/datadogagent/controller_reconcile_dca_test.go +++ b/internal/controller/datadogagent/controller_reconcile_dca_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/controller_reconcile_v2.go b/internal/controller/datadogagent/controller_reconcile_v2.go index 00410ae66..ee893fb15 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2.go +++ b/internal/controller/datadogagent/controller_reconcile_v2.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/controller_reconcile_v2_common.go b/internal/controller/datadogagent/controller_reconcile_v2_common.go index fe41efee3..631251665 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_common.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_common.go @@ -10,8 +10,8 @@ import ( "fmt" "time" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" diff --git a/internal/controller/datadogagent/controller_reconcile_v2_common_test.go b/internal/controller/datadogagent/controller_reconcile_v2_common_test.go index c9f0e9252..8c449ee5e 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_common_test.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_common_test.go @@ -3,8 +3,8 @@ package datadogagent import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" assert "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/controller_reconcile_v2_test.go b/internal/controller/datadogagent/controller_reconcile_v2_test.go index 038aadfb6..32b5e706a 100644 --- a/internal/controller/datadogagent/controller_reconcile_v2_test.go +++ b/internal/controller/datadogagent/controller_reconcile_v2_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/controller/datadogagent/controller_v2_test.go b/internal/controller/datadogagent/controller_v2_test.go index ea6d488f0..f7b5b533a 100644 --- a/internal/controller/datadogagent/controller_v2_test.go +++ b/internal/controller/datadogagent/controller_v2_test.go @@ -13,10 +13,10 @@ import ( "testing" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/utils" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" testutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/feature/admissioncontroller/feature.go b/internal/controller/datadogagent/feature/admissioncontroller/feature.go index 902d70263..3bf2ce501 100644 --- a/internal/controller/datadogagent/feature/admissioncontroller/feature.go +++ b/internal/controller/datadogagent/feature/admissioncontroller/feature.go @@ -9,9 +9,9 @@ import ( "encoding/json" "strconv" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/internal/controller/datadogagent/component/objects" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go b/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go index 9da69d27c..2642822e3 100644 --- a/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go +++ b/internal/controller/datadogagent/feature/admissioncontroller/feature_test.go @@ -7,10 +7,10 @@ package admissioncontroller import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/apm/feature.go b/internal/controller/datadogagent/feature/apm/feature.go index 77d13455f..0c5e57d84 100644 --- a/internal/controller/datadogagent/feature/apm/feature.go +++ b/internal/controller/datadogagent/feature/apm/feature.go @@ -16,9 +16,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/objects" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/feature/apm/feature_test.go b/internal/controller/datadogagent/feature/apm/feature_test.go index 0c56f1ac6..ea0d3673c 100644 --- a/internal/controller/datadogagent/feature/apm/feature_test.go +++ b/internal/controller/datadogagent/feature/apm/feature_test.go @@ -9,11 +9,11 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/crds/utils" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/asm/feature.go b/internal/controller/datadogagent/feature/asm/feature.go index 6e9b5f3d9..2f73a5910 100644 --- a/internal/controller/datadogagent/feature/asm/feature.go +++ b/internal/controller/datadogagent/feature/asm/feature.go @@ -6,9 +6,9 @@ package asm import ( - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" diff --git a/internal/controller/datadogagent/feature/asm/feature_test.go b/internal/controller/datadogagent/feature/asm/feature_test.go index d94b0f879..a9da36f43 100644 --- a/internal/controller/datadogagent/feature/asm/feature_test.go +++ b/internal/controller/datadogagent/feature/asm/feature_test.go @@ -8,8 +8,8 @@ package asm import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/autoscaling/feature.go b/internal/controller/datadogagent/feature/autoscaling/feature.go index d4d87a049..0c9a0d40e 100644 --- a/internal/controller/datadogagent/feature/autoscaling/feature.go +++ b/internal/controller/datadogagent/feature/autoscaling/feature.go @@ -8,9 +8,9 @@ package autoscaling import ( "errors" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/internal/controller/datadogagent/feature" diff --git a/internal/controller/datadogagent/feature/autoscaling/feature_test.go b/internal/controller/datadogagent/feature/autoscaling/feature_test.go index e0328329f..31e84e97c 100644 --- a/internal/controller/datadogagent/feature/autoscaling/feature_test.go +++ b/internal/controller/datadogagent/feature/autoscaling/feature_test.go @@ -9,9 +9,9 @@ import ( "fmt" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/clusterchecks/feature.go b/internal/controller/datadogagent/feature/clusterchecks/feature.go index 20a2cf2e2..168c56ebd 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature.go @@ -6,9 +6,9 @@ package clusterchecks import ( - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/objects" "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/clusterchecks/feature_test.go b/internal/controller/datadogagent/feature/clusterchecks/feature_test.go index 7bc30e932..2a87930b6 100644 --- a/internal/controller/datadogagent/feature/clusterchecks/feature_test.go +++ b/internal/controller/datadogagent/feature/clusterchecks/feature_test.go @@ -13,10 +13,10 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/cspm/feature.go b/internal/controller/datadogagent/feature/cspm/feature.go index 84d89476f..8216cbaa7 100644 --- a/internal/controller/datadogagent/feature/cspm/feature.go +++ b/internal/controller/datadogagent/feature/cspm/feature.go @@ -8,9 +8,9 @@ package cspm import ( "strconv" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" diff --git a/internal/controller/datadogagent/feature/cspm/feature_test.go b/internal/controller/datadogagent/feature/cspm/feature_test.go index a00a9020d..3c670804e 100644 --- a/internal/controller/datadogagent/feature/cspm/feature_test.go +++ b/internal/controller/datadogagent/feature/cspm/feature_test.go @@ -13,9 +13,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/cws/feature.go b/internal/controller/datadogagent/feature/cws/feature.go index d0ca7befe..03d35aa15 100644 --- a/internal/controller/datadogagent/feature/cws/feature.go +++ b/internal/controller/datadogagent/feature/cws/feature.go @@ -11,8 +11,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" @@ -20,7 +20,7 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" ) diff --git a/internal/controller/datadogagent/feature/cws/feature_test.go b/internal/controller/datadogagent/feature/cws/feature_test.go index ec303cf3d..d30b1328b 100644 --- a/internal/controller/datadogagent/feature/cws/feature_test.go +++ b/internal/controller/datadogagent/feature/cws/feature_test.go @@ -13,9 +13,9 @@ import ( "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature.go b/internal/controller/datadogagent/feature/dogstatsd/feature.go index 4f91533a5..180cf41f0 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature.go @@ -13,9 +13,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature" featureutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" diff --git a/internal/controller/datadogagent/feature/dogstatsd/feature_test.go b/internal/controller/datadogagent/feature/dogstatsd/feature_test.go index 78453651c..8bbc3d052 100644 --- a/internal/controller/datadogagent/feature/dogstatsd/feature_test.go +++ b/internal/controller/datadogagent/feature/dogstatsd/feature_test.go @@ -9,10 +9,10 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/dummy/feature.go b/internal/controller/datadogagent/feature/dummy/feature.go index a82922b3f..fdfbd4112 100644 --- a/internal/controller/datadogagent/feature/dummy/feature.go +++ b/internal/controller/datadogagent/feature/dummy/feature.go @@ -6,7 +6,7 @@ package dummy import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" ) diff --git a/internal/controller/datadogagent/feature/ebpfcheck/feature.go b/internal/controller/datadogagent/feature/ebpfcheck/feature.go index ce1f8f282..89d46893c 100644 --- a/internal/controller/datadogagent/feature/ebpfcheck/feature.go +++ b/internal/controller/datadogagent/feature/ebpfcheck/feature.go @@ -3,9 +3,9 @@ package ebpfcheck import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/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/ebpfcheck/feature_test.go b/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go index 695c21df0..c91543cf5 100644 --- a/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go +++ b/internal/controller/datadogagent/feature/ebpfcheck/feature_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" diff --git a/internal/controller/datadogagent/feature/enabledefault/feature.go b/internal/controller/datadogagent/feature/enabledefault/feature.go index dec76f3a6..762decf48 100644 --- a/internal/controller/datadogagent/feature/enabledefault/feature.go +++ b/internal/controller/datadogagent/feature/enabledefault/feature.go @@ -10,9 +10,9 @@ import ( "fmt" "os" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" diff --git a/internal/controller/datadogagent/feature/enabledefault/feature_test.go b/internal/controller/datadogagent/feature/enabledefault/feature_test.go index 07597a282..c6f756e96 100644 --- a/internal/controller/datadogagent/feature/enabledefault/feature_test.go +++ b/internal/controller/datadogagent/feature/enabledefault/feature_test.go @@ -15,8 +15,8 @@ import ( "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/enabledefault/rbac.go b/internal/controller/datadogagent/feature/enabledefault/rbac.go index 678694ad5..cb7872d82 100644 --- a/internal/controller/datadogagent/feature/enabledefault/rbac.go +++ b/internal/controller/datadogagent/feature/enabledefault/rbac.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/common" "github.com/DataDog/datadog-operator/pkg/controller/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" diff --git a/internal/controller/datadogagent/feature/enabledefault/utils.go b/internal/controller/datadogagent/feature/enabledefault/utils.go index 791c73c4c..779790cda 100644 --- a/internal/controller/datadogagent/feature/enabledefault/utils.go +++ b/internal/controller/datadogagent/feature/enabledefault/utils.go @@ -6,7 +6,7 @@ package enabledefault import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" ) diff --git a/internal/controller/datadogagent/feature/enabledefault/utils_test.go b/internal/controller/datadogagent/feature/enabledefault/utils_test.go index da08ee388..99495cd82 100644 --- a/internal/controller/datadogagent/feature/enabledefault/utils_test.go +++ b/internal/controller/datadogagent/feature/enabledefault/utils_test.go @@ -8,8 +8,8 @@ package enabledefault import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/datadogagent/feature/eventcollection/configmap.go b/internal/controller/datadogagent/feature/eventcollection/configmap.go index 190188f5b..65a654c18 100644 --- a/internal/controller/datadogagent/feature/eventcollection/configmap.go +++ b/internal/controller/datadogagent/feature/eventcollection/configmap.go @@ -6,7 +6,7 @@ package eventcollection import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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" diff --git a/internal/controller/datadogagent/feature/eventcollection/feature.go b/internal/controller/datadogagent/feature/eventcollection/feature.go index 1d63c394a..61671e177 100644 --- a/internal/controller/datadogagent/feature/eventcollection/feature.go +++ b/internal/controller/datadogagent/feature/eventcollection/feature.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/crds/datadoghq/common" + 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/eventcollection/feature_test.go b/internal/controller/datadogagent/feature/eventcollection/feature_test.go index 26b1afb48..3cc570d76 100644 --- a/internal/controller/datadogagent/feature/eventcollection/feature_test.go +++ b/internal/controller/datadogagent/feature/eventcollection/feature_test.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature.go b/internal/controller/datadogagent/feature/externalmetrics/feature.go index f6edc076e..b39a80362 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature.go @@ -9,9 +9,9 @@ import ( "fmt" "strconv" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" componentdca "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/objects" diff --git a/internal/controller/datadogagent/feature/externalmetrics/feature_test.go b/internal/controller/datadogagent/feature/externalmetrics/feature_test.go index b5e184014..97ed4c4ab 100644 --- a/internal/controller/datadogagent/feature/externalmetrics/feature_test.go +++ b/internal/controller/datadogagent/feature/externalmetrics/feature_test.go @@ -8,9 +8,9 @@ package externalmetrics import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/factory.go b/internal/controller/datadogagent/feature/factory.go index e17b1e80f..c4fac2183 100644 --- a/internal/controller/datadogagent/feature/factory.go +++ b/internal/controller/datadogagent/feature/factory.go @@ -10,8 +10,8 @@ import ( "sort" "sync" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) func init() { diff --git a/internal/controller/datadogagent/feature/helmcheck/configmap_test.go b/internal/controller/datadogagent/feature/helmcheck/configmap_test.go index 5d811cda4..1073f4f4e 100644 --- a/internal/controller/datadogagent/feature/helmcheck/configmap_test.go +++ b/internal/controller/datadogagent/feature/helmcheck/configmap_test.go @@ -11,7 +11,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/equality" ) diff --git a/internal/controller/datadogagent/feature/helmcheck/feature.go b/internal/controller/datadogagent/feature/helmcheck/feature.go index f0ddbf3a2..7b16acf07 100644 --- a/internal/controller/datadogagent/feature/helmcheck/feature.go +++ b/internal/controller/datadogagent/feature/helmcheck/feature.go @@ -12,9 +12,9 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" diff --git a/internal/controller/datadogagent/feature/helmcheck/feature_test.go b/internal/controller/datadogagent/feature/helmcheck/feature_test.go index 556a7fde5..0e9e911fa 100644 --- a/internal/controller/datadogagent/feature/helmcheck/feature_test.go +++ b/internal/controller/datadogagent/feature/helmcheck/feature_test.go @@ -16,10 +16,10 @@ import ( corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go index 75f90ff24..1cea9f5af 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/configmap_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go index 175f1628a..7e29eb0c7 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/feature.go @@ -13,9 +13,9 @@ import ( "github.com/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/utils" diff --git a/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go b/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go index 88f024f23..207ad0971 100644 --- a/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go +++ b/internal/controller/datadogagent/feature/kubernetesstatecore/feature_test.go @@ -9,10 +9,10 @@ import ( "fmt" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/livecontainer/feature.go b/internal/controller/datadogagent/feature/livecontainer/feature.go index 20145fd20..8e7d403d2 100644 --- a/internal/controller/datadogagent/feature/livecontainer/feature.go +++ b/internal/controller/datadogagent/feature/livecontainer/feature.go @@ -8,10 +8,10 @@ package livecontainer import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/livecontainer/feature_test.go b/internal/controller/datadogagent/feature/livecontainer/feature_test.go index f457ed528..c17777480 100644 --- a/internal/controller/datadogagent/feature/livecontainer/feature_test.go +++ b/internal/controller/datadogagent/feature/livecontainer/feature_test.go @@ -8,11 +8,11 @@ package livecontainer import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/crds/utils" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/liveprocess/feature.go b/internal/controller/datadogagent/feature/liveprocess/feature.go index bdb4aa39c..1a3f06b85 100644 --- a/internal/controller/datadogagent/feature/liveprocess/feature.go +++ b/internal/controller/datadogagent/feature/liveprocess/feature.go @@ -8,10 +8,10 @@ package liveprocess import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/liveprocess/feature_test.go b/internal/controller/datadogagent/feature/liveprocess/feature_test.go index f3858aa71..c38a33d06 100644 --- a/internal/controller/datadogagent/feature/liveprocess/feature_test.go +++ b/internal/controller/datadogagent/feature/liveprocess/feature_test.go @@ -8,11 +8,11 @@ package liveprocess import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/crds/utils" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/logcollection/feature.go b/internal/controller/datadogagent/feature/logcollection/feature.go index 8f72e20d4..41539edf9 100644 --- a/internal/controller/datadogagent/feature/logcollection/feature.go +++ b/internal/controller/datadogagent/feature/logcollection/feature.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" ) diff --git a/internal/controller/datadogagent/feature/logcollection/feature_test.go b/internal/controller/datadogagent/feature/logcollection/feature_test.go index 1d70ad732..1f5c87d98 100644 --- a/internal/controller/datadogagent/feature/logcollection/feature_test.go +++ b/internal/controller/datadogagent/feature/logcollection/feature_test.go @@ -8,9 +8,9 @@ package logcollection import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/npm/feature.go b/internal/controller/datadogagent/feature/npm/feature.go index 9abb42105..a85a8aeb7 100644 --- a/internal/controller/datadogagent/feature/npm/feature.go +++ b/internal/controller/datadogagent/feature/npm/feature.go @@ -9,10 +9,10 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" ) diff --git a/internal/controller/datadogagent/feature/npm/feature_test.go b/internal/controller/datadogagent/feature/npm/feature_test.go index 1b3f8135e..d382ef558 100644 --- a/internal/controller/datadogagent/feature/npm/feature_test.go +++ b/internal/controller/datadogagent/feature/npm/feature_test.go @@ -8,9 +8,9 @@ package npm import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" diff --git a/internal/controller/datadogagent/feature/oomkill/feature.go b/internal/controller/datadogagent/feature/oomkill/feature.go index 01fef749d..ad8e0ee48 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature.go +++ b/internal/controller/datadogagent/feature/oomkill/feature.go @@ -10,10 +10,10 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" ) diff --git a/internal/controller/datadogagent/feature/oomkill/feature_test.go b/internal/controller/datadogagent/feature/oomkill/feature_test.go index 2e5e4d1b5..efa661056 100644 --- a/internal/controller/datadogagent/feature/oomkill/feature_test.go +++ b/internal/controller/datadogagent/feature/oomkill/feature_test.go @@ -8,9 +8,9 @@ package oomkill import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go index ea3ca7caf..87cb218b1 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/configmap_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/env.go b/internal/controller/datadogagent/feature/orchestratorexplorer/env.go index 323e113c0..1aaef527e 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/env.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/env.go @@ -10,8 +10,8 @@ import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + apiutils "github.com/DataDog/datadog-operator/api/utils" ) func (f *orchestratorExplorerFeature) getEnvVars() []*corev1.EnvVar { diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go index e810c8af4..7a41b10a1 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/feature.go @@ -11,14 +11,14 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" "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/crds/datadoghq/common" + 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" diff --git a/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go b/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go index f6eb4e3f1..d86f4a1ce 100644 --- a/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go +++ b/internal/controller/datadogagent/feature/orchestratorexplorer/feature_test.go @@ -9,10 +9,10 @@ import ( "fmt" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/otlp/feature.go b/internal/controller/datadogagent/feature/otlp/feature.go index c4711067e..a725c8660 100644 --- a/internal/controller/datadogagent/feature/otlp/feature.go +++ b/internal/controller/datadogagent/feature/otlp/feature.go @@ -16,12 +16,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/go-logr/logr" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" diff --git a/internal/controller/datadogagent/feature/otlp/feature_test.go b/internal/controller/datadogagent/feature/otlp/feature_test.go index a14390caf..32e4b6698 100644 --- a/internal/controller/datadogagent/feature/otlp/feature_test.go +++ b/internal/controller/datadogagent/feature/otlp/feature_test.go @@ -8,10 +8,10 @@ package otlp import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/processdiscovery/feature.go b/internal/controller/datadogagent/feature/processdiscovery/feature.go index 2b9327833..38bce2fe9 100644 --- a/internal/controller/datadogagent/feature/processdiscovery/feature.go +++ b/internal/controller/datadogagent/feature/processdiscovery/feature.go @@ -3,9 +3,9 @@ package processdiscovery import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" featutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/utils" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/feature/processdiscovery/feature_test.go b/internal/controller/datadogagent/feature/processdiscovery/feature_test.go index 4a8b1ebc4..2363d5a4e 100644 --- a/internal/controller/datadogagent/feature/processdiscovery/feature_test.go +++ b/internal/controller/datadogagent/feature/processdiscovery/feature_test.go @@ -3,11 +3,11 @@ package processdiscovery import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - "github.com/DataDog/datadog-operator/api/crds/utils" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/prometheusscrape/feature.go b/internal/controller/datadogagent/feature/prometheusscrape/feature.go index b7f9dba0d..26ea8ab64 100644 --- a/internal/controller/datadogagent/feature/prometheusscrape/feature.go +++ b/internal/controller/datadogagent/feature/prometheusscrape/feature.go @@ -10,10 +10,10 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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/prometheusscrape/feature_test.go b/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go index 2c0255df2..2c5533b60 100644 --- a/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go +++ b/internal/controller/datadogagent/feature/prometheusscrape/feature_test.go @@ -8,9 +8,9 @@ package prometheusscrape import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/remoteconfig/feature.go b/internal/controller/datadogagent/feature/remoteconfig/feature.go index ed195f059..ae1229007 100644 --- a/internal/controller/datadogagent/feature/remoteconfig/feature.go +++ b/internal/controller/datadogagent/feature/remoteconfig/feature.go @@ -9,11 +9,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/crds/datadoghq/common" + 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_test.go b/internal/controller/datadogagent/feature/remoteconfig/feature_test.go index cf0da85aa..be4aa3175 100644 --- a/internal/controller/datadogagent/feature/remoteconfig/feature_test.go +++ b/internal/controller/datadogagent/feature/remoteconfig/feature_test.go @@ -10,9 +10,9 @@ import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/sbom/feature.go b/internal/controller/datadogagent/feature/sbom/feature.go index 2a4d333f4..a41732caa 100644 --- a/internal/controller/datadogagent/feature/sbom/feature.go +++ b/internal/controller/datadogagent/feature/sbom/feature.go @@ -11,11 +11,11 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/crds/datadoghq/common" + 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" diff --git a/internal/controller/datadogagent/feature/sbom/feature_test.go b/internal/controller/datadogagent/feature/sbom/feature_test.go index cf1f4dc12..3c3442ffe 100644 --- a/internal/controller/datadogagent/feature/sbom/feature_test.go +++ b/internal/controller/datadogagent/feature/sbom/feature_test.go @@ -8,9 +8,9 @@ package sbom import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/test" diff --git a/internal/controller/datadogagent/feature/servicediscovery/feature.go b/internal/controller/datadogagent/feature/servicediscovery/feature.go index ad8987467..44396d4cf 100644 --- a/internal/controller/datadogagent/feature/servicediscovery/feature.go +++ b/internal/controller/datadogagent/feature/servicediscovery/feature.go @@ -3,9 +3,9 @@ package servicediscovery import ( corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/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/servicediscovery/feature_test.go b/internal/controller/datadogagent/feature/servicediscovery/feature_test.go index af7f4e746..cdd00f70b 100644 --- a/internal/controller/datadogagent/feature/servicediscovery/feature_test.go +++ b/internal/controller/datadogagent/feature/servicediscovery/feature_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" diff --git a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go index 11acd8eeb..8fa1c557b 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature.go @@ -11,10 +11,10 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/pkg/kubernetes" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" ) diff --git a/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go b/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go index f6f964223..25796c3ee 100644 --- a/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go +++ b/internal/controller/datadogagent/feature/tcpqueuelength/feature_test.go @@ -8,9 +8,9 @@ package tcpqueuelength import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" diff --git a/internal/controller/datadogagent/feature/test/factory_test.go b/internal/controller/datadogagent/feature/test/factory_test.go index c67acf5ea..0ef867e9d 100644 --- a/internal/controller/datadogagent/feature/test/factory_test.go +++ b/internal/controller/datadogagent/feature/test/factory_test.go @@ -3,11 +3,11 @@ package test import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" + "github.com/DataDog/datadog-operator/api/datadoghq/common" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" "github.com/stretchr/testify/assert" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" _ "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/apm" _ "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/cspm" diff --git a/internal/controller/datadogagent/feature/test/testsuite.go b/internal/controller/datadogagent/feature/test/testsuite.go index 83471329c..2d3a8be54 100644 --- a/internal/controller/datadogagent/feature/test/testsuite.go +++ b/internal/controller/datadogagent/feature/test/testsuite.go @@ -3,8 +3,8 @@ package test import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/feature/types.go b/internal/controller/datadogagent/feature/types.go index 8b1151acd..04767246d 100644 --- a/internal/controller/datadogagent/feature/types.go +++ b/internal/controller/datadogagent/feature/types.go @@ -6,9 +6,9 @@ package feature import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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" diff --git a/internal/controller/datadogagent/feature/types_test.go b/internal/controller/datadogagent/feature/types_test.go index 0e3510c5f..bb8fdc2e5 100644 --- a/internal/controller/datadogagent/feature/types_test.go +++ b/internal/controller/datadogagent/feature/types_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - common "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + common "github.com/DataDog/datadog-operator/api/datadoghq/common" ) func Test_merge(t *testing.T) { diff --git a/internal/controller/datadogagent/feature/usm/feature.go b/internal/controller/datadogagent/feature/usm/feature.go index 9adb62cca..3a6f289ba 100644 --- a/internal/controller/datadogagent/feature/usm/feature.go +++ b/internal/controller/datadogagent/feature/usm/feature.go @@ -9,10 +9,10 @@ import ( "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" corev1 "k8s.io/api/core/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" ) diff --git a/internal/controller/datadogagent/feature/usm/feature_test.go b/internal/controller/datadogagent/feature/usm/feature_test.go index d19d6012b..630d12eea 100644 --- a/internal/controller/datadogagent/feature/usm/feature_test.go +++ b/internal/controller/datadogagent/feature/usm/feature_test.go @@ -8,9 +8,9 @@ package usm import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature/fake" diff --git a/internal/controller/datadogagent/feature/utils/utils.go b/internal/controller/datadogagent/feature/utils/utils.go index 8bc8133b4..d298f5ff9 100644 --- a/internal/controller/datadogagent/feature/utils/utils.go +++ b/internal/controller/datadogagent/feature/utils/utils.go @@ -8,8 +8,8 @@ package utils import ( "strconv" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/defaulting" "github.com/DataDog/datadog-operator/pkg/utils" diff --git a/internal/controller/datadogagent/finalizer.go b/internal/controller/datadogagent/finalizer.go index 12deb0a76..4b5e39370 100644 --- a/internal/controller/datadogagent/finalizer.go +++ b/internal/controller/datadogagent/finalizer.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/override" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/finalizer_test.go b/internal/controller/datadogagent/finalizer_test.go index b2f5b028f..fce9e75b8 100644 --- a/internal/controller/datadogagent/finalizer_test.go +++ b/internal/controller/datadogagent/finalizer_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/clusteragent" agenttestutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" diff --git a/internal/controller/datadogagent/merger/cilium_test.go b/internal/controller/datadogagent/merger/cilium_test.go index d1bb28e7a..5ae45fd6a 100644 --- a/internal/controller/datadogagent/merger/cilium_test.go +++ b/internal/controller/datadogagent/merger/cilium_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" cilium "github.com/DataDog/datadog-operator/pkg/cilium/v1" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/configmap_test.go b/internal/controller/datadogagent/merger/configmap_test.go index 9c6f23f44..5592cc572 100644 --- a/internal/controller/datadogagent/merger/configmap_test.go +++ b/internal/controller/datadogagent/merger/configmap_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/envvarfrom.go b/internal/controller/datadogagent/merger/envvarfrom.go index d4adca3a0..212ca49cd 100644 --- a/internal/controller/datadogagent/merger/envvarfrom.go +++ b/internal/controller/datadogagent/merger/envvarfrom.go @@ -6,7 +6,7 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/envvarfrom_test.go b/internal/controller/datadogagent/merger/envvarfrom_test.go index b9a27e03e..4f9a0110e 100644 --- a/internal/controller/datadogagent/merger/envvarfrom_test.go +++ b/internal/controller/datadogagent/merger/envvarfrom_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/envvars.go b/internal/controller/datadogagent/merger/envvars.go index 1e91e83e1..499fd6404 100644 --- a/internal/controller/datadogagent/merger/envvars.go +++ b/internal/controller/datadogagent/merger/envvars.go @@ -8,7 +8,7 @@ package merger import ( "strings" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/envvars_test.go b/internal/controller/datadogagent/merger/envvars_test.go index 81dd78266..937231b20 100644 --- a/internal/controller/datadogagent/merger/envvars_test.go +++ b/internal/controller/datadogagent/merger/envvars_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/fake/const.go b/internal/controller/datadogagent/merger/fake/const.go index 998606c39..8e1d6097d 100644 --- a/internal/controller/datadogagent/merger/fake/const.go +++ b/internal/controller/datadogagent/merger/fake/const.go @@ -1,6 +1,6 @@ package fake -import "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" +import "github.com/DataDog/datadog-operator/api/datadoghq/common" const ( // AllContainers all containers container name diff --git a/internal/controller/datadogagent/merger/fake/envfromvar_manager.go b/internal/controller/datadogagent/merger/fake/envfromvar_manager.go index 118320b0a..8af5bc69b 100644 --- a/internal/controller/datadogagent/merger/fake/envfromvar_manager.go +++ b/internal/controller/datadogagent/merger/fake/envfromvar_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/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" diff --git a/internal/controller/datadogagent/merger/fake/envvar_manager.go b/internal/controller/datadogagent/merger/fake/envvar_manager.go index 827a7f783..d7857ca78 100644 --- a/internal/controller/datadogagent/merger/fake/envvar_manager.go +++ b/internal/controller/datadogagent/merger/fake/envvar_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/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" diff --git a/internal/controller/datadogagent/merger/fake/port_manager.go b/internal/controller/datadogagent/merger/fake/port_manager.go index fb84d2ac7..801f5c4bc 100644 --- a/internal/controller/datadogagent/merger/fake/port_manager.go +++ b/internal/controller/datadogagent/merger/fake/port_manager.go @@ -8,7 +8,7 @@ package fake import ( "testing" - common "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + 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" diff --git a/internal/controller/datadogagent/merger/fake/security_context_manager.go b/internal/controller/datadogagent/merger/fake/security_context_manager.go index 138adaab5..4fb498110 100644 --- a/internal/controller/datadogagent/merger/fake/security_context_manager.go +++ b/internal/controller/datadogagent/merger/fake/security_context_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" v1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/fake/volume_mount_manager.go b/internal/controller/datadogagent/merger/fake/volume_mount_manager.go index c4edeff1c..db2d41469 100644 --- a/internal/controller/datadogagent/merger/fake/volume_mount_manager.go +++ b/internal/controller/datadogagent/merger/fake/volume_mount_manager.go @@ -3,7 +3,7 @@ package fake import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/merger" v1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/merger/network_policy_test.go b/internal/controller/datadogagent/merger/network_policy_test.go index 6fe7e3f82..23883b504 100644 --- a/internal/controller/datadogagent/merger/network_policy_test.go +++ b/internal/controller/datadogagent/merger/network_policy_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/port.go b/internal/controller/datadogagent/merger/port.go index 7a6f7eb58..b15fdd5a6 100644 --- a/internal/controller/datadogagent/merger/port.go +++ b/internal/controller/datadogagent/merger/port.go @@ -6,7 +6,7 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/rbac_test.go b/internal/controller/datadogagent/merger/rbac_test.go index d9714f544..ab09b96e3 100644 --- a/internal/controller/datadogagent/merger/rbac_test.go +++ b/internal/controller/datadogagent/merger/rbac_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/secret_test.go b/internal/controller/datadogagent/merger/secret_test.go index 2857ca133..fe06ce0a7 100644 --- a/internal/controller/datadogagent/merger/secret_test.go +++ b/internal/controller/datadogagent/merger/secret_test.go @@ -8,7 +8,7 @@ package merger import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "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" diff --git a/internal/controller/datadogagent/merger/security_context.go b/internal/controller/datadogagent/merger/security_context.go index ddbb3ff44..a814ea2fa 100644 --- a/internal/controller/datadogagent/merger/security_context.go +++ b/internal/controller/datadogagent/merger/security_context.go @@ -8,7 +8,7 @@ package merger import ( "sort" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/security_context_test.go b/internal/controller/datadogagent/merger/security_context_test.go index 7c3e836d3..346d72e0b 100644 --- a/internal/controller/datadogagent/merger/security_context_test.go +++ b/internal/controller/datadogagent/merger/security_context_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/service_test.go b/internal/controller/datadogagent/merger/service_test.go index c65e139bd..5d74faa45 100644 --- a/internal/controller/datadogagent/merger/service_test.go +++ b/internal/controller/datadogagent/merger/service_test.go @@ -8,8 +8,8 @@ package merger import ( "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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/store" "github.com/DataDog/datadog-operator/pkg/kubernetes" diff --git a/internal/controller/datadogagent/merger/utils.go b/internal/controller/datadogagent/merger/utils.go index b204c5e8a..712a093c2 100644 --- a/internal/controller/datadogagent/merger/utils.go +++ b/internal/controller/datadogagent/merger/utils.go @@ -5,7 +5,7 @@ package merger -import "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" +import "github.com/DataDog/datadog-operator/api/datadoghq/common" // AllAgentContainers is a map of all agent containers var AllAgentContainers = map[common.AgentContainerName]struct{}{ diff --git a/internal/controller/datadogagent/merger/volume_mount.go b/internal/controller/datadogagent/merger/volume_mount.go index f425a2038..806c2be15 100644 --- a/internal/controller/datadogagent/merger/volume_mount.go +++ b/internal/controller/datadogagent/merger/volume_mount.go @@ -6,7 +6,7 @@ package merger import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/merger/volume_mount_test.go b/internal/controller/datadogagent/merger/volume_mount_test.go index 69296cba9..6b915561a 100644 --- a/internal/controller/datadogagent/merger/volume_mount_test.go +++ b/internal/controller/datadogagent/merger/volume_mount_test.go @@ -9,7 +9,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/controller/datadogagent/object/labels.go b/internal/controller/datadogagent/object/labels.go index aba238a20..d903706db 100644 --- a/internal/controller/datadogagent/object/labels.go +++ b/internal/controller/datadogagent/object/labels.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/go-logr/logr" diff --git a/internal/controller/datadogagent/object/volume/volumes.go b/internal/controller/datadogagent/object/volume/volumes.go index fb7d3d350..2438d697a 100644 --- a/internal/controller/datadogagent/object/volume/volumes.go +++ b/internal/controller/datadogagent/object/volume/volumes.go @@ -12,8 +12,8 @@ import ( "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) // GetVolumes creates a corev1.Volume and corev1.VolumeMount corresponding to a host path. diff --git a/internal/controller/datadogagent/override/container.go b/internal/controller/datadogagent/override/container.go index 99768b946..ceee2364b 100644 --- a/internal/controller/datadogagent/override/container.go +++ b/internal/controller/datadogagent/override/container.go @@ -9,8 +9,8 @@ import ( "fmt" "strconv" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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" corev1 "k8s.io/api/core/v1" diff --git a/internal/controller/datadogagent/override/container_test.go b/internal/controller/datadogagent/override/container_test.go index 0029d6318..6799f3187 100644 --- a/internal/controller/datadogagent/override/container_test.go +++ b/internal/controller/datadogagent/override/container_test.go @@ -10,9 +10,9 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/fake" "github.com/stretchr/testify/assert" diff --git a/internal/controller/datadogagent/override/daemonset.go b/internal/controller/datadogagent/override/daemonset.go index daeec05b6..34624483c 100644 --- a/internal/controller/datadogagent/override/daemonset.go +++ b/internal/controller/datadogagent/override/daemonset.go @@ -6,7 +6,7 @@ package override import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" edsv1alpha1 "github.com/DataDog/extendeddaemonset/api/v1alpha1" v1 "k8s.io/api/apps/v1" ) diff --git a/internal/controller/datadogagent/override/daemonset_test.go b/internal/controller/datadogagent/override/daemonset_test.go index 5930978fa..b965259b2 100644 --- a/internal/controller/datadogagent/override/daemonset_test.go +++ b/internal/controller/datadogagent/override/daemonset_test.go @@ -8,9 +8,9 @@ package override import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/stretchr/testify/assert" v1 "k8s.io/api/apps/v1" diff --git a/internal/controller/datadogagent/override/dependencies.go b/internal/controller/datadogagent/override/dependencies.go index 753162e75..18006de15 100644 --- a/internal/controller/datadogagent/override/dependencies.go +++ b/internal/controller/datadogagent/override/dependencies.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/errors" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" 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/feature" diff --git a/internal/controller/datadogagent/override/dependencies_test.go b/internal/controller/datadogagent/override/dependencies_test.go index 59029079c..1c836a3b2 100644 --- a/internal/controller/datadogagent/override/dependencies_test.go +++ b/internal/controller/datadogagent/override/dependencies_test.go @@ -8,8 +8,8 @@ package override import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/store" diff --git a/internal/controller/datadogagent/override/deploymentspec.go b/internal/controller/datadogagent/override/deploymentspec.go index 99092c74f..0a6509577 100644 --- a/internal/controller/datadogagent/override/deploymentspec.go +++ b/internal/controller/datadogagent/override/deploymentspec.go @@ -6,7 +6,7 @@ package override import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" v1 "k8s.io/api/apps/v1" ) diff --git a/internal/controller/datadogagent/override/deploymentspec_test.go b/internal/controller/datadogagent/override/deploymentspec_test.go index d5690f3f5..c84cab91b 100644 --- a/internal/controller/datadogagent/override/deploymentspec_test.go +++ b/internal/controller/datadogagent/override/deploymentspec_test.go @@ -8,8 +8,8 @@ package override import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/stretchr/testify/assert" v1 "k8s.io/api/apps/v1" diff --git a/internal/controller/datadogagent/override/fips.go b/internal/controller/datadogagent/override/fips.go index 4e64dd21c..4ec143b0b 100644 --- a/internal/controller/datadogagent/override/fips.go +++ b/internal/controller/datadogagent/override/fips.go @@ -9,9 +9,9 @@ import ( "fmt" "strconv" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/configmap" diff --git a/internal/controller/datadogagent/override/fips_test.go b/internal/controller/datadogagent/override/fips_test.go index e05a81ca4..3c9a27851 100644 --- a/internal/controller/datadogagent/override/fips_test.go +++ b/internal/controller/datadogagent/override/fips_test.go @@ -10,10 +10,10 @@ import ( "strconv" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + 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/feature/fake" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/store" diff --git a/internal/controller/datadogagent/override/global.go b/internal/controller/datadogagent/override/global.go index 5d6857fec..90d0f7bff 100644 --- a/internal/controller/datadogagent/override/global.go +++ b/internal/controller/datadogagent/override/global.go @@ -12,9 +12,9 @@ import ( "strconv" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/component/objects" "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/override/global_test.go b/internal/controller/datadogagent/override/global_test.go index 06931e9d6..21441418d 100644 --- a/internal/controller/datadogagent/override/global_test.go +++ b/internal/controller/datadogagent/override/global_test.go @@ -12,10 +12,10 @@ import ( "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/kubernetes/rbac" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - v2alpha1test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + v2alpha1test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" diff --git a/internal/controller/datadogagent/override/podtemplatespec.go b/internal/controller/datadogagent/override/podtemplatespec.go index 561ffb820..b055b3378 100644 --- a/internal/controller/datadogagent/override/podtemplatespec.go +++ b/internal/controller/datadogagent/override/podtemplatespec.go @@ -13,8 +13,8 @@ import ( "github.com/go-logr/logr" v1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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/feature" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object/volume" diff --git a/internal/controller/datadogagent/override/podtemplatespec_test.go b/internal/controller/datadogagent/override/podtemplatespec_test.go index 07b3b1a6a..053db9747 100644 --- a/internal/controller/datadogagent/override/podtemplatespec_test.go +++ b/internal/controller/datadogagent/override/podtemplatespec_test.go @@ -15,9 +15,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/log/zap" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "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/fake" ) diff --git a/internal/controller/datadogagent/store/store_test.go b/internal/controller/datadogagent/store/store_test.go index fa0b3cce8..8665c8956 100644 --- a/internal/controller/datadogagent/store/store_test.go +++ b/internal/controller/datadogagent/store/store_test.go @@ -10,7 +10,7 @@ import ( "reflect" "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" testutils "github.com/DataDog/datadog-operator/internal/controller/datadogagent/testutils" "github.com/DataDog/datadog-operator/pkg/kubernetes" assert "github.com/stretchr/testify/require" diff --git a/internal/controller/datadogagent/testutils/client_utils.go b/internal/controller/datadogagent/testutils/client_utils.go index bce168bc9..86cd4cb0b 100644 --- a/internal/controller/datadogagent/testutils/client_utils.go +++ b/internal/controller/datadogagent/testutils/client_utils.go @@ -6,8 +6,8 @@ package testutils_test import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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" diff --git a/internal/controller/datadogagent/utils.go b/internal/controller/datadogagent/utils.go index 2ba95d118..507359c83 100644 --- a/internal/controller/datadogagent/utils.go +++ b/internal/controller/datadogagent/utils.go @@ -11,7 +11,7 @@ import ( "strings" "time" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" diff --git a/internal/controller/datadogagent_controller.go b/internal/controller/datadogagent_controller.go index 5cad91936..2e80cdf20 100644 --- a/internal/controller/datadogagent_controller.go +++ b/internal/controller/datadogagent_controller.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + 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" "github.com/DataDog/datadog-operator/internal/controller/datadogagent/object" "github.com/DataDog/datadog-operator/internal/controller/metrics" diff --git a/internal/controller/datadogagent_controller_profiles_test.go b/internal/controller/datadogagent_controller_profiles_test.go index 569e8495c..ddc1aa4de 100644 --- a/internal/controller/datadogagent_controller_profiles_test.go +++ b/internal/controller/datadogagent_controller_profiles_test.go @@ -13,10 +13,10 @@ import ( "strings" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - "github.com/DataDog/datadog-operator/api/crds/utils" + 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" + "github.com/DataDog/datadog-operator/api/utils" componentagent "github.com/DataDog/datadog-operator/internal/controller/datadogagent/component/agent" "github.com/DataDog/datadog-operator/internal/controller/testutils" "github.com/DataDog/datadog-operator/pkg/agentprofile" diff --git a/internal/controller/datadogagent_controller_test.go b/internal/controller/datadogagent_controller_test.go index 430666e03..b8442043a 100644 --- a/internal/controller/datadogagent_controller_test.go +++ b/internal/controller/datadogagent_controller_test.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/internal/controller/testutils" ) diff --git a/internal/controller/datadogagentprofile_controller.go b/internal/controller/datadogagentprofile_controller.go index 89c1b693a..6f61dc53b 100644 --- a/internal/controller/datadogagentprofile_controller.go +++ b/internal/controller/datadogagentprofile_controller.go @@ -14,7 +14,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" dap "github.com/DataDog/datadog-operator/internal/controller/datadogagentprofile" ) diff --git a/internal/controller/datadogdashboard/controller.go b/internal/controller/datadogdashboard/controller.go index 7ddbcd729..48dbaf116 100644 --- a/internal/controller/datadogdashboard/controller.go +++ b/internal/controller/datadogdashboard/controller.go @@ -6,7 +6,7 @@ import ( "time" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "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" diff --git a/internal/controller/datadogdashboard/controller_test.go b/internal/controller/datadogdashboard/controller_test.go index aeb826c73..6e4b611ce 100644 --- a/internal/controller/datadogdashboard/controller_test.go +++ b/internal/controller/datadogdashboard/controller_test.go @@ -21,7 +21,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/datadogdashboard/dashboard.go b/internal/controller/datadogdashboard/dashboard.go index 3b3059056..7d8ba1405 100644 --- a/internal/controller/datadogdashboard/dashboard.go +++ b/internal/controller/datadogdashboard/dashboard.go @@ -9,7 +9,7 @@ import ( "sort" datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/go-logr/logr" diff --git a/internal/controller/datadogdashboard/dashboard_test.go b/internal/controller/datadogdashboard/dashboard_test.go index 47710151c..af5a7e3de 100644 --- a/internal/controller/datadogdashboard/dashboard_test.go +++ b/internal/controller/datadogdashboard/dashboard_test.go @@ -16,8 +16,8 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - v1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + v1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/stretchr/testify/assert" ) diff --git a/internal/controller/datadogdashboard/finalizer.go b/internal/controller/datadogdashboard/finalizer.go index 988b2edcd..8ab1bb509 100644 --- a/internal/controller/datadogdashboard/finalizer.go +++ b/internal/controller/datadogdashboard/finalizer.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/datadogdashboard/finalizer_test.go b/internal/controller/datadogdashboard/finalizer_test.go index 5ce297bee..0903ce392 100644 --- a/internal/controller/datadogdashboard/finalizer_test.go +++ b/internal/controller/datadogdashboard/finalizer_test.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/log/zap" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" ) diff --git a/internal/controller/datadogdashboard_controller.go b/internal/controller/datadogdashboard_controller.go index c97499ad1..97b261835 100644 --- a/internal/controller/datadogdashboard_controller.go +++ b/internal/controller/datadogdashboard_controller.go @@ -14,7 +14,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/predicate" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "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" diff --git a/internal/controller/datadogmonitor/controller.go b/internal/controller/datadogmonitor/controller.go index b80a2cb2c..c54dad590 100644 --- a/internal/controller/datadogmonitor/controller.go +++ b/internal/controller/datadogmonitor/controller.go @@ -26,8 +26,8 @@ import ( "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/crds/datadoghq/v1alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" "github.com/DataDog/datadog-operator/pkg/controller/utils/condition" diff --git a/internal/controller/datadogmonitor/controller_test.go b/internal/controller/datadogmonitor/controller_test.go index 177afeb26..6b63b0be7 100644 --- a/internal/controller/datadogmonitor/controller_test.go +++ b/internal/controller/datadogmonitor/controller_test.go @@ -28,7 +28,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils/comparison" ) diff --git a/internal/controller/datadogmonitor/event.go b/internal/controller/datadogmonitor/event.go index 8fe4afc14..16b1a9ee7 100644 --- a/internal/controller/datadogmonitor/event.go +++ b/internal/controller/datadogmonitor/event.go @@ -8,7 +8,7 @@ package datadogmonitor import ( corev1 "k8s.io/api/core/v1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/utils" "github.com/DataDog/datadog-operator/pkg/controller/utils/datadog" ) diff --git a/internal/controller/datadogmonitor/finalizer.go b/internal/controller/datadogmonitor/finalizer.go index e5f8e60e7..7e5d3a1ec 100644 --- a/internal/controller/datadogmonitor/finalizer.go +++ b/internal/controller/datadogmonitor/finalizer.go @@ -9,7 +9,7 @@ import ( "context" "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/go-logr/logr" ctrl "sigs.k8s.io/controller-runtime" diff --git a/internal/controller/datadogmonitor/finalizer_test.go b/internal/controller/datadogmonitor/finalizer_test.go index 179f7288e..61898925b 100644 --- a/internal/controller/datadogmonitor/finalizer_test.go +++ b/internal/controller/datadogmonitor/finalizer_test.go @@ -16,7 +16,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/log/zap" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/pkg/controller/utils" ) diff --git a/internal/controller/datadogmonitor/monitor.go b/internal/controller/datadogmonitor/monitor.go index 0304e94b9..df104dbaa 100644 --- a/internal/controller/datadogmonitor/monitor.go +++ b/internal/controller/datadogmonitor/monitor.go @@ -17,7 +17,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) func buildMonitor(logger logr.Logger, dm *datadoghqv1alpha1.DatadogMonitor) (*datadogV1.Monitor, *datadogV1.MonitorUpdateRequest) { diff --git a/internal/controller/datadogmonitor/monitor_test.go b/internal/controller/datadogmonitor/monitor_test.go index 53049c03d..ae74b3500 100644 --- a/internal/controller/datadogmonitor/monitor_test.go +++ b/internal/controller/datadogmonitor/monitor_test.go @@ -21,7 +21,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) const dateFormat = "2006-01-02 15:04:05.999999999 -0700 MST" diff --git a/internal/controller/datadogmonitor_controller.go b/internal/controller/datadogmonitor_controller.go index 916b9be59..11f81a9da 100644 --- a/internal/controller/datadogmonitor_controller.go +++ b/internal/controller/datadogmonitor_controller.go @@ -14,7 +14,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + 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 066e9f387..ad47ea877 100644 --- a/internal/controller/datadogslo/controller.go +++ b/internal/controller/datadogslo/controller.go @@ -24,8 +24,8 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/internal/controller/finalizer" "github.com/DataDog/datadog-operator/internal/controller/utils" ctrutils "github.com/DataDog/datadog-operator/pkg/controller/utils" diff --git a/internal/controller/datadogslo/controller_test.go b/internal/controller/datadogslo/controller_test.go index 170d4c8f1..85d73667c 100644 --- a/internal/controller/datadogslo/controller_test.go +++ b/internal/controller/datadogslo/controller_test.go @@ -30,7 +30,7 @@ import ( "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" "github.com/DataDog/datadog-operator/internal/controller/utils" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) const ( diff --git a/internal/controller/datadogslo/slo.go b/internal/controller/datadogslo/slo.go index 50be589e9..e99596ed9 100644 --- a/internal/controller/datadogslo/slo.go +++ b/internal/controller/datadogslo/slo.go @@ -15,7 +15,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) func buildSLO(crdSLO *v1alpha1.DatadogSLO) (*datadogV1.ServiceLevelObjectiveRequest, *datadogV1.ServiceLevelObjective) { diff --git a/internal/controller/datadogslo/slo_test.go b/internal/controller/datadogslo/slo_test.go index f26ecfc73..c3c4c7676 100644 --- a/internal/controller/datadogslo/slo_test.go +++ b/internal/controller/datadogslo/slo_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/assert" "k8s.io/apimachinery/pkg/api/resource" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" ) func Test_buildThreshold(t *testing.T) { diff --git a/internal/controller/datadogslo_controller.go b/internal/controller/datadogslo_controller.go index 387f104e6..77a93f08e 100644 --- a/internal/controller/datadogslo_controller.go +++ b/internal/controller/datadogslo_controller.go @@ -8,7 +8,7 @@ package controller import ( "context" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/datadogslo" "github.com/go-logr/logr" diff --git a/internal/controller/finalizer/finalizer_test.go b/internal/controller/finalizer/finalizer_test.go index a0cb98d44..54ed8a402 100644 --- a/internal/controller/finalizer/finalizer_test.go +++ b/internal/controller/finalizer/finalizer_test.go @@ -7,10 +7,7 @@ package finalizer import ( "context" - "testing" - "time" - - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -20,6 +17,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log/zap" + "testing" + "time" ) type testResource struct { diff --git a/internal/controller/suite_v2_test.go b/internal/controller/suite_v2_test.go index 5e5f4d270..da5ddfffa 100644 --- a/internal/controller/suite_v2_test.go +++ b/internal/controller/suite_v2_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/client-go/rest" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" gc "github.com/onsi/ginkgo/config" "github.com/onsi/ginkgo/reporters" @@ -34,7 +34,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/DataDog/datadog-operator/internal/controller/testutils" "github.com/DataDog/datadog-operator/pkg/config" diff --git a/internal/controller/testutils/agent.go b/internal/controller/testutils/agent.go index f091368de..fc4ea3288 100644 --- a/internal/controller/testutils/agent.go +++ b/internal/controller/testutils/agent.go @@ -22,9 +22,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" controllerruntime "sigs.k8s.io/controller-runtime" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" ) // NewDatadogAgentWithoutFeatures returns an agent without any features enabled diff --git a/pkg/agentprofile/agent_profile.go b/pkg/agentprofile/agent_profile.go index 952847d96..7c53db872 100644 --- a/pkg/agentprofile/agent_profile.go +++ b/pkg/agentprofile/agent_profile.go @@ -10,10 +10,10 @@ import ( "os" "sort" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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" diff --git a/pkg/agentprofile/agent_profile_test.go b/pkg/agentprofile/agent_profile_test.go index 6e6529884..f83660e31 100644 --- a/pkg/agentprofile/agent_profile_test.go +++ b/pkg/agentprofile/agent_profile_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + 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/stretchr/testify/assert" diff --git a/pkg/agentprofile/status.go b/pkg/agentprofile/status.go index 094f3f4c8..e5968e0b5 100644 --- a/pkg/agentprofile/status.go +++ b/pkg/agentprofile/status.go @@ -9,8 +9,8 @@ import ( "fmt" "os" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "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" diff --git a/pkg/agentprofile/status_test.go b/pkg/agentprofile/status_test.go index a1744f303..13148dfa2 100644 --- a/pkg/agentprofile/status_test.go +++ b/pkg/agentprofile/status_test.go @@ -8,8 +8,8 @@ package agentprofile import ( "testing" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" "github.com/stretchr/testify/assert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/config/config.go b/pkg/config/config.go index 0ad9b9942..8e9698764 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -21,9 +21,9 @@ import ( "github.com/go-logr/logr" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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" ) // These constants are only used within pkg/config diff --git a/pkg/config/creds.go b/pkg/config/creds.go index 731a596a0..7e2e16696 100644 --- a/pkg/config/creds.go +++ b/pkg/config/creds.go @@ -11,7 +11,7 @@ import ( "sync" "time" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" "github.com/DataDog/datadog-operator/pkg/secrets" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/controller/utils/comparison/comparison.go b/pkg/controller/utils/comparison/comparison.go index 970b62a2e..0f0545e02 100644 --- a/pkg/controller/utils/comparison/comparison.go +++ b/pkg/controller/utils/comparison/comparison.go @@ -15,7 +15,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/common" ) // IsSameSpecMD5Hash used to compare the DatadogAgent.spec md5 hash with the one set in annotations diff --git a/pkg/controller/utils/condition/datadogmonitor.go b/pkg/controller/utils/condition/datadogmonitor.go index 7667089ef..ac56daefc 100644 --- a/pkg/controller/utils/condition/datadogmonitor.go +++ b/pkg/controller/utils/condition/datadogmonitor.go @@ -8,7 +8,7 @@ package condition import ( "fmt" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/utils/condition/datadogmonitor_test.go b/pkg/controller/utils/condition/datadogmonitor_test.go index 5e5f47399..66a3b895b 100644 --- a/pkg/controller/utils/condition/datadogmonitor_test.go +++ b/pkg/controller/utils/condition/datadogmonitor_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" - datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" + datadoghqv1alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/controller/utils/datadog/metrics_forwarder.go b/pkg/controller/utils/datadog/metrics_forwarder.go index 5822af1af..0910783f4 100644 --- a/pkg/controller/utils/datadog/metrics_forwarder.go +++ b/pkg/controller/utils/datadog/metrics_forwarder.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1" + "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" diff --git a/pkg/controller/utils/datadog/metrics_forwarder_test.go b/pkg/controller/utils/datadog/metrics_forwarder_test.go index 11e271706..cb105d217 100644 --- a/pkg/controller/utils/datadog/metrics_forwarder_test.go +++ b/pkg/controller/utils/datadog/metrics_forwarder_test.go @@ -15,10 +15,10 @@ import ( "sync" "testing" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - test "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1/test" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + datadoghqv2alpha1 "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + test "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1/test" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/kubernetes" "github.com/DataDog/datadog-operator/pkg/secrets" diff --git a/pkg/datadogclient/client.go b/pkg/datadogclient/client.go index 58d267353..2db5c7c28 100644 --- a/pkg/datadogclient/client.go +++ b/pkg/datadogclient/client.go @@ -19,7 +19,7 @@ import ( datadogapi "github.com/DataDog/datadog-api-client-go/v2/api/datadog" datadogV1 "github.com/DataDog/datadog-api-client-go/v2/api/datadogV1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" ) const prefix = "https://api." diff --git a/pkg/equality/equality.go b/pkg/equality/equality.go index 730598b6a..aa4fce456 100644 --- a/pkg/equality/equality.go +++ b/pkg/equality/equality.go @@ -17,7 +17,7 @@ import ( apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" "sigs.k8s.io/controller-runtime/pkg/client" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + apiutils "github.com/DataDog/datadog-operator/api/utils" "github.com/DataDog/datadog-operator/pkg/kubernetes" ) diff --git a/pkg/kubernetes/provider.go b/pkg/kubernetes/provider.go index c53f0ac04..f330f71f6 100644 --- a/pkg/kubernetes/provider.go +++ b/pkg/kubernetes/provider.go @@ -12,8 +12,8 @@ import ( "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" - apicommon "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + apicommon "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) const ( diff --git a/pkg/plugin/common/client.go b/pkg/plugin/common/client.go index f913e3a36..afb3f9513 100644 --- a/pkg/plugin/common/client.go +++ b/pkg/plugin/common/client.go @@ -8,8 +8,8 @@ package common import ( "fmt" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v1alpha1" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "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" diff --git a/pkg/plugin/common/statuswrapper.go b/pkg/plugin/common/statuswrapper.go index 5c24d8a60..179c77231 100644 --- a/pkg/plugin/common/statuswrapper.go +++ b/pkg/plugin/common/statuswrapper.go @@ -6,7 +6,7 @@ package common import ( - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/plugin/common/v2support.go b/pkg/plugin/common/v2support.go index fba0f72b2..3a18fd9b5 100644 --- a/pkg/plugin/common/v2support.go +++ b/pkg/plugin/common/v2support.go @@ -9,8 +9,8 @@ import ( "fmt" "strings" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" - apiutils "github.com/DataDog/datadog-operator/api/crds/utils" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" + apiutils "github.com/DataDog/datadog-operator/api/utils" ) func OverrideComponentImage(spec *v2alpha1.DatadogAgentSpec, cmpName v2alpha1.ComponentName, imageName, imageTag string) error { diff --git a/pkg/remoteconfig/orchestrator_k8s_crd.go b/pkg/remoteconfig/orchestrator_k8s_crd.go index 708ffae29..3abc149c1 100644 --- a/pkg/remoteconfig/orchestrator_k8s_crd.go +++ b/pkg/remoteconfig/orchestrator_k8s_crd.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" ) // CustomResourceDefinitionURLs defines model for CustomResourceDefinitionURLs. diff --git a/pkg/remoteconfig/updater.go b/pkg/remoteconfig/updater.go index 01589cedf..770fd6a99 100644 --- a/pkg/remoteconfig/updater.go +++ b/pkg/remoteconfig/updater.go @@ -28,8 +28,8 @@ import ( "github.com/DataDog/datadog-agent/pkg/config/remote/service" "github.com/DataDog/datadog-agent/pkg/remoteconfig/state" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/common" - "github.com/DataDog/datadog-operator/api/crds/datadoghq/v2alpha1" + "github.com/DataDog/datadog-operator/api/datadoghq/common" + "github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1" "github.com/DataDog/datadog-operator/pkg/config" "github.com/DataDog/datadog-operator/pkg/version" ) From 675d628496ec26947ac9328d3639796ee7889c56 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Mon, 9 Dec 2024 11:39:40 -0500 Subject: [PATCH 04/12] add parameter for testing go module --- api/datadoghq/v2alpha1/datadogagent_types.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/datadoghq/v2alpha1/datadogagent_types.go b/api/datadoghq/v2alpha1/datadogagent_types.go index 1c1187105..fb7e481ae 100644 --- a/api/datadoghq/v2alpha1/datadogagent_types.go +++ b/api/datadoghq/v2alpha1/datadogagent_types.go @@ -1163,6 +1163,8 @@ type DeploymentStatus struct { // GlobalConfig is a set of parameters that are used to configure all the components of the Datadog Operator. type GlobalConfig struct { + TestString *string `json:"testString,omitempty"` + // Credentials defines the Datadog credentials used to submit data to/query data from Datadog. Credentials *DatadogCredentials `json:"credentials,omitempty"` From 2830f65f199daa1215e7582fcfb761516d6a238f Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Tue, 10 Dec 2024 13:01:03 -0500 Subject: [PATCH 05/12] add comment to test field --- api/datadoghq/v2alpha1/datadogagent_types.go | 1 + 1 file changed, 1 insertion(+) diff --git a/api/datadoghq/v2alpha1/datadogagent_types.go b/api/datadoghq/v2alpha1/datadogagent_types.go index fb7e481ae..d07817994 100644 --- a/api/datadoghq/v2alpha1/datadogagent_types.go +++ b/api/datadoghq/v2alpha1/datadogagent_types.go @@ -1163,6 +1163,7 @@ type DeploymentStatus struct { // GlobalConfig is a set of parameters that are used to configure all the components of the Datadog Operator. type GlobalConfig struct { + // TestString is a test string. TestString *string `json:"testString,omitempty"` // Credentials defines the Datadog credentials used to submit data to/query data from Datadog. From 4dde0a95ece1135213bfdfdd5eaac3d907337c4f Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Fri, 13 Dec 2024 13:32:45 -0500 Subject: [PATCH 06/12] don't bump go version yet --- api/go.mod | 2 +- go.mod | 2 +- go.work | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/go.mod b/api/go.mod index 6210bb069..3cb558681 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-operator/api -go 1.23.2 +go 1.22.0 require ( github.com/DataDog/datadog-api-client-go/v2 v2.27.0 diff --git a/go.mod b/go.mod index 43f484ffb..38262e994 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.33.1 - github.com/pkg/errors v0.9.1 + github.com/pkg/errors v0.9.1 // indirect github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 diff --git a/go.work b/go.work index 99b370299..af98f69e6 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.23.2 +go 1.22.7 use ( . From 04f49e24e5df653f7c58d596acc256bf5d1256ca Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Fri, 13 Dec 2024 13:33:03 -0500 Subject: [PATCH 07/12] update Dockerfiles to use go.work --- Dockerfile | 13 +++++++++++++ check-operator.Dockerfile | 12 ++++++++++++ 2 files changed, 25 insertions(+) diff --git a/Dockerfile b/Dockerfile index 829ac8c39..4d018e3ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,22 @@ WORKDIR /workspace # Copy the Go Modules manifests COPY go.mod go.mod COPY go.sum go.sum +COPY go.work go.work +COPY go.work.sum go.work.sum + +COPY api/go.mod api/go.mod +COPY api/go.sum api/go.sum + +COPY test/e2e/go.mod test/e2e/go.mod +COPY test/e2e/go.sum test/e2e/go.sum # cache deps before building and copying source so that we don't need to re-download as much # and so that source changes don't invalidate our downloaded layer RUN go mod download +WORKDIR /workspace/api +RUN go mod download +WORKDIR /workspace/test/e2e +RUN go mod download +WORKDIR /workspace # Copy the go source COPY cmd/main.go cmd/main.go diff --git a/check-operator.Dockerfile b/check-operator.Dockerfile index ab377851f..3ae5dbbbb 100644 --- a/check-operator.Dockerfile +++ b/check-operator.Dockerfile @@ -5,10 +5,22 @@ WORKDIR /workspace # Copy the Go Modules manifests COPY go.mod go.mod COPY go.sum go.sum +COPY go.work go.work +COPY go.work.sum go.work.sum +COPY api/go.mod api/go.mod +COPY api/go.sum api/go.sum + +COPY test/e2e/go.mod test/e2e/go.mod +COPY test/e2e/go.sum test/e2e/go.sum # cache deps before building and copying source so that we don't need to re-download as much # and so that source changes don't invalidate our downloaded layer RUN go mod download +WORKDIR /workspace/api +RUN go mod download +WORKDIR /workspace/test/e2e +RUN go mod download +WORKDIR /workspace # Copy the go source COPY cmd/check-operator/ cmd/check-operator/ From 500635277091d9d4118852ee1eb548e7cfa22256 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Fri, 13 Dec 2024 14:58:05 -0500 Subject: [PATCH 08/12] licenses, remove test string --- LICENSE-3rdparty.csv | 6 ++++++ api/datadoghq/v2alpha1/datadogagent_types.go | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 074c2d407..0a1b79917 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -15,6 +15,10 @@ core,github.com/DataDog/datadog-agent/pkg/util/uuid,Apache-2.0 core,github.com/DataDog/datadog-api-client-go/v2,Apache-2.0 core,github.com/DataDog/datadog-go/v5/statsd,MIT core,github.com/DataDog/datadog-operator,Apache-2.0 +core,github.com/DataDog/datadog-operator/api/datadoghq/common,Unknown +core,github.com/DataDog/datadog-operator/api/datadoghq/v1alpha1,Unknown +core,github.com/DataDog/datadog-operator/api/datadoghq/v2alpha1,Unknown +core,github.com/DataDog/datadog-operator/api/utils,Unknown core,github.com/DataDog/extendeddaemonset/api/v1alpha1,Apache-2.0 core,github.com/DataDog/go-libddwaf/v3,Apache-2.0 core,github.com/DataDog/go-sqllexer,MIT @@ -80,6 +84,7 @@ core,github.com/richardartoul/molecule/src/codec,Apache-2.0 core,github.com/richardartoul/molecule/src/protowire,BSD-3-Clause core,github.com/secure-systems-lab/go-securesystemslib/cjson,MIT core,github.com/shirou/gopsutil/v3,BSD-3-Clause +core,github.com/shoenig/go-m1cpu,MPL-2.0 core,github.com/spaolacci/murmur3,BSD-3-Clause core,github.com/spf13/afero,Apache-2.0 core,github.com/spf13/cast,MIT @@ -88,6 +93,7 @@ core,github.com/spf13/pflag,BSD-3-Clause core,github.com/stretchr/objx,MIT core,github.com/stretchr/testify,MIT core,github.com/tinylib/msgp/msgp,MIT +core,github.com/tklauser/go-sysconf,BSD-3-Clause core,github.com/x448/float16,MIT core,github.com/zorkian/go-datadog-api,BSD-3-Clause core,go.etcd.io/bbolt,MIT diff --git a/api/datadoghq/v2alpha1/datadogagent_types.go b/api/datadoghq/v2alpha1/datadogagent_types.go index d07817994..1c1187105 100644 --- a/api/datadoghq/v2alpha1/datadogagent_types.go +++ b/api/datadoghq/v2alpha1/datadogagent_types.go @@ -1163,9 +1163,6 @@ type DeploymentStatus struct { // GlobalConfig is a set of parameters that are used to configure all the components of the Datadog Operator. type GlobalConfig struct { - // TestString is a test string. - TestString *string `json:"testString,omitempty"` - // Credentials defines the Datadog credentials used to submit data to/query data from Datadog. Credentials *DatadogCredentials `json:"credentials,omitempty"` From f826e4e1ced4d2587e0fb94fe24b98a9ff76d596 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Mon, 16 Dec 2024 16:41:53 -0500 Subject: [PATCH 09/12] ci fixes --- LICENSE-3rdparty.csv | 2 -- go.mod | 2 +- hack/update-golang.sh | 2 +- test/e2e/go.mod | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 0a1b79917..8791acebf 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -84,7 +84,6 @@ core,github.com/richardartoul/molecule/src/codec,Apache-2.0 core,github.com/richardartoul/molecule/src/protowire,BSD-3-Clause core,github.com/secure-systems-lab/go-securesystemslib/cjson,MIT core,github.com/shirou/gopsutil/v3,BSD-3-Clause -core,github.com/shoenig/go-m1cpu,MPL-2.0 core,github.com/spaolacci/murmur3,BSD-3-Clause core,github.com/spf13/afero,Apache-2.0 core,github.com/spf13/cast,MIT @@ -93,7 +92,6 @@ core,github.com/spf13/pflag,BSD-3-Clause core,github.com/stretchr/objx,MIT core,github.com/stretchr/testify,MIT core,github.com/tinylib/msgp/msgp,MIT -core,github.com/tklauser/go-sysconf,BSD-3-Clause core,github.com/x448/float16,MIT core,github.com/zorkian/go-datadog-api,BSD-3-Clause core,go.etcd.io/bbolt,MIT diff --git a/go.mod b/go.mod index 38262e994..033533121 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-operator -go 1.22.0 +go 1.22 toolchain go1.22.7 diff --git a/hack/update-golang.sh b/hack/update-golang.sh index b7bca01c2..b2db8f6a0 100755 --- a/hack/update-golang.sh +++ b/hack/update-golang.sh @@ -105,7 +105,7 @@ for file in $go_mod_files; do go mod edit -go $new_minor_version $file go mod edit -toolchain go$GOVERSION $file parent_dir=$(dirname "$file") - cd $parent_dir && go mod tidy -v; cd $ROOT + cd $parent_dir; cd $ROOT else echo "Warning: $file not found, skipping." fi diff --git a/test/e2e/go.mod b/test/e2e/go.mod index 326085005..cac1763e4 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-operator/e2e -go 1.22.0 +go 1.22 toolchain go1.22.7 From d60f0a9758d349867e804371da0352a1acfa7c22 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Tue, 17 Dec 2024 12:49:01 -0500 Subject: [PATCH 10/12] update `make manager` --- Makefile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index d36506393..789a4d218 100644 --- a/Makefile +++ b/Makefile @@ -109,15 +109,11 @@ endef ##@ Deploy .PHONY: manager -manager: generate lint managergobuild ## Build manager binary +manager: sync generate lint managergobuild ## Build manager binary go build -ldflags '${LDFLAGS}' -o bin/$(PLATFORM)/manager cmd/main.go managergobuild: ## Builds only manager go binary go build -ldflags '${LDFLAGS}' -o bin/$(PLATFORM)/manager cmd/main.go -##@ Deploy - -manager: generate lint managergobuild ## Build manager binary - .PHONY: run run: generate lint manifests ## Run against the configured Kubernetes cluster in ~/.kube/config go run ./cmd/main.go @@ -319,9 +315,9 @@ verify-licenses: bin/$(PLATFORM)/go-licenses ## Verify licenses update-golang: hack/update-golang.sh -.PHONY: tidy -tidy: ## Run go tidy - go mod tidy -v +.PHONY: sync +sync: ## Run go work sync + go work sync kubectl-datadog: lint go build -ldflags '${LDFLAGS}' -o bin/kubectl-datadog ./cmd/kubectl-datadog/main.go From 45044535d4d368c6b87b83cb8c31e77e39f6a5b8 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Thu, 9 Jan 2025 13:47:30 -0500 Subject: [PATCH 11/12] update update-golang --- hack/update-golang.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/update-golang.sh b/hack/update-golang.sh index b2db8f6a0..30a9ae340 100755 --- a/hack/update-golang.sh +++ b/hack/update-golang.sh @@ -98,7 +98,7 @@ echo "Running go work sync..." go work sync # Update go.mod files -go_mod_files="$ROOT/go.mod $ROOT/test/e2e/go.mod" +go_mod_files="$ROOT/go.mod $ROOT/test/e2e/go.mod $ROOT/api/go.mod" for file in $go_mod_files; do if [[ -f $file ]]; then echo "Processing $file..." From 054710b6570c6035b652e8ce0a809624fadd3402 Mon Sep 17 00:00:00 2001 From: Sarah Wang Date: Thu, 9 Jan 2025 14:28:14 -0500 Subject: [PATCH 12/12] update go files --- api/go.mod | 12 +++++++----- api/go.sum | 8 ++++---- go.work.sum | 17 +++++------------ 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/api/go.mod b/api/go.mod index 3cb558681..9dbd64e18 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,8 @@ module github.com/DataDog/datadog-operator/api -go 1.22.0 +go 1.22 + +toolchain go1.22.7 require ( github.com/DataDog/datadog-api-client-go/v2 v2.27.0 @@ -50,11 +52,11 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect - golang.org/x/net v0.29.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.21.0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect - golang.org/x/text v0.18.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.6.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/api/go.sum b/api/go.sum index fdffdd844..69bf0bd19 100644 --- a/api/go.sum +++ b/api/go.sum @@ -50,11 +50,11 @@ go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= diff --git a/go.work.sum b/go.work.sum index f1a6e4c64..049a731d1 100644 --- a/go.work.sum +++ b/go.work.sum @@ -3173,8 +3173,6 @@ golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOM golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= -golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= -golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -3311,8 +3309,7 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -3359,8 +3356,7 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -3493,8 +3489,7 @@ golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2 h1:IRJeR9r1pYWsHKTRe/IInb7lYvbBVIqOgsX/u0mbOWY= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457 h1:zf5N6UOrA487eEFacMePxjXAJctxKmyjKUsjA11Uzuk= @@ -3509,8 +3504,7 @@ golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -3524,8 +3518,7 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=