Move webhooks into pkg/webhooks

Moves webhooks from api to pkg/webhooks making only mechanical code
changes except for the removal of the defaulting webhooks, because they
weren't used. This results in there now being no mutating webhook
configured.

NOTE(stephenfin): There were a lot of conflicts here. These were mostly
mitigated by faking the addition of v1alpha8, which moved the webhooks
to the 'api/v1alpha8' package (commit 750b84d), followed by the
subsequent rename of this package to v1beta1 (commit e9fb53c), for
the webhook files and tests. This still resulted in some merge conflicts
due the v1alpha8 changes such as 564b6bd and 4368c4f (which we
obviously don't want to include here) but it made the backport much
simpler.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

(cherry picked from commit 750b84d)

Author: stephenfin

Makefile

@@ -267,7 +267,7 @@ generate-go: $(MOCKGEN)
 .PHONY: generate-manifests
 generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 	$(CONTROLLER_GEN) \
-		paths=./api/... \
+		paths=./pkg/webhooks/... \
 		crd:crdVersions=v1 \
 		output:crd:dir=$(CRD_ROOT) \
 		output:webhook:dir=$(WEBHOOK_ROOT) \

api/v1alpha5/conversion.go

@@ -20,10 +20,9 @@ import (
 	"strings"
 
 	conversion "k8s.io/apimachinery/pkg/conversion"
+	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
-
-	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
 )
 
 var _ ctrlconversion.Convertible = &OpenStackCluster{}

api/v1alpha5/conversion_test.go

@@ -22,9 +22,8 @@ import (
 	"github.com/onsi/gomega"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
-	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
-
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
+	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 func TestConvertFrom(t *testing.T) {

api/v1alpha6/conversion.go

@@ -21,10 +21,9 @@ import (
 	"strings"
 
 	apiconversion "k8s.io/apimachinery/pkg/conversion"
-	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
-
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/conversion"
+	ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 const trueString = "true"

api/v1alpha6/conversion_test.go

@@ -26,11 +26,10 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/utils/pointer"
-	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
-
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7"
 	testhelpers "sigs.k8s.io/cluster-api-provider-openstack/test/helpers"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 // Setting this to false to avoid running tests in parallel. Only for use in development.

api/v1alpha7/identity_types.go

@@ -16,8 +16,6 @@ limitations under the License.
 
 package v1alpha7
 
-const defaultIdentityRefKind = "Secret"
-
 // OpenStackIdentityReference is a reference to an infrastructure
 // provider identity to be used to provision cluster resources.
 type OpenStackIdentityReference struct {