Merge pull request openshift#3342 from jparrill/feat/HOSTEDCP-336-fix…

…tures HOSTEDCP-336: Move fixtures out of API
bryan-cox · Dec 22, 2023 · 3957653 · 3957653
2 parents c53a541 + d6116b9
commit 3957653
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 11 deletions.
diff --git a/cmd/cluster/agent/create.go b/cmd/cluster/agent/create.go
@@ -9,9 +9,9 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	crclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/openshift/hypershift/api/fixtures"
 	"github.com/openshift/hypershift/cmd/cluster/core"
 	"github.com/openshift/hypershift/cmd/util"
+	"github.com/openshift/hypershift/examples/fixtures"
 )
 
 func NewCreateCommand(opts *core.CreateOptions) *cobra.Command {

diff --git a/cmd/cluster/aws/create.go b/cmd/cluster/aws/create.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 	"os"
 
-	apifixtures "github.com/openshift/hypershift/api/fixtures"
 	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"
+	apifixtures "github.com/openshift/hypershift/examples/fixtures"
 	"github.com/openshift/hypershift/support/infraid"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/cluster/azure/create.go b/cmd/cluster/azure/create.go
@@ -9,10 +9,10 @@ import (
 	"strings"
 	"syscall"
 
-	apifixtures "github.com/openshift/hypershift/api/fixtures"
 	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/cluster/core"
 	azureinfra "github.com/openshift/hypershift/cmd/infra/azure"
+	apifixtures "github.com/openshift/hypershift/examples/fixtures"
 	"github.com/openshift/hypershift/support/infraid"
 	"github.com/openshift/hypershift/support/releaseinfo"
 

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

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

diff --git a/cmd/cluster/kubevirt/create_test.go b/cmd/cluster/kubevirt/create_test.go
@@ -7,9 +7,9 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/utils/pointer"
 
-	apifixtures "github.com/openshift/hypershift/api/fixtures"
 	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/cluster/core"
+	apifixtures "github.com/openshift/hypershift/examples/fixtures"
 )
 
 func Test_ApplyPlatformSpecificValues(t *testing.T) {

diff --git a/cmd/cluster/none/create.go b/cmd/cluster/none/create.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/spf13/cobra"
 
-	apifixtures "github.com/openshift/hypershift/api/fixtures"
 	"github.com/openshift/hypershift/cmd/cluster/core"
+	apifixtures "github.com/openshift/hypershift/examples/fixtures"
 )
 
 func NewCreateCommand(opts *core.CreateOptions) *cobra.Command {

diff --git a/cmd/cluster/powervs/create.go b/cmd/cluster/powervs/create.go
@@ -8,10 +8,10 @@ import (
 	"os/signal"
 	"syscall"
 
-	apifixtures "github.com/openshift/hypershift/api/fixtures"
 	hyperv1 "github.com/openshift/hypershift/api/hypershift/v1beta1"
 	"github.com/openshift/hypershift/cmd/cluster/core"
 	powervsinfra "github.com/openshift/hypershift/cmd/infra/powervs"
+	apifixtures "github.com/openshift/hypershift/examples/fixtures"
 	"github.com/openshift/hypershift/support/infraid"
 	"github.com/spf13/cobra"
 )

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

diff --git a/api/fixtures/example.go → examples/fixtures/example.go b/api/fixtures/example.go → examples/fixtures/example.go
diff --git a/api/fixtures/example_agent.go → examples/fixtures/example_agent.go b/api/fixtures/example_agent.go → examples/fixtures/example_agent.go
diff --git a/api/fixtures/example_aws.go → examples/fixtures/example_aws.go b/api/fixtures/example_aws.go → examples/fixtures/example_aws.go
diff --git a/api/fixtures/example_azure.go → examples/fixtures/example_azure.go b/api/fixtures/example_azure.go → examples/fixtures/example_azure.go
diff --git a/api/fixtures/example_ibmcloud_powervs.go → ...ples/fixtures/example_ibmcloud_powervs.go b/api/fixtures/example_ibmcloud_powervs.go → ...ples/fixtures/example_ibmcloud_powervs.go
diff --git a/api/fixtures/example_kubevirt.go → examples/fixtures/example_kubevirt.go b/api/fixtures/example_kubevirt.go → examples/fixtures/example_kubevirt.go
diff --git a/api/fixtures/example_none.go → examples/fixtures/example_none.go b/api/fixtures/example_none.go → examples/fixtures/example_none.go
diff --git a/hypershift-operator/controllers/hostedcluster/hostedcluster_webhook.go b/hypershift-operator/controllers/hostedcluster/hostedcluster_webhook.go
@@ -9,7 +9,7 @@ import (
 	"github.com/blang/semver"
 	jsonpatch "github.com/evanphx/json-patch/v5"
 	"github.com/go-logr/logr"
-	apiexample "github.com/openshift/hypershift/api/fixtures"
+	apiexample "github.com/openshift/hypershift/examples/fixtures"
 	"golang.org/x/sync/errgroup"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/hypershift-operator/controllers/hostedcluster/hostedcluster_webhook_test.go b/hypershift-operator/controllers/hostedcluster/hostedcluster_webhook_test.go
@@ -15,8 +15,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 
-	apiexample "github.com/openshift/hypershift/api/fixtures"
 	"github.com/openshift/hypershift/api/hypershift/v1beta1"
+	apiexample "github.com/openshift/hypershift/examples/fixtures"
 	"github.com/openshift/hypershift/kubevirtexternalinfra"
 	"github.com/openshift/hypershift/support/api"
 )