Migrate to kubebuilder multigroup support

Dockerfile

@@ -11,7 +11,7 @@ RUN go mod download
 
 # Copy the go source
 COPY main.go main.go
-COPY api/ api/
+COPY apis/ apis/
 COPY controllers/ controllers/
 COPY pkg/ pkg/
 COPY third_party/ third_party/

Makefile

@@ -55,7 +55,7 @@ e2e: manager manifests verify-license goe2e
 
 # Runs e2e tests (expects a configured cluster)
 goe2e:
-	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test --tags=e2e ./controllers/test
+	KUBEBUILDER_ASSETS="$(ROOT)/bin/$(PLATFORM)/" go test --tags=e2e ./controllers/datadoghq/test
 
 # Build manager binary
 .PHONY: manager
@@ -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/v1alpha1 -O zz_generated.openapi -p ./api/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

PROJECT

@@ -1,17 +1,29 @@
 domain: datadoghq.com
-layout: go.kubebuilder.io/v2
+layout:
+- go.kubebuilder.io/v3
+multigroup: true
+plugins:
+  manifests.sdk.operatorframework.io/v2: {}
+  scorecard.sdk.operatorframework.io/v2: {}
 projectName: watermarkpodautoscaler
 repo: github.com/DataDog/watermarkpodautoscaler
 resources:
--
-  # TODO(user): Uncomment the below line if this resource implements a controller, else delete it.
-  # controller: true
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
   domain: datadoghq.com
   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
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: datadoghq.com
+  group: datadoghq
+  kind: RecommendWatermarkPodAutoscaler
+  path: github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1
   version: v1alpha1
 version: "3"
-plugins:
-  go.sdk.operatorframework.io/v2-alpha: {}

api/v1alpha1/test/new.go → apis/datadoghq/v1alpha1/test/new.go

@@ -9,7 +9,7 @@ package test
 import (
 	"time"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

bundle.Dockerfile

@@ -9,7 +9,7 @@ LABEL operators.operatorframework.io.bundle.channels.v1=alpha
 LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
 LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.23.0
 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
-LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2
+LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3
 
 # Labels for testing.
 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1

bundle/manifests/watermarkpodautoscaler.clusterserviceversion.yaml

@@ -42,7 +42,7 @@ metadata:
       ]
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.23.0
-    operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
+    operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: watermarkpodautoscaler.v0.5.2
   namespace: placeholder
 spec:

bundle/metadata/annotations.yaml

@@ -8,7 +8,7 @@ annotations:
   operators.operatorframework.io.bundle.channel.default.v1: alpha
   operators.operatorframework.io.metrics.builder: operator-sdk-v1.23.0
   operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
-  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2
+  operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v3
 
   # Annotations for testing.
   operators.operatorframework.io.test.mediatype.v1: scorecard+v1

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/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 )
 
 // NewClient returns new client instance.

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/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/watermarkpodautoscaler/cmd/kubectl-wpa/app/common"
 )
 

config/manifests/bases/watermarkpodautoscaler.clusterserviceversion.yaml

@@ -40,7 +40,7 @@ metadata:
       ]
     capabilities: Basic Install
     operators.operatorframework.io/builder: operator-sdk-v1.23.0
-    operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
+    operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
   name: watermarkpodautoscaler.v0.6.0-rc.1
   namespace: placeholder
 spec:

controllers/datadoghq/doc.go

@@ -0,0 +1,2 @@
+// Package datadoghq containers all the WatermarkPodAutoscaler controller logic.
+package datadoghq

controllers/finalizer.go → controllers/datadoghq/finalizer.go

@@ -3,12 +3,12 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-package controllers
+package datadoghq
 
 import (
 	"context"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 	"github.com/DataDog/watermarkpodautoscaler/pkg/util"
 	logr "github.com/go-logr/logr"
 )

controllers/metrics.go → controllers/datadoghq/metrics.go

@@ -3,13 +3,13 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-package controllers
+package datadoghq
 
 import (
 	"os"
 	"strings"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/v1alpha1"
+	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
 
 	"github.com/prometheus/client_golang/prometheus"
 

controllers/replica_calculator.go → controllers/datadoghq/replica_calculator.go

@@ -3,15 +3,15 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-package controllers
+package datadoghq
 
 import (
 	"fmt"
 	"math"
 	"strings"
 	"time"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/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"

controllers/replica_calculator_test.go → controllers/datadoghq/replica_calculator_test.go

@@ -3,14 +3,14 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
-package controllers
+package datadoghq
 
 import (
 	"fmt"
 	"testing"
 	"time"
 
-	"github.com/DataDog/watermarkpodautoscaler/api/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"

controllers/test/suite_test.go → controllers/datadoghq/test/suite_test.go

@@ -15,6 +15,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -27,9 +28,9 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	datadoghqv1alpha1 "github.com/DataDog/watermarkpodautoscaler/api/v1alpha1"
-	"github.com/DataDog/watermarkpodautoscaler/controllers"
-	"github.com/DataDog/watermarkpodautoscaler/controllers/test/utils"
+	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
 )
 
@@ -68,7 +69,7 @@ var _ = BeforeSuite(func(done Done) {
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
 		UseExistingCluster: datadoghqv1alpha1.NewBool(testConfig.useExistingCluster),
-		CRDDirectoryPaths:  []string{filepath.Join("../..", "config", "crd", "bases", testConfig.crdVersion)},
+		CRDDirectoryPaths:  []string{filepath.Join("../../..", "config", "crd", "bases", testConfig.crdVersion)},
 	}
 
 	// Not present in envtest.Environment

controllers/test/watermarkpodautoscaler_controller_test.go → 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/v1alpha1"
-	"github.com/DataDog/watermarkpodautoscaler/api/v1alpha1/test"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1"
+	"github.com/DataDog/watermarkpodautoscaler/apis/datadoghq/v1alpha1/test"
 )
 
 var _ = Describe("WatermarkPodAutoscaler Controller", func() {