🎨 Rearrange the code so we don't generate a CRD for the Rollout stub.

Author: coderanger

Makefile

@@ -40,7 +40,8 @@ deploy: manifests
 
 # Generate manifests e.g. CRD, RBAC etc.
 manifests: controller-gen
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/..." output:crd:artifacts:config=config/crd/bases
+	$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..."
 
 # Run go fmt against code
 fmt:

components/migrations.go

@@ -39,8 +39,8 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	"github.com/coderanger/migrations-operator/api/stubs/argoproj"
 	migrationsv1beta1 "github.com/coderanger/migrations-operator/api/v1beta1"
+	argoprojstubv1alpha1 "github.com/coderanger/migrations-operator/stubs/argoproj/v1alpha1"
 	"github.com/coderanger/migrations-operator/utils"
 	"github.com/coderanger/migrations-operator/webhook"
 )
@@ -333,7 +333,7 @@ func (_ *migrationsComponent) findSpecFor(ctx *cu.Context, obj cu.Object) *corev
 		return &v.Spec
 	case *appsv1.Deployment:
 		return &v.Spec.Template.Spec
-	case *argoproj.Rollout:
+	case *argoprojstubv1alpha1.Rollout:
 		if v.Spec.WorkloadRef != nil {
 			if v.Spec.WorkloadRef.Kind == "Deployment" {
 				deployment := appsv1.Deployment{}

components/migrations_test.go

@@ -30,8 +30,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/coderanger/migrations-operator/api/stubs/argoproj"
 	migrationsv1beta1 "github.com/coderanger/migrations-operator/api/v1beta1"
+	argoprojstubsv1alpha1 "github.com/coderanger/migrations-operator/stubs/argoproj/v1alpha1"
 )
 
 var _ = Describe("Migrations component", func() {
@@ -262,9 +262,9 @@ var _ = Describe("Migrations component", func() {
 
 	It("follows owner references for an argoproj.io rollout", func() {
 		truep := true
-		rollout := &argoproj.Rollout{
+		rollout := &argoprojstubsv1alpha1.Rollout{
 			ObjectMeta: metav1.ObjectMeta{Name: "testing"},
-			Spec: argoproj.RolloutSpec{
+			Spec: argoprojstubsv1alpha1.RolloutSpec{
 				Template: corev1.PodTemplateSpec{
 					Spec: corev1.PodSpec{
 						Containers: []corev1.Container{
@@ -309,13 +309,13 @@ var _ = Describe("Migrations component", func() {
 
 	It("follows owner references for an argoproj.io rollout with workloadref to deployment", func() {
 		truep := true
-		rollout := &argoproj.Rollout{
+		rollout := &argoprojstubsv1alpha1.Rollout{
 			ObjectMeta: metav1.ObjectMeta{Name: "testing"},
-			Spec: argoproj.RolloutSpec{
-				WorkloadRef: &argoproj.ObjectRef{
-					Name: "testing",
+			Spec: argoprojstubsv1alpha1.RolloutSpec{
+				WorkloadRef: &argoprojstubsv1alpha1.ObjectRef{
+					Name:       "testing",
 					APIVersion: "apps/v1",
-					Kind: "Deployment",
+					Kind:       "Deployment",
 				},
 			},
 		}

components/suite_test.go

@@ -26,8 +26,8 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	"github.com/coderanger/migrations-operator/api/stubs/argoproj"
 	migrationsv1beta1 "github.com/coderanger/migrations-operator/api/v1beta1"
+	argoprojstubsv1alpha1 "github.com/coderanger/migrations-operator/stubs/argoproj/v1alpha1"
 )
 
 var suiteHelper *cu.UnitSuiteHelper
@@ -45,6 +45,6 @@ var _ = BeforeSuite(func() {
 
 	suiteHelper = cu.Unit().
 		API(migrationsv1beta1.AddToScheme).
-		API(argoproj.AddToScheme).
+		API(argoprojstubsv1alpha1.AddToScheme).
 		MustBuild()
 })

main.go

@@ -28,10 +28,10 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
-	"github.com/coderanger/migrations-operator/api/stubs/argoproj"
 	migrationsv1beta1 "github.com/coderanger/migrations-operator/api/v1beta1"
 	"github.com/coderanger/migrations-operator/controllers"
 	"github.com/coderanger/migrations-operator/http"
+	argoprojstubv1alpha1 "github.com/coderanger/migrations-operator/stubs/argoproj/v1alpha1"
 	"github.com/coderanger/migrations-operator/webhook"
 	// +kubebuilder:scaffold:imports
 )
@@ -44,7 +44,7 @@ var (
 func init() {
 	_ = clientgoscheme.AddToScheme(scheme)
 
-	_ = argoproj.AddToScheme(scheme)
+	_ = argoprojstubv1alpha1.AddToScheme(scheme)
 	_ = migrationsv1beta1.AddToScheme(scheme)
 	// +kubebuilder:scaffold:scheme
 }

api/stubs/argoproj/groupversion_info.go …s/argoproj/v1alpha1/groupversion_info.goapi/stubs/argoproj/groupversion_info.go renamed to stubs/argoproj/v1alpha1/groupversion_info.go api/stubs/argoproj/groupversion_info.go renamed to stubs/argoproj/v1alpha1/groupversion_info.go

@@ -14,7 +14,7 @@ limitations under the License.
 
 //+kubebuilder:object:generate=true
 //+groupName=argoproj.io
-package argoproj
+package v1alpha1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"

api/stubs/argoproj/rollout_types.go stubs/argoproj/v1alpha1/rollout_types.goapi/stubs/argoproj/rollout_types.go renamed to stubs/argoproj/v1alpha1/rollout_types.go

@@ -12,7 +12,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package argoproj
+package v1alpha1
 
 import (
 	v1 "k8s.io/api/core/v1"