diff --git a/api/v1alpha1/groupversion_info.go b/src/api/v1alpha1/groupversion_info.go similarity index 100% rename from api/v1alpha1/groupversion_info.go rename to src/api/v1alpha1/groupversion_info.go diff --git a/api/v1alpha1/instrumentation_types.go b/src/api/v1alpha1/instrumentation_types.go similarity index 100% rename from api/v1alpha1/instrumentation_types.go rename to src/api/v1alpha1/instrumentation_types.go diff --git a/api/v1alpha1/instrumentation_webhook.go b/src/api/v1alpha1/instrumentation_webhook.go similarity index 100% rename from api/v1alpha1/instrumentation_webhook.go rename to src/api/v1alpha1/instrumentation_webhook.go diff --git a/api/v1alpha1/propagators.go b/src/api/v1alpha1/propagators.go similarity index 100% rename from api/v1alpha1/propagators.go rename to src/api/v1alpha1/propagators.go diff --git a/api/v1alpha1/samplers.go b/src/api/v1alpha1/samplers.go similarity index 100% rename from api/v1alpha1/samplers.go rename to src/api/v1alpha1/samplers.go diff --git a/api/v1alpha1/upgrade_strategy.go b/src/api/v1alpha1/upgrade_strategy.go similarity index 100% rename from api/v1alpha1/upgrade_strategy.go rename to src/api/v1alpha1/upgrade_strategy.go diff --git a/api/v1alpha1/webhook_suite_test.go b/src/api/v1alpha1/webhook_suite_test.go similarity index 100% rename from api/v1alpha1/webhook_suite_test.go rename to src/api/v1alpha1/webhook_suite_test.go diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/src/api/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from api/v1alpha1/zz_generated.deepcopy.go rename to src/api/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/autodetect/main.go b/src/autodetect/main.go similarity index 100% rename from pkg/autodetect/main.go rename to src/autodetect/main.go diff --git a/pkg/autodetect/main_test.go b/src/autodetect/main_test.go similarity index 97% rename from pkg/autodetect/main_test.go rename to src/autodetect/main_test.go index 322e9019..6323cf69 100644 --- a/pkg/autodetect/main_test.go +++ b/src/autodetect/main_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - "github.com/newrelic/k8s-agents-operator/pkg/autodetect" + "github.com/newrelic/k8s-agents-operator/src/autodetect" ) func TestDetectPlatformBasedOnAvailableAPIGroups(t *testing.T) { diff --git a/pkg/autodetect/openshiftroutes.go b/src/autodetect/openshiftroutes.go similarity index 100% rename from pkg/autodetect/openshiftroutes.go rename to src/autodetect/openshiftroutes.go diff --git a/pkg/constants/env.go b/src/constants/env.go similarity index 100% rename from pkg/constants/env.go rename to src/constants/env.go diff --git a/pkg/instrumentation/annotation.go b/src/instrumentation/annotation.go similarity index 100% rename from pkg/instrumentation/annotation.go rename to src/instrumentation/annotation.go diff --git a/pkg/instrumentation/dotnet.go b/src/instrumentation/dotnet.go similarity index 98% rename from pkg/instrumentation/dotnet.go rename to src/instrumentation/dotnet.go index cc9e5ef9..ba7993ec 100644 --- a/pkg/instrumentation/dotnet.go +++ b/src/instrumentation/dotnet.go @@ -21,7 +21,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) const ( diff --git a/pkg/instrumentation/golang.go b/src/instrumentation/golang.go similarity index 97% rename from pkg/instrumentation/golang.go rename to src/instrumentation/golang.go index fe45ad7f..9dd97476 100644 --- a/pkg/instrumentation/golang.go +++ b/src/instrumentation/golang.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) const ( diff --git a/pkg/instrumentation/helper.go b/src/instrumentation/helper.go similarity index 100% rename from pkg/instrumentation/helper.go rename to src/instrumentation/helper.go diff --git a/pkg/instrumentation/javaagent.go b/src/instrumentation/javaagent.go similarity index 97% rename from pkg/instrumentation/javaagent.go rename to src/instrumentation/javaagent.go index 1090745b..bec096f7 100644 --- a/pkg/instrumentation/javaagent.go +++ b/src/instrumentation/javaagent.go @@ -18,7 +18,7 @@ package instrumentation import ( corev1 "k8s.io/api/core/v1" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) const ( diff --git a/pkg/instrumentation/nodejs.go b/src/instrumentation/nodejs.go similarity index 97% rename from pkg/instrumentation/nodejs.go rename to src/instrumentation/nodejs.go index 9823e6b7..b37604aa 100644 --- a/pkg/instrumentation/nodejs.go +++ b/src/instrumentation/nodejs.go @@ -18,7 +18,7 @@ package instrumentation import ( corev1 "k8s.io/api/core/v1" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) const ( diff --git a/pkg/instrumentation/php.go b/src/instrumentation/php.go similarity index 98% rename from pkg/instrumentation/php.go rename to src/instrumentation/php.go index 46444809..b66278fe 100644 --- a/pkg/instrumentation/php.go +++ b/src/instrumentation/php.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) const ( diff --git a/pkg/instrumentation/podmutator.go b/src/instrumentation/podmutator.go similarity index 97% rename from pkg/instrumentation/podmutator.go rename to src/instrumentation/podmutator.go index 6c271a50..eed4d549 100644 --- a/pkg/instrumentation/podmutator.go +++ b/src/instrumentation/podmutator.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" - "github.com/newrelic/k8s-agents-operator/internal/webhookhandler" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/internal/webhookhandler" ) var ( diff --git a/pkg/instrumentation/python.go b/src/instrumentation/python.go similarity index 97% rename from pkg/instrumentation/python.go rename to src/instrumentation/python.go index d0e8ce19..2ae38b20 100644 --- a/pkg/instrumentation/python.go +++ b/src/instrumentation/python.go @@ -20,7 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) const ( diff --git a/pkg/instrumentation/sdk.go b/src/instrumentation/sdk.go similarity index 99% rename from pkg/instrumentation/sdk.go rename to src/instrumentation/sdk.go index 934f1249..cdaa7151 100644 --- a/pkg/instrumentation/sdk.go +++ b/src/instrumentation/sdk.go @@ -36,8 +36,8 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" - "github.com/newrelic/k8s-agents-operator/pkg/constants" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/constants" ) const ( diff --git a/pkg/instrumentation/upgrade/upgrade.go b/src/instrumentation/upgrade/upgrade.go similarity index 98% rename from pkg/instrumentation/upgrade/upgrade.go rename to src/instrumentation/upgrade/upgrade.go index e510b9f8..69d25985 100644 --- a/pkg/instrumentation/upgrade/upgrade.go +++ b/src/instrumentation/upgrade/upgrade.go @@ -24,7 +24,7 @@ import ( "github.com/go-logr/logr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) type InstrumentationUpgrade struct { diff --git a/pkg/instrumentation/upgrade/upgrade_suite_test.go b/src/instrumentation/upgrade/upgrade_suite_test.go similarity index 96% rename from pkg/instrumentation/upgrade/upgrade_suite_test.go rename to src/instrumentation/upgrade/upgrade_suite_test.go index 749d7839..3ea453a2 100644 --- a/pkg/instrumentation/upgrade/upgrade_suite_test.go +++ b/src/instrumentation/upgrade/upgrade_suite_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) var k8sClient client.Client diff --git a/pkg/instrumentation/upgrade/upgrade_test.go b/src/instrumentation/upgrade/upgrade_test.go similarity index 98% rename from pkg/instrumentation/upgrade/upgrade_test.go rename to src/instrumentation/upgrade/upgrade_test.go index 44af0cc5..dd1aa5b5 100644 --- a/pkg/instrumentation/upgrade/upgrade_test.go +++ b/src/instrumentation/upgrade/upgrade_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" ) func TestUpgrade(t *testing.T) { diff --git a/internal/config/change_handler.go b/src/internal/config/change_handler.go similarity index 100% rename from internal/config/change_handler.go rename to src/internal/config/change_handler.go diff --git a/internal/config/change_handler_test.go b/src/internal/config/change_handler_test.go similarity index 100% rename from internal/config/change_handler_test.go rename to src/internal/config/change_handler_test.go diff --git a/internal/config/main.go b/src/internal/config/main.go similarity index 98% rename from internal/config/main.go rename to src/internal/config/main.go index fb2f425a..9247c4d2 100644 --- a/internal/config/main.go +++ b/src/internal/config/main.go @@ -23,8 +23,8 @@ import ( "github.com/go-logr/logr" logf "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/newrelic/k8s-agents-operator/internal/version" - "github.com/newrelic/k8s-agents-operator/pkg/autodetect" + "github.com/newrelic/k8s-agents-operator/src/autodetect" + "github.com/newrelic/k8s-agents-operator/src/internal/version" ) const ( diff --git a/internal/config/main_test.go b/src/internal/config/main_test.go similarity index 95% rename from internal/config/main_test.go rename to src/internal/config/main_test.go index 0b5919cc..c22efd28 100644 --- a/internal/config/main_test.go +++ b/src/internal/config/main_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/newrelic/k8s-agents-operator/internal/config" - "github.com/newrelic/k8s-agents-operator/pkg/autodetect" + "github.com/newrelic/k8s-agents-operator/src/autodetect" + "github.com/newrelic/k8s-agents-operator/src/internal/config" ) func TestNewConfig(t *testing.T) { diff --git a/internal/config/options.go b/src/internal/config/options.go similarity index 96% rename from internal/config/options.go rename to src/internal/config/options.go index 591eab85..a3cf1f07 100644 --- a/internal/config/options.go +++ b/src/internal/config/options.go @@ -23,8 +23,8 @@ import ( "github.com/go-logr/logr" - "github.com/newrelic/k8s-agents-operator/internal/version" - "github.com/newrelic/k8s-agents-operator/pkg/autodetect" + "github.com/newrelic/k8s-agents-operator/src/autodetect" + "github.com/newrelic/k8s-agents-operator/src/internal/version" ) // Option represents one specific configuration option. diff --git a/internal/version/main.go b/src/internal/version/main.go similarity index 100% rename from internal/version/main.go rename to src/internal/version/main.go diff --git a/internal/version/main_test.go b/src/internal/version/main_test.go similarity index 100% rename from internal/version/main_test.go rename to src/internal/version/main_test.go diff --git a/internal/webhookhandler/webhookhandler.go b/src/internal/webhookhandler/webhookhandler.go similarity index 98% rename from internal/webhookhandler/webhookhandler.go rename to src/internal/webhookhandler/webhookhandler.go index 6c1b3e5c..29747d43 100644 --- a/internal/webhookhandler/webhookhandler.go +++ b/src/internal/webhookhandler/webhookhandler.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/webhook/admission" - "github.com/newrelic/k8s-agents-operator/internal/config" + "github.com/newrelic/k8s-agents-operator/src/internal/config" ) // +kubebuilder:webhook:path=/mutate-v1-pod,mutating=true,failurePolicy=ignore,groups="",resources=pods,verbs=create;update,versions=v1,name=mpod.kb.io,sideEffects=none,admissionReviewVersions=v1 diff --git a/internal/webhookhandler/webhookhandler_suite_test.go b/src/internal/webhookhandler/webhookhandler_suite_test.go similarity index 98% rename from internal/webhookhandler/webhookhandler_suite_test.go rename to src/internal/webhookhandler/webhookhandler_suite_test.go index e2fb97d5..3f6320a2 100644 --- a/internal/webhookhandler/webhookhandler_suite_test.go +++ b/src/internal/webhookhandler/webhookhandler_suite_test.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "github.com/newrelic/k8s-agents-operator/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/cmd/main.go b/src/main.go similarity index 96% rename from cmd/main.go rename to src/main.go index 3f55903a..9d434656 100644 --- a/cmd/main.go +++ b/src/main.go @@ -41,13 +41,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/webhook" - v1alpha1 "github.com/newrelic/k8s-agents-operator/api/v1alpha1" - "github.com/newrelic/k8s-agents-operator/internal/config" - "github.com/newrelic/k8s-agents-operator/internal/version" - "github.com/newrelic/k8s-agents-operator/internal/webhookhandler" - "github.com/newrelic/k8s-agents-operator/pkg/autodetect" - "github.com/newrelic/k8s-agents-operator/pkg/instrumentation" - instrumentationupgrade "github.com/newrelic/k8s-agents-operator/pkg/instrumentation/upgrade" + v1alpha1 "github.com/newrelic/k8s-agents-operator/src/api/v1alpha1" + "github.com/newrelic/k8s-agents-operator/src/autodetect" + "github.com/newrelic/k8s-agents-operator/src/instrumentation" + instrumentationupgrade "github.com/newrelic/k8s-agents-operator/src/instrumentation/upgrade" + "github.com/newrelic/k8s-agents-operator/src/internal/config" + "github.com/newrelic/k8s-agents-operator/src/internal/version" + "github.com/newrelic/k8s-agents-operator/src/internal/webhookhandler" // +kubebuilder:scaffold:imports )