Merge pull request #6141 from openshift-cloud-team/webhooks

Move webhooks out of api/v1beta1

Author: k8s-ci-robot

.dockerignore

@@ -7,6 +7,7 @@
 !/controllers/**
 !/exp/**
 !/feature/**
+!/internal/**
 !/pkg/**
 !/version/**
 !/util/**

.golangci.yml

@@ -231,9 +231,15 @@ linters:
       # within test files and test utils.
       - linters:
           - revive
-          - staticcheck
         path: _test\.go
         text: should not use dot imports
+      # Dot imports are used intentionally in internal/api and internal/webhooks
+      # to avoid verbose type prefixes when working with the v1beta1 API types.
+      - linters:
+          - revive
+          - staticcheck
+        path: internal/(api|webhooks|test)/
+        text: should not use dot imports
       # Exclude some packages or code to require comments, for example test code, or fake clients.
       - linters:
           - revive

Makefile

@@ -541,6 +541,7 @@ generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
 	$(CONTROLLER_GEN) \
 		paths=./api/... \
 		paths=./$(EXP_DIR)/api/... \
+		paths=./internal/webhooks/... \
 		crd:crdVersions=v1 \
 		rbac:roleName=base-manager-role \
 		output:crd:dir=$(CRD_ROOT) \

api/v1beta1/azureasomanagedcluster_types.go

@@ -99,5 +99,5 @@ type AzureASOManagedClusterList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureASOManagedCluster{}, &AzureASOManagedClusterList{})
+	objectTypes = append(objectTypes, &AzureASOManagedCluster{}, &AzureASOManagedClusterList{})
 }

api/v1beta1/azureasomanagedclustertemplate_types.go

@@ -59,5 +59,5 @@ type AzureASOManagedClusterTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureASOManagedClusterTemplate{}, &AzureASOManagedClusterTemplateList{})
+	objectTypes = append(objectTypes, &AzureASOManagedClusterTemplate{}, &AzureASOManagedClusterTemplateList{})
 }

api/v1beta1/azureasomanagedcontrolplane_types.go

@@ -87,5 +87,5 @@ type AzureASOManagedControlPlaneList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureASOManagedControlPlane{}, &AzureASOManagedControlPlaneList{})
+	objectTypes = append(objectTypes, &AzureASOManagedControlPlane{}, &AzureASOManagedControlPlaneList{})
 }

api/v1beta1/azureasomanagedcontrolplanetemplate_types.go

@@ -64,5 +64,5 @@ type AzureASOManagedControlPlaneTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureASOManagedControlPlaneTemplate{}, &AzureASOManagedControlPlaneTemplateList{})
+	objectTypes = append(objectTypes, &AzureASOManagedControlPlaneTemplate{}, &AzureASOManagedControlPlaneTemplateList{})
 }

api/v1beta1/azureasomanagedmachinepool_types.go

@@ -82,5 +82,5 @@ type AzureASOManagedMachinePoolList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureASOManagedMachinePool{}, &AzureASOManagedMachinePoolList{})
+	objectTypes = append(objectTypes, &AzureASOManagedMachinePool{}, &AzureASOManagedMachinePoolList{})
 }

api/v1beta1/azureasomanagedmachinepooltemplate_types.go

@@ -63,5 +63,5 @@ type AzureASOManagedMachinePoolTemplateList struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureASOManagedMachinePoolTemplate{}, &AzureASOManagedMachinePoolTemplateList{})
+	objectTypes = append(objectTypes, &AzureASOManagedMachinePoolTemplate{}, &AzureASOManagedMachinePoolTemplateList{})
 }

api/v1beta1/azurecluster_types.go

@@ -134,5 +134,5 @@ func (c *AzureCluster) SetFutures(futures Futures) {
 }
 
 func init() {
-	SchemeBuilder.Register(&AzureCluster{}, &AzureClusterList{})
+	objectTypes = append(objectTypes, &AzureCluster{}, &AzureClusterList{})
 }