api: move to an explicit group dir

Signed-off-by: Steve Kuznetsov <[email protected]>
sdminonne · Nov 14, 2023 · 1af078f · 1af078f
1 parent fa87d0f
commit 1af078f
Show file tree

Hide file tree

Showing 273 changed files with 431 additions and 256 deletions.
diff --git a/Makefile b/Makefile
@@ -90,9 +90,9 @@ api: hypershift-api cluster-api cluster-api-provider-aws cluster-api-provider-ib
 
 .PHONY: hypershift-api
 hypershift-api: $(CONTROLLER_GEN)
-	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/..."
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./api/hypershift/..."
 	rm -rf cmd/install/assets/hypershift-operator/*.yaml
-	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
+	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./api/hypershift/..." output:crd:artifacts:config=cmd/install/assets/hypershift-operator
 
 .PHONY: cluster-api
 cluster-api: $(CONTROLLER_GEN)

diff --git a/api/fixtures/example.go b/api/fixtures/example.go
@@ -13,8 +13,8 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/pointer"
 
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/api/util/ipnet"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
 
 	configv1 "github.com/openshift/api/config/v1"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/api/fixtures/example_aws.go b/api/fixtures/example_aws.go
@@ -1,7 +1,7 @@
 package fixtures
 
 import (
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 type ExampleAWSOptions struct {

diff --git a/api/fixtures/example_ibmcloud_powervs.go b/api/fixtures/example_ibmcloud_powervs.go
@@ -4,7 +4,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 type ExamplePowerVSOptions struct {

diff --git a/api/fixtures/example_kubevirt.go b/api/fixtures/example_kubevirt.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	apiresource "k8s.io/apimachinery/pkg/api/resource"
 )

diff --git a/api/v1alpha1/capi_types.go → api/hypershift/v1alpha1/capi_types.go b/api/v1alpha1/capi_types.go → api/hypershift/v1alpha1/capi_types.go
diff --git a/api/v1alpha1/clusterconfig.go → api/hypershift/v1alpha1/clusterconfig.go b/api/v1alpha1/clusterconfig.go → api/hypershift/v1alpha1/clusterconfig.go
diff --git a/api/v1alpha1/conditions.go → api/hypershift/v1alpha1/conditions.go b/api/v1alpha1/conditions.go → api/hypershift/v1alpha1/conditions.go
diff --git a/api/v1alpha1/doc.go → api/hypershift/v1alpha1/doc.go b/api/v1alpha1/doc.go → api/hypershift/v1alpha1/doc.go
diff --git a/api/v1alpha1/endpointservice_types.go → ...ershift/v1alpha1/endpointservice_types.go b/api/v1alpha1/endpointservice_types.go → ...ershift/v1alpha1/endpointservice_types.go
diff --git a/api/v1alpha1/groupversion_info.go → api/hypershift/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go → api/hypershift/v1alpha1/groupversion_info.go
diff --git a/api/v1alpha1/hosted_controlplane.go → ...ypershift/v1alpha1/hosted_controlplane.go b/api/v1alpha1/hosted_controlplane.go → ...ypershift/v1alpha1/hosted_controlplane.go
diff --git a/api/v1alpha1/hostedcluster_types.go → ...ypershift/v1alpha1/hostedcluster_types.go b/api/v1alpha1/hostedcluster_types.go → ...ypershift/v1alpha1/hostedcluster_types.go
diff --git a/api/v1alpha1/nodepool_types.go → api/hypershift/v1alpha1/nodepool_types.go b/api/v1alpha1/nodepool_types.go → api/hypershift/v1alpha1/nodepool_types.go
diff --git a/api/v1alpha1/zz_conversion.go → api/hypershift/v1alpha1/zz_conversion.go b/api/v1alpha1/zz_conversion.go → api/hypershift/v1alpha1/zz_conversion.go
@@ -8,9 +8,9 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/api/util/configrefs"
 	"github.com/openshift/hypershift/api/util/ipnet"
-	"github.com/openshift/hypershift/api/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/api/v1alpha1/zz_conversion_test.go → ...hypershift/v1alpha1/zz_conversion_test.go b/api/v1alpha1/zz_conversion_test.go → ...hypershift/v1alpha1/zz_conversion_test.go
@@ -12,9 +12,9 @@ import (
 	"github.com/google/go-cmp/cmp"
 	fuzz "github.com/google/gofuzz"
 	configv1 "github.com/openshift/api/config/v1"
+	"github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/api/util/configrefs"
 	"github.com/openshift/hypershift/api/util/ipnet"
-	"github.com/openshift/hypershift/api/v1beta1"
 	"github.com/openshift/hypershift/support/conversiontest"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"

diff --git a/api/v1alpha1/zz_generated.deepcopy.go → ...ershift/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go → ...ershift/v1alpha1/zz_generated.deepcopy.go
diff --git a/api/v1beta1/capi_types.go → api/hypershift/v1beta1/capi_types.go b/api/v1beta1/capi_types.go → api/hypershift/v1beta1/capi_types.go
diff --git a/api/v1beta1/clusterconfig.go → api/hypershift/v1beta1/clusterconfig.go b/api/v1beta1/clusterconfig.go → api/hypershift/v1beta1/clusterconfig.go
diff --git a/api/v1beta1/conversion.go → api/hypershift/v1beta1/conversion.go b/api/v1beta1/conversion.go → api/hypershift/v1beta1/conversion.go
diff --git a/api/v1beta1/doc.go → api/hypershift/v1beta1/doc.go b/api/v1beta1/doc.go → api/hypershift/v1beta1/doc.go
diff --git a/api/v1beta1/endpointservice_types.go → ...pershift/v1beta1/endpointservice_types.go b/api/v1beta1/endpointservice_types.go → ...pershift/v1beta1/endpointservice_types.go
diff --git a/api/v1beta1/groupversion_info.go → api/hypershift/v1beta1/groupversion_info.go b/api/v1beta1/groupversion_info.go → api/hypershift/v1beta1/groupversion_info.go
diff --git a/api/v1beta1/hosted_controlplane.go → ...hypershift/v1beta1/hosted_controlplane.go b/api/v1beta1/hosted_controlplane.go → ...hypershift/v1beta1/hosted_controlplane.go
diff --git a/api/v1beta1/hostedcluster_conditions.go → ...shift/v1beta1/hostedcluster_conditions.go b/api/v1beta1/hostedcluster_conditions.go → ...shift/v1beta1/hostedcluster_conditions.go
diff --git a/api/v1beta1/hostedcluster_types.go → ...hypershift/v1beta1/hostedcluster_types.go b/api/v1beta1/hostedcluster_types.go → ...hypershift/v1beta1/hostedcluster_types.go
diff --git a/api/v1beta1/nodepool_conditions.go → ...hypershift/v1beta1/nodepool_conditions.go b/api/v1beta1/nodepool_conditions.go → ...hypershift/v1beta1/nodepool_conditions.go
diff --git a/api/v1beta1/nodepool_types.go → api/hypershift/v1beta1/nodepool_types.go b/api/v1beta1/nodepool_types.go → api/hypershift/v1beta1/nodepool_types.go
diff --git a/api/v1beta1/zz_generated.deepcopy.go → ...pershift/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go → ...pershift/v1beta1/zz_generated.deepcopy.go
diff --git a/api/scheme.go b/api/scheme.go
@@ -11,8 +11,8 @@ import (
 	routev1 "github.com/openshift/api/route/v1"
 	securityv1 "github.com/openshift/api/security/v1"
 	agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
-	hyperv1alpha1 "github.com/openshift/hypershift/api/v1alpha1"
-	hyperv1beta1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1alpha1 "github.com/openshift/hypershift/api/hypershift/v1alpha1"
+	hyperv1beta1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/support/rhobsmonitoring"
 	prometheusoperatorv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"

diff --git a/api/util/configrefs/refs_test.go b/api/util/configrefs/refs_test.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	configv1 "github.com/openshift/api/config/v1"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 func TestKnownConfigMapRefs(t *testing.T) {

diff --git a/cmd/bastion/aws/create.go b/cmd/bastion/aws/create.go
@@ -17,7 +17,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/retry"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	awsutil "github.com/openshift/hypershift/cmd/infra/aws/util"
 	"github.com/openshift/hypershift/cmd/util"
 )

diff --git a/cmd/bastion/aws/destroy.go b/cmd/bastion/aws/destroy.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	awsutil "github.com/openshift/hypershift/cmd/infra/aws/util"
 	"github.com/openshift/hypershift/cmd/util"
 )

diff --git a/cmd/cluster/aws/create.go b/cmd/cluster/aws/create.go
@@ -7,7 +7,7 @@ import (
 	"os"
 
 	apifixtures "github.com/openshift/hypershift/api/fixtures"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/cluster/core"
 	awsinfra "github.com/openshift/hypershift/cmd/infra/aws"
 	"github.com/openshift/hypershift/cmd/util"

diff --git a/cmd/cluster/cluster.go b/cmd/cluster/cluster.go
@@ -3,7 +3,7 @@ package cluster
 import (
 	"time"
 
-	"github.com/openshift/hypershift/api/v1beta1"
+	"github.com/openshift/hypershift/api/hypershift/v1beta1"
 
 	"github.com/spf13/cobra"
 

diff --git a/cmd/cluster/core/create.go b/cmd/cluster/core/create.go
@@ -25,7 +25,7 @@ import (
 	"github.com/blang/semver"
 	"github.com/go-logr/logr"
 	apifixtures "github.com/openshift/hypershift/api/fixtures"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/util"
 	"github.com/openshift/hypershift/cmd/version"
 	hyperapi "github.com/openshift/hypershift/support/api"

diff --git a/cmd/cluster/core/destroy.go b/cmd/cluster/core/destroy.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/go-logr/logr"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/util"
 	v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/cmd/cluster/core/dump.go b/cmd/cluster/core/dump.go
@@ -40,7 +40,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	hyperapi "github.com/openshift/hypershift/api"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/log"
 	"github.com/openshift/hypershift/cmd/util"
 	"github.com/openshift/hypershift/hypershift-operator/controllers/manifests"

diff --git a/cmd/cluster/kubevirt/create.go b/cmd/cluster/kubevirt/create.go
@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 
 	apifixtures "github.com/openshift/hypershift/api/fixtures"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/cluster/core"
 	"github.com/openshift/hypershift/support/infraid"
 	corev1 "k8s.io/api/core/v1"

diff --git a/cmd/cluster/powervs/create.go b/cmd/cluster/powervs/create.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 
 	apifixtures "github.com/openshift/hypershift/api/fixtures"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/cluster/core"
 	powervsinfra "github.com/openshift/hypershift/cmd/infra/powervs"
 	"github.com/openshift/hypershift/support/infraid"

diff --git a/cmd/consolelogs/aws/getlogs.go b/cmd/consolelogs/aws/getlogs.go
@@ -14,7 +14,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	awsutil "github.com/openshift/hypershift/cmd/infra/aws/util"
 	"github.com/openshift/hypershift/cmd/log"
 	"github.com/openshift/hypershift/cmd/util"

diff --git a/cmd/infra/aws/create_iam.go b/cmd/infra/aws/create_iam.go
@@ -16,7 +16,7 @@ import (
 
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	awsutil "github.com/openshift/hypershift/cmd/infra/aws/util"
 	"github.com/openshift/hypershift/cmd/log"
 	"github.com/openshift/hypershift/cmd/util"

diff --git a/cmd/install/assets/hypershift_operator.go b/cmd/install/assets/hypershift_operator.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"github.com/google/uuid"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/pkg/version"
 	"github.com/openshift/hypershift/support/images"
 	"github.com/openshift/hypershift/support/metrics"

diff --git a/cmd/install/assets/hypershift_operator_test.go b/cmd/install/assets/hypershift_operator_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/cmd/install/install.go b/cmd/install/install.go
@@ -39,7 +39,7 @@ import (
 
 	imageapi "github.com/openshift/api/image/v1"
 	hyperapi "github.com/openshift/hypershift/api"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/install/assets"
 	"github.com/openshift/hypershift/cmd/util"
 	"github.com/openshift/hypershift/cmd/version"

diff --git a/cmd/install/install_test.go b/cmd/install/install_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	. "github.com/onsi/gomega"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 )
 
 func TestOptions_Validate(t *testing.T) {

diff --git a/cmd/kubeconfig/create.go b/cmd/kubeconfig/create.go
@@ -16,7 +16,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/util"
 )
 

diff --git a/cmd/nodepool/agent/create.go b/cmd/nodepool/agent/create.go
@@ -6,7 +6,7 @@ import (
 	"github.com/spf13/cobra"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/nodepool/core"
 )
 

diff --git a/cmd/nodepool/aws/create.go b/cmd/nodepool/aws/create.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/nodepool/core"
 	"github.com/spf13/cobra"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/cmd/nodepool/azure/create.go b/cmd/nodepool/azure/create.go
@@ -6,7 +6,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/log"
 	"github.com/openshift/hypershift/cmd/nodepool/core"
 	"github.com/spf13/cobra"

diff --git a/cmd/nodepool/core/create.go b/cmd/nodepool/core/create.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/log"
 	"github.com/openshift/hypershift/cmd/util"
 	hyperapi "github.com/openshift/hypershift/support/api"

diff --git a/cmd/nodepool/create.go b/cmd/nodepool/create.go
@@ -1,7 +1,7 @@
 package nodepool
 
 import (
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/spf13/cobra"
 
 	"github.com/openshift/hypershift/cmd/nodepool/agent"

diff --git a/cmd/nodepool/kubevirt/create.go b/cmd/nodepool/kubevirt/create.go
@@ -8,7 +8,7 @@ import (
 	"github.com/spf13/cobra"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/nodepool/core"
 )
 

diff --git a/cmd/nodepool/powervs/create.go b/cmd/nodepool/powervs/create.go
@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/log"
 	"github.com/openshift/hypershift/cmd/nodepool/core"
 )

diff --git a/cmd/util/v1alpha1_wrapper.go b/cmd/util/v1alpha1_wrapper.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	hyperv1alpha1 "github.com/openshift/hypershift/api/v1alpha1"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1alpha1 "github.com/openshift/hypershift/api/hypershift/v1alpha1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"

diff --git a/contrib/admission-tracer/main.go b/contrib/admission-tracer/main.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	hyperapi "github.com/openshift/hypershift/api"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"

diff --git a/control-plane-operator/controllers/awsprivatelink/awsprivatelink_controller.go b/control-plane-operator/controllers/awsprivatelink/awsprivatelink_controller.go
@@ -38,7 +38,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	awsutil "github.com/openshift/hypershift/cmd/infra/aws/util"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/manifests"
 	"github.com/openshift/hypershift/support/config"

diff --git a/control-plane-operator/controllers/awsprivatelink/awsprivatelink_controller_test.go b/control-plane-operator/controllers/awsprivatelink/awsprivatelink_controller_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/control-plane-operator/controllers/hostedcontrolplane/autoscaler/reconcile.go b/control-plane-operator/controllers/hostedcontrolplane/autoscaler/reconcile.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/kas"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/manifests"
 	"github.com/openshift/hypershift/hypershift-operator/controllers/manifests/controlplaneoperator"

diff --git a/control-plane-operator/controllers/hostedcontrolplane/cloud/aws/params.go b/control-plane-operator/controllers/hostedcontrolplane/cloud/aws/params.go
@@ -6,7 +6,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/pointer"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/support/config"
 )
 

diff --git a/control-plane-operator/controllers/hostedcontrolplane/cloud/aws/reconcile.go b/control-plane-operator/controllers/hostedcontrolplane/cloud/aws/reconcile.go
@@ -3,7 +3,7 @@ package aws
 import (
 	"fmt"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/imageprovider"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/manifests"
 	"github.com/openshift/hypershift/hypershift-operator/controllers/manifests/controlplaneoperator"

diff --git a/control-plane-operator/controllers/hostedcontrolplane/cloud/azure/params.go b/control-plane-operator/controllers/hostedcontrolplane/cloud/azure/params.go
@@ -1,7 +1,7 @@
 package azure
 
 import (
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/support/config"
 
 	corev1 "k8s.io/api/core/v1"

diff --git a/control-plane-operator/controllers/hostedcontrolplane/cloud/azure/providerconfig.go b/control-plane-operator/controllers/hostedcontrolplane/cloud/azure/providerconfig.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 )
 

diff --git a/control-plane-operator/controllers/hostedcontrolplane/cloud/azure/reconcile.go b/control-plane-operator/controllers/hostedcontrolplane/cloud/azure/reconcile.go
@@ -3,7 +3,7 @@ package azure
 import (
 	"fmt"
 
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/imageprovider"
 	"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/manifests"
 	"github.com/openshift/hypershift/hypershift-operator/controllers/manifests/controlplaneoperator"

diff --git a/control-plane-operator/controllers/hostedcontrolplane/cloud/kubevirt/providerconfig.go b/control-plane-operator/controllers/hostedcontrolplane/cloud/kubevirt/providerconfig.go
@@ -1,7 +1,7 @@
 package kubevirt
 
 import (
-	hyperv1 "github.com/openshift/hypershift/api/v1beta1"
+	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"gopkg.in/yaml.v2"
 )