Skip to content

Rename Go module from openshift.io/hypershift to github.com/openshift/hypershift #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Mar 1, 2021
Merged

Rename Go module from openshift.io/hypershift to github.com/openshift/hypershift #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/fixtures/example.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"

crclient "sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
6 changes: 3 additions & 3 deletions api/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/serializer/json"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

capiv1 "openshift.io/hypershift/thirdparty/clusterapi/api/v1alpha4"
capiaws "openshift.io/hypershift/thirdparty/clusterapiprovideraws/v1alpha3"
capiv1 "github.com/openshift/hypershift/thirdparty/clusterapi/api/v1alpha4"
capiaws "github.com/openshift/hypershift/thirdparty/clusterapiprovideraws/v1alpha3"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions cmd/cluster/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

hyperapi "openshift.io/hypershift/api"
apifixtures "openshift.io/hypershift/api/fixtures"
"openshift.io/hypershift/version"
hyperapi "github.com/openshift/hypershift/api"
apifixtures "github.com/openshift/hypershift/api/fixtures"
"github.com/openshift/hypershift/version"

cr "sigs.k8s.io/controller-runtime"
crclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
4 changes: 2 additions & 2 deletions cmd/create/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package create
import (
"github.com/spf13/cobra"

"openshift.io/hypershift/cmd/cluster"
"openshift.io/hypershift/cmd/infra"
"github.com/openshift/hypershift/cmd/cluster"
"github.com/openshift/hypershift/cmd/infra"
)

func NewCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/infra/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package infra
import (
"github.com/spf13/cobra"

"openshift.io/hypershift/cmd/infra/aws"
"github.com/openshift/hypershift/cmd/infra/aws"
)

func NewCreateCommand() *cobra.Command {
Expand Down
2 changes: 1 addition & 1 deletion cmd/infra/create_iam.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package infra
import (
"github.com/spf13/cobra"

"openshift.io/hypershift/cmd/infra/aws"
"github.com/openshift/hypershift/cmd/infra/aws"
)

func NewCreateIAMCommand() *cobra.Command {
Expand Down
6 changes: 3 additions & 3 deletions cmd/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/spf13/cobra"
"k8s.io/apimachinery/pkg/types"

hyperapi "openshift.io/hypershift/api"
"openshift.io/hypershift/cmd/install/assets"
"openshift.io/hypershift/version"
hyperapi "github.com/openshift/hypershift/api"
"github.com/openshift/hypershift/cmd/install/assets"
"github.com/openshift/hypershift/version"

cr "sigs.k8s.io/controller-runtime"
crclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
10 changes: 5 additions & 5 deletions control-plane-operator/controllers/hostedcontrolplane/hostedcontrolplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

"openshift.io/hypershift/thirdparty/clusterapi/util"
"github.com/openshift/hypershift/thirdparty/clusterapi/util"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane/render"
"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane/render/pki"
"openshift.io/hypershift/control-plane-operator/releaseinfo"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/render"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/render/pki"
"github.com/openshift/hypershift/control-plane-operator/releaseinfo"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions control-plane-operator/controllers/hostedcontrolplane/render/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"text/template"

"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane/assets"
"openshift.io/hypershift/control-plane-operator/releaseinfo"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/assets"
"github.com/openshift/hypershift/control-plane-operator/releaseinfo"
)

func RenderClusterManifests(params *ClusterParams, image *releaseinfo.ReleaseImage, pullSecret []byte, pki map[string][]byte) (map[string][]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion control-plane-operator/controllers/hostedcontrolplane/render/pki/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"

"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane/render"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/render"
)

func GeneratePKI(params *render.PKIParams) (map[string][]byte, error) {
Expand Down
2 changes: 1 addition & 1 deletion control-plane-operator/controllers/hostedcontrolplane/render/pki/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"

"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane/render/pki/util"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/render/pki/util"
)

type caSpec struct {
Expand Down
2 changes: 1 addition & 1 deletion control-plane-operator/controllers/hostedcontrolplane/render/rendercontext.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/pkg/errors"

"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane/assets"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane/assets"
)

type renderContext struct {
Expand Down
6 changes: 3 additions & 3 deletions control-plane-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (

_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

hyperapi "openshift.io/hypershift/api"
"openshift.io/hypershift/control-plane-operator/controllers/hostedcontrolplane"
"openshift.io/hypershift/control-plane-operator/releaseinfo"
hyperapi "github.com/openshift/hypershift/api"
"github.com/openshift/hypershift/control-plane-operator/controllers/hostedcontrolplane"
"github.com/openshift/hypershift/control-plane-operator/releaseinfo"

ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/cache"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module openshift.io/hypershift
module github.com/openshift/hypershift

go 1.16

Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/autoapprover/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
2 changes: 1 addition & 1 deletion hosted-cluster-config-operator/controllers/clusteroperator/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/clusterversion/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
configclient "github.com/openshift/client-go/config/clientset/versioned"
configinformers "github.com/openshift/client-go/config/informers/externalversions"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/cmca/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/infrastatus/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

configv1 "github.com/openshift/api/config/v1"

hyperapi "openshift.io/hypershift/api"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
hyperapi "github.com/openshift/hypershift/api"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/kubeadminpwd/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion hosted-cluster-config-operator/controllers/kubeletservingca/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/node/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/openshiftapiserver/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"github.com/openshift/library-go/pkg/operator/events"
"github.com/openshift/library-go/pkg/operator/resourcesynccontroller"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/openshiftapiservermonitor/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/source"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/openshiftcontrollermanager/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"github.com/openshift/library-go/pkg/operator/configobserver"
"github.com/openshift/library-go/pkg/operator/events"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
4 changes: 2 additions & 2 deletions hosted-cluster-config-operator/controllers/routesync/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
routeclient "github.com/openshift/client-go/route/clientset/versioned"
routeinformers "github.com/openshift/client-go/route/informers/externalversions"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

func Setup(cfg *operator.HostedClusterConfigOperatorConfig) error {
Expand Down
22 changes: 11 additions & 11 deletions hosted-cluster-config-operator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

"openshift.io/hypershift/hosted-cluster-config-operator/controllers/autoapprover"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/clusteroperator"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/clusterversion"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/cmca"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/infrastatus"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/kubeadminpwd"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/kubeletservingca"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/node"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/openshiftapiservermonitor"
"openshift.io/hypershift/hosted-cluster-config-operator/controllers/routesync"
"openshift.io/hypershift/hosted-cluster-config-operator/operator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/autoapprover"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/clusteroperator"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/clusterversion"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/cmca"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/infrastatus"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/kubeadminpwd"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/kubeletservingca"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/node"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/openshiftapiservermonitor"
"github.com/openshift/hypershift/hosted-cluster-config-operator/controllers/routesync"
"github.com/openshift/hypershift/hosted-cluster-config-operator/operator"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion hosted-cluster-config-operator/operator/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
configclient "github.com/openshift/client-go/config/clientset/versioned"
configinformers "github.com/openshift/client-go/config/informers/externalversions"

common "openshift.io/hypershift/hosted-cluster-config-operator/controllers"
common "github.com/openshift/hypershift/hosted-cluster-config-operator/controllers"
)

type ControllerSetupFunc func(*HostedClusterConfigOperatorConfig) error
Expand Down
6 changes: 3 additions & 3 deletions hypershift-operator/controllers/externalinfracluster/externalinfracluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
"openshift.io/hypershift/thirdparty/clusterapi/util"
"openshift.io/hypershift/thirdparty/clusterapi/util/patch"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
"github.com/openshift/hypershift/thirdparty/clusterapi/util"
"github.com/openshift/hypershift/thirdparty/clusterapi/util/patch"
)

type ExternalInfraClusterReconciler struct {
Expand Down
16 changes: 8 additions & 8 deletions hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

hyperapi "openshift.io/hypershift/api"
hyperv1 "openshift.io/hypershift/api/v1alpha1"
"openshift.io/hypershift/hypershift-operator/controllers/hostedcluster/manifests"
"openshift.io/hypershift/hypershift-operator/controllers/hostedcluster/manifests/autoscaler"
"openshift.io/hypershift/hypershift-operator/controllers/hostedcluster/manifests/clusterapi"
"openshift.io/hypershift/hypershift-operator/controllers/hostedcluster/manifests/controlplaneoperator"
hyperutil "openshift.io/hypershift/hypershift-operator/controllers/util"
capiv1 "openshift.io/hypershift/thirdparty/clusterapi/api/v1alpha4"
hyperapi "github.com/openshift/hypershift/api"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
"github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/manifests"
"github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/manifests/autoscaler"
"github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/manifests/clusterapi"
"github.com/openshift/hypershift/hypershift-operator/controllers/hostedcluster/manifests/controlplaneoperator"
hyperutil "github.com/openshift/hypershift/hypershift-operator/controllers/util"
capiv1 "github.com/openshift/hypershift/thirdparty/clusterapi/api/v1alpha4"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions hypershift-operator/controllers/hostedcluster/manifests/controlplaneoperator/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
k8sutilspointer "k8s.io/utils/pointer"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
capiv1 "openshift.io/hypershift/thirdparty/clusterapi/api/v1alpha4"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
capiv1 "github.com/openshift/hypershift/thirdparty/clusterapi/api/v1alpha4"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion hypershift-operator/controllers/hostedcluster/manifests/manifests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sutilspointer "k8s.io/utils/pointer"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
)

type HostedControlPlaneNamespace struct {
Expand Down
12 changes: 6 additions & 6 deletions hypershift-operator/controllers/nodepool/nodepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

hyperv1 "openshift.io/hypershift/api/v1alpha1"
hyperutil "openshift.io/hypershift/hypershift-operator/controllers/util"
capiv1 "openshift.io/hypershift/thirdparty/clusterapi/api/v1alpha4"
"openshift.io/hypershift/thirdparty/clusterapi/util"
"openshift.io/hypershift/thirdparty/clusterapi/util/patch"
capiaws "openshift.io/hypershift/thirdparty/clusterapiprovideraws/v1alpha3"
hyperv1 "github.com/openshift/hypershift/api/v1alpha1"
hyperutil "github.com/openshift/hypershift/hypershift-operator/controllers/util"
capiv1 "github.com/openshift/hypershift/thirdparty/clusterapi/api/v1alpha4"
"github.com/openshift/hypershift/thirdparty/clusterapi/util"
"github.com/openshift/hypershift/thirdparty/clusterapi/util/patch"
capiaws "github.com/openshift/hypershift/thirdparty/clusterapiprovideraws/v1alpha3"
)

const (
Expand Down
Loading