finalize migration to multigroup

DataDog · Jul 4, 2024 · 7799ad8 · 7799ad8
1 parent e33e114
commit 7799ad8
Show file tree

Hide file tree

Showing 25 changed files with 41 additions and 62 deletions.
diff --git a/Makefile b/Makefile
@@ -178,7 +178,7 @@ install-tools: bin/$(PLATFORM)/golangci-lint bin/$(PLATFORM)/operator-sdk bin/$(
 
 .PHONY: generate-openapi
 generate-openapi: bin/$(PLATFORM)/openapi-gen
-	bin/$(PLATFORM)/openapi-gen --logtostderr=true -o "" -i ./api/datadoghq/v1alpha1 -O zz_generated.openapi -p ./api/datadoghq/v1alpha1 -h ./hack/boilerplate.go.txt -r "-"
+	bin/$(PLATFORM)/openapi-gen --logtostderr=true -o "" -i ./apis/datadoghq/v1alpha1 -O zz_generated.openapi -p ./apis/datadoghq/v1alpha1 -h ./hack/boilerplate.go.txt -r "-"
 
 .PHONY: patch-crds
 patch-crds: bin/$(PLATFORM)/yq

diff --git a/PROJECT b/PROJECT
@@ -10,7 +10,7 @@ resources:
   group: datadoghq
   kind: WatermarkPodAutoscaler
   # TODO(user): Update the package path for your API if the below value is incorrect.
-  path: github.com/DataDog/watermarkpodautoscaler/api/v1alpha1
+  path: github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1
   version: v1alpha1
 version: "3"
 plugins:

diff --git a/api/v1alpha1/zz_generated.openapi.go b/api/v1alpha1/zz_generated.openapi.go
diff --git a/api/datadoghq/v1alpha1/const.go → apis/datadoghq/v1alpha1/const.go b/api/datadoghq/v1alpha1/const.go → apis/datadoghq/v1alpha1/const.go
diff --git a/api/datadoghq/v1alpha1/doc.go → apis/datadoghq/v1alpha1/doc.go b/api/datadoghq/v1alpha1/doc.go → apis/datadoghq/v1alpha1/doc.go
diff --git a/api/datadoghq/v1alpha1/groupversion_info.go → apis/datadoghq/v1alpha1/groupversion_info.go b/api/datadoghq/v1alpha1/groupversion_info.go → apis/datadoghq/v1alpha1/groupversion_info.go
diff --git a/api/datadoghq/v1alpha1/new.go → apis/datadoghq/v1alpha1/new.go b/api/datadoghq/v1alpha1/new.go → apis/datadoghq/v1alpha1/new.go
diff --git a/api/datadoghq/v1alpha1/register.go → apis/datadoghq/v1alpha1/register.go b/api/datadoghq/v1alpha1/register.go → apis/datadoghq/v1alpha1/register.go
diff --git a/api/datadoghq/v1alpha1/test/new.go → apis/datadoghq/v1alpha1/test/new.go b/api/datadoghq/v1alpha1/test/new.go → apis/datadoghq/v1alpha1/test/new.go
@@ -9,7 +9,7 @@ package test
 import (
 	"time"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/...1alpha1/watermarkpodautoscaler_default.go → ...1alpha1/watermarkpodautoscaler_default.go b/...1alpha1/watermarkpodautoscaler_default.go → ...1alpha1/watermarkpodautoscaler_default.go
diff --git a/.../v1alpha1/watermarkpodautoscaler_types.go → .../v1alpha1/watermarkpodautoscaler_types.go b/.../v1alpha1/watermarkpodautoscaler_types.go → .../v1alpha1/watermarkpodautoscaler_types.go
diff --git a/...tadoghq/v1alpha1/zz_generated.deepcopy.go → ...tadoghq/v1alpha1/zz_generated.deepcopy.go b/...tadoghq/v1alpha1/zz_generated.deepcopy.go → ...tadoghq/v1alpha1/zz_generated.deepcopy.go
diff --git a/...atadoghq/v1alpha1/zz_generated.openapi.go → ...atadoghq/v1alpha1/zz_generated.openapi.go b/...atadoghq/v1alpha1/zz_generated.openapi.go → ...atadoghq/v1alpha1/zz_generated.openapi.go
diff --git a/cmd/kubectl-wpa/app/common/client.go b/cmd/kubectl-wpa/app/common/client.go
@@ -13,7 +13,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 )
 
 // NewClient returns new client instance.

diff --git a/cmd/kubectl-wpa/app/dryrun/dryrun.go b/cmd/kubectl-wpa/app/dryrun/dryrun.go
@@ -19,7 +19,7 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/watermarkpodautoscaler/cmd/kubectl-wpa/app/common"
 )
 

diff --git a/controllers/datadoghq/finalizer.go b/controllers/datadoghq/finalizer.go
@@ -8,7 +8,7 @@ package controllers
 import (
 	"context"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/watermarkpodautoscaler/pkg/util"
 	logr "github.com/go-logr/logr"
 )

diff --git a/controllers/datadoghq/metrics.go b/controllers/datadoghq/metrics.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 
 	"github.com/prometheus/client_golang/prometheus"
 

diff --git a/controllers/datadoghq/replica_calculator.go b/controllers/datadoghq/replica_calculator.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/watermarkpodautoscaler/pkg/math32"
 
 	metricsclient "github.com/DataDog/watermarkpodautoscaler/third_party/kubernetes/pkg/controller/podautoscaler/metrics"

diff --git a/controllers/datadoghq/replica_calculator_test.go b/controllers/datadoghq/replica_calculator_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/watermarkpodautoscaler/third_party/kubernetes/pkg/controller/podautoscaler/metrics"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/controllers/datadoghq/test/suite_test.go b/controllers/datadoghq/test/suite_test.go
@@ -28,7 +28,7 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	controllers "github.com/DataDog/watermarkpodautoscaler/controllers/datadoghq"
 	"github.com/DataDog/watermarkpodautoscaler/controllers/datadoghq/test/utils"
 	// +kubebuilder:scaffold:imports

diff --git a/controllers/datadoghq/test/watermarkpodautoscaler_controller_test.go b/controllers/datadoghq/test/watermarkpodautoscaler_controller_test.go
@@ -18,8 +18,8 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1/test"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1/test"
 )
 
 var _ = Describe("WatermarkPodAutoscaler Controller", func() {

diff --git a/controllers/datadoghq/test/watermarkpodautoscaler_e2e_test.go b/controllers/datadoghq/test/watermarkpodautoscaler_e2e_test.go
@@ -28,8 +28,8 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
-	wpatest "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1/test"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
+	wpatest "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1/test"
 	"github.com/DataDog/watermarkpodautoscaler/pkg/util"
 	"github.com/DataDog/watermarkpodautoscaler/test/e2e/metricsserver"
 	"github.com/DataDog/watermarkpodautoscaler/test/e2e/utils"

diff --git a/controllers/datadoghq/watermarkpodautoscaler_controller.go b/controllers/datadoghq/watermarkpodautoscaler_controller.go
@@ -52,7 +52,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	monitorv1alpha1 "github.com/DataDog/datadog-operator/apis/datadoghq/v1alpha1"
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 )
 
 const (

diff --git a/controllers/datadoghq/watermarkpodautoscaler_controller_test.go b/controllers/datadoghq/watermarkpodautoscaler_controller_test.go
@@ -15,8 +15,8 @@ import (
 	"time"
 
 	monitorv1alpha1 "github.com/DataDog/datadog-operator/apis/datadoghq/v1alpha1"
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
-	"github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1/test"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1/test"
 	"github.com/go-logr/logr"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"

diff --git a/main.go b/main.go
@@ -25,7 +25,7 @@ import (
 	ctrlzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	monitorv1alpha1 "github.com/DataDog/datadog-operator/apis/datadoghq/v1alpha1"
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/datadoghq/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	controllers "github.com/DataDog/watermarkpodautoscaler/controllers/datadoghq"
 	"github.com/DataDog/watermarkpodautoscaler/pkg/config"
 	"github.com/DataDog/watermarkpodautoscaler/pkg/version"