diff --git a/.golangci.yml b/.golangci.yml index 85761c3889e3..186f12cc0217 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -115,7 +115,7 @@ linters-settings: alias: runtimehooksv1 - pkg: sigs.k8s.io/cluster-api/exp/runtime/controllers alias: runtimecontrollers - - pkg: sigs.k8s.io/cluster-api/internal/runtime/catalog + - pkg: sigs.k8s.io/cluster-api/exp/runtime/catalog alias: runtimecatalog - pkg: sigs.k8s.io/cluster-api/internal/runtime/client alias: runtimeclient diff --git a/internal/runtime/catalog/builder.go b/exp/runtime/catalog/builder.go similarity index 100% rename from internal/runtime/catalog/builder.go rename to exp/runtime/catalog/builder.go diff --git a/internal/runtime/catalog/catalog.go b/exp/runtime/catalog/catalog.go similarity index 100% rename from internal/runtime/catalog/catalog.go rename to exp/runtime/catalog/catalog.go diff --git a/internal/runtime/catalog/doc.go b/exp/runtime/catalog/doc.go similarity index 100% rename from internal/runtime/catalog/doc.go rename to exp/runtime/catalog/doc.go diff --git a/internal/runtime/catalog/openapi.go b/exp/runtime/catalog/openapi.go similarity index 100% rename from internal/runtime/catalog/openapi.go rename to exp/runtime/catalog/openapi.go diff --git a/internal/runtime/catalog/test/catalog_test.go b/exp/runtime/catalog/test/catalog_test.go similarity index 99% rename from internal/runtime/catalog/test/catalog_test.go rename to exp/runtime/catalog/test/catalog_test.go index 20d7b9f9f23b..3b0ea164db57 100644 --- a/internal/runtime/catalog/test/catalog_test.go +++ b/exp/runtime/catalog/test/catalog_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha1" "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha2" ) diff --git a/exp/runtime/hooks/api/v1alpha1/discovery_types.go b/exp/runtime/hooks/api/v1alpha1/discovery_types.go index 8a6feeb64c3a..24796745e67a 100644 --- a/exp/runtime/hooks/api/v1alpha1/discovery_types.go +++ b/exp/runtime/hooks/api/v1alpha1/discovery_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) // DiscoveryRequest is the request of the Discovery hook. diff --git a/exp/runtime/hooks/api/v1alpha1/groupversion_info.go b/exp/runtime/hooks/api/v1alpha1/groupversion_info.go index 537987288c8b..a4c8c5a1b7df 100644 --- a/exp/runtime/hooks/api/v1alpha1/groupversion_info.go +++ b/exp/runtime/hooks/api/v1alpha1/groupversion_info.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/runtime/schema" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) var ( diff --git a/exp/runtime/hooks/api/v1alpha1/lifecyclehooks_types.go b/exp/runtime/hooks/api/v1alpha1/lifecyclehooks_types.go index de25bcd41663..9e373c7e675c 100644 --- a/exp/runtime/hooks/api/v1alpha1/lifecyclehooks_types.go +++ b/exp/runtime/hooks/api/v1alpha1/lifecyclehooks_types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) // BeforeClusterCreateRequest is the request of the BeforeClusterCreate hook. diff --git a/exp/runtime/hooks/api/v1alpha1/topologymutation_types.go b/exp/runtime/hooks/api/v1alpha1/topologymutation_types.go index 44fff9fa05e5..88d6a16958d7 100644 --- a/exp/runtime/hooks/api/v1alpha1/topologymutation_types.go +++ b/exp/runtime/hooks/api/v1alpha1/topologymutation_types.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) // GeneratePatchesRequest is the request of the GeneratePatches hook. diff --git a/exp/runtime/internal/controllers/extensionconfig_controller_test.go b/exp/runtime/internal/controllers/extensionconfig_controller_test.go index b9ef308c6127..b94a02c11248 100644 --- a/exp/runtime/internal/controllers/extensionconfig_controller_test.go +++ b/exp/runtime/internal/controllers/extensionconfig_controller_test.go @@ -38,9 +38,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" runtimeclient "sigs.k8s.io/cluster-api/internal/runtime/client" runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry" fakev1alpha1 "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha1" diff --git a/exp/runtime/internal/controllers/warmup_test.go b/exp/runtime/internal/controllers/warmup_test.go index f31393dca378..c832f098a98e 100644 --- a/exp/runtime/internal/controllers/warmup_test.go +++ b/exp/runtime/internal/controllers/warmup_test.go @@ -28,9 +28,9 @@ import ( utilfeature "k8s.io/component-base/featuregate/testing" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" runtimeclient "sigs.k8s.io/cluster-api/internal/runtime/client" runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry" fakev1alpha1 "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha1" diff --git a/test/extension/server/server.go b/exp/runtime/server/server.go similarity index 99% rename from test/extension/server/server.go rename to exp/runtime/server/server.go index 3c4c5e397ea3..e48fb3821411 100644 --- a/test/extension/server/server.go +++ b/exp/runtime/server/server.go @@ -33,8 +33,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/webhook" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) const tlsVersion13 = "1.3" diff --git a/hack/tools/runtime-openapi-gen/main.go b/hack/tools/runtime-openapi-gen/main.go index b9b39ad12c2d..7fdfd1ecb69c 100644 --- a/hack/tools/runtime-openapi-gen/main.go +++ b/hack/tools/runtime-openapi-gen/main.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/yaml" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) var ( diff --git a/internal/controllers/topology/cluster/cluster_controller_test.go b/internal/controllers/topology/cluster/cluster_controller_test.go index e0d92dc43097..cdf473604168 100644 --- a/internal/controllers/topology/cluster/cluster_controller_test.go +++ b/internal/controllers/topology/cluster/cluster_controller_test.go @@ -31,11 +31,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" "sigs.k8s.io/cluster-api/internal/contract" "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/scope" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" fakeruntimeclient "sigs.k8s.io/cluster-api/internal/runtime/client/fake" "sigs.k8s.io/cluster-api/internal/test/builder" "sigs.k8s.io/cluster-api/util/conditions" diff --git a/internal/controllers/topology/cluster/desired_state.go b/internal/controllers/topology/cluster/desired_state.go index 694c041fee3f..a9048c65ce09 100644 --- a/internal/controllers/topology/cluster/desired_state.go +++ b/internal/controllers/topology/cluster/desired_state.go @@ -31,13 +31,13 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/cluster-api/controllers/external" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" "sigs.k8s.io/cluster-api/internal/contract" "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/scope" "sigs.k8s.io/cluster-api/internal/hooks" tlog "sigs.k8s.io/cluster-api/internal/log" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) // computeDesiredState computes the desired state of the cluster topology. diff --git a/internal/controllers/topology/cluster/desired_state_test.go b/internal/controllers/topology/cluster/desired_state_test.go index 17abc4850a39..9ba049119f6f 100644 --- a/internal/controllers/topology/cluster/desired_state_test.go +++ b/internal/controllers/topology/cluster/desired_state_test.go @@ -35,12 +35,12 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" "sigs.k8s.io/cluster-api/internal/contract" "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/scope" "sigs.k8s.io/cluster-api/internal/hooks" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" fakeruntimeclient "sigs.k8s.io/cluster-api/internal/runtime/client/fake" "sigs.k8s.io/cluster-api/internal/test/builder" ) diff --git a/internal/controllers/topology/cluster/patches/engine_test.go b/internal/controllers/topology/cluster/patches/engine_test.go index 252b02209a19..369e507b7178 100644 --- a/internal/controllers/topology/cluster/patches/engine_test.go +++ b/internal/controllers/topology/cluster/patches/engine_test.go @@ -32,10 +32,10 @@ import ( "k8s.io/utils/pointer" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/scope" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" fakeruntimeclient "sigs.k8s.io/cluster-api/internal/runtime/client/fake" "sigs.k8s.io/cluster-api/internal/test/builder" . "sigs.k8s.io/cluster-api/internal/test/matchers" diff --git a/internal/controllers/topology/cluster/reconcile_state.go b/internal/controllers/topology/cluster/reconcile_state.go index 2a1b1ed3b7de..25858d84ddd1 100644 --- a/internal/controllers/topology/cluster/reconcile_state.go +++ b/internal/controllers/topology/cluster/reconcile_state.go @@ -31,6 +31,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" "sigs.k8s.io/cluster-api/internal/contract" @@ -38,7 +39,6 @@ import ( "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/structuredmerge" "sigs.k8s.io/cluster-api/internal/hooks" tlog "sigs.k8s.io/cluster-api/internal/log" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" "sigs.k8s.io/cluster-api/internal/topology/check" ) diff --git a/internal/controllers/topology/cluster/reconcile_state_test.go b/internal/controllers/topology/cluster/reconcile_state_test.go index 3fca565f4a22..fdade88c921f 100644 --- a/internal/controllers/topology/cluster/reconcile_state_test.go +++ b/internal/controllers/topology/cluster/reconcile_state_test.go @@ -37,12 +37,12 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/internal/contract" "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/scope" "sigs.k8s.io/cluster-api/internal/controllers/topology/cluster/structuredmerge" "sigs.k8s.io/cluster-api/internal/hooks" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" fakeruntimeclient "sigs.k8s.io/cluster-api/internal/runtime/client/fake" "sigs.k8s.io/cluster-api/internal/test/builder" . "sigs.k8s.io/cluster-api/internal/test/matchers" diff --git a/internal/controllers/topology/cluster/scope/hookresponsetracker.go b/internal/controllers/topology/cluster/scope/hookresponsetracker.go index 2ba4316daac3..81421c1c1146 100644 --- a/internal/controllers/topology/cluster/scope/hookresponsetracker.go +++ b/internal/controllers/topology/cluster/scope/hookresponsetracker.go @@ -21,8 +21,8 @@ import ( "strings" "time" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) // HookResponseTracker is a helper to capture the responses of the various lifecycle hooks. diff --git a/internal/controllers/topology/cluster/scope/hookresponsetracker_test.go b/internal/controllers/topology/cluster/scope/hookresponsetracker_test.go index 5ff76e2794af..c4e5e06d3667 100644 --- a/internal/controllers/topology/cluster/scope/hookresponsetracker_test.go +++ b/internal/controllers/topology/cluster/scope/hookresponsetracker_test.go @@ -22,8 +22,8 @@ import ( . "github.com/onsi/gomega" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) func TestHookResponseTracker_AggregateRetryAfter(t *testing.T) { diff --git a/internal/hooks/tracking.go b/internal/hooks/tracking.go index 62493e734a66..36150970aa4d 100644 --- a/internal/hooks/tracking.go +++ b/internal/hooks/tracking.go @@ -26,8 +26,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" tlog "sigs.k8s.io/cluster-api/internal/log" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" "sigs.k8s.io/cluster-api/util/patch" ) diff --git a/internal/hooks/tracking_test.go b/internal/hooks/tracking_test.go index 54457f17c6a8..084fba92c0a8 100644 --- a/internal/hooks/tracking_test.go +++ b/internal/hooks/tracking_test.go @@ -27,8 +27,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) func TestIsPending(t *testing.T) { diff --git a/internal/runtime/client/client.go b/internal/runtime/client/client.go index fe2d7b04112d..11a8b65b2c2f 100644 --- a/internal/runtime/client/client.go +++ b/internal/runtime/client/client.go @@ -43,8 +43,8 @@ import ( ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry" "sigs.k8s.io/cluster-api/util" ) diff --git a/internal/runtime/client/client_test.go b/internal/runtime/client/client_test.go index c72a45934c91..8b6722d0873d 100644 --- a/internal/runtime/client/client_test.go +++ b/internal/runtime/client/client_test.go @@ -39,8 +39,8 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry" fakev1alpha1 "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha1" fakev1alpha2 "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha2" diff --git a/internal/runtime/client/fake/fake_client.go b/internal/runtime/client/fake/fake_client.go index 84742a125137..114d34dcd774 100644 --- a/internal/runtime/client/fake/fake_client.go +++ b/internal/runtime/client/fake/fake_client.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/runtime" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" runtimeclient "sigs.k8s.io/cluster-api/internal/runtime/client" ) diff --git a/internal/runtime/registry/registry.go b/internal/runtime/registry/registry.go index 3d8b1bcdfc18..641962e84e68 100644 --- a/internal/runtime/registry/registry.go +++ b/internal/runtime/registry/registry.go @@ -26,7 +26,7 @@ import ( kerrors "k8s.io/apimachinery/pkg/util/errors" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) // ExtensionRegistry defines the funcs of a RuntimeExtension registry. diff --git a/internal/runtime/registry/registry_test.go b/internal/runtime/registry/registry_test.go index e116223783bd..2e679c83b561 100644 --- a/internal/runtime/registry/registry_test.go +++ b/internal/runtime/registry/registry_test.go @@ -27,7 +27,7 @@ import ( "k8s.io/utils/pointer" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) func TestColdRegistry(t *testing.T) { diff --git a/internal/runtime/test/v1alpha1/conversion_test.go b/internal/runtime/test/v1alpha1/conversion_test.go index 9a563cedd8b8..289bc00b2851 100644 --- a/internal/runtime/test/v1alpha1/conversion_test.go +++ b/internal/runtime/test/v1alpha1/conversion_test.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" "sigs.k8s.io/cluster-api/internal/runtime/test/v1alpha2" ) diff --git a/internal/runtime/test/v1alpha1/fake_types.go b/internal/runtime/test/v1alpha1/fake_types.go index 76b3b903c539..760c6742e3cb 100644 --- a/internal/runtime/test/v1alpha1/fake_types.go +++ b/internal/runtime/test/v1alpha1/fake_types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1alpha4 "sigs.k8s.io/cluster-api/api/v1alpha4" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) // FakeRequest is a response for testing diff --git a/internal/runtime/test/v1alpha1/groupversion_info.go b/internal/runtime/test/v1alpha1/groupversion_info.go index 3509baca8cab..a9485f3df42b 100644 --- a/internal/runtime/test/v1alpha1/groupversion_info.go +++ b/internal/runtime/test/v1alpha1/groupversion_info.go @@ -19,7 +19,7 @@ package v1alpha1 import ( "k8s.io/apimachinery/pkg/runtime/schema" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) var ( diff --git a/internal/runtime/test/v1alpha2/fake_types.go b/internal/runtime/test/v1alpha2/fake_types.go index 70592d5f95ce..806712741c3c 100644 --- a/internal/runtime/test/v1alpha2/fake_types.go +++ b/internal/runtime/test/v1alpha2/fake_types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) // FakeRequest is a response for testing diff --git a/internal/runtime/test/v1alpha2/groupversion_info.go b/internal/runtime/test/v1alpha2/groupversion_info.go index b47f4376e074..885c5dfb161f 100644 --- a/internal/runtime/test/v1alpha2/groupversion_info.go +++ b/internal/runtime/test/v1alpha2/groupversion_info.go @@ -19,7 +19,7 @@ package v1alpha2 import ( "k8s.io/apimachinery/pkg/runtime/schema" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" ) var ( diff --git a/main.go b/main.go index 21bff37b63cf..bc90d08354be 100644 --- a/main.go +++ b/main.go @@ -55,10 +55,10 @@ import ( expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1" expcontrollers "sigs.k8s.io/cluster-api/exp/controllers" runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimecontrollers "sigs.k8s.io/cluster-api/exp/runtime/controllers" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" "sigs.k8s.io/cluster-api/feature" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" runtimeclient "sigs.k8s.io/cluster-api/internal/runtime/client" runtimeregistry "sigs.k8s.io/cluster-api/internal/runtime/registry" runtimewebhooks "sigs.k8s.io/cluster-api/internal/webhooks/runtime" diff --git a/test/extension/handlers/lifecycle/handlers.go b/test/extension/handlers/lifecycle/handlers.go index cc7409d11953..95f17318cdda 100644 --- a/test/extension/handlers/lifecycle/handlers.go +++ b/test/extension/handlers/lifecycle/handlers.go @@ -28,8 +28,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" ) // Handler is the handler for the lifecycle hooks. diff --git a/test/extension/main.go b/test/extension/main.go index e5a00fa20707..8acd24bfa38b 100644 --- a/test/extension/main.go +++ b/test/extension/main.go @@ -30,11 +30,11 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + runtimecatalog "sigs.k8s.io/cluster-api/exp/runtime/catalog" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - runtimecatalog "sigs.k8s.io/cluster-api/internal/runtime/catalog" + "sigs.k8s.io/cluster-api/exp/runtime/server" "sigs.k8s.io/cluster-api/test/extension/handlers/lifecycle" "sigs.k8s.io/cluster-api/test/extension/handlers/topologymutation" - "sigs.k8s.io/cluster-api/test/extension/server" infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1" "sigs.k8s.io/cluster-api/version" )