From 76e2b923573703dcd6e225bbb8a159667a312607 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Tue, 19 Mar 2024 17:27:21 +0000 Subject: [PATCH] refactor: Update import paths --- .../nutanix-cluster-class.yaml | 8 ++-- .../clusterclass/kustomization.yaml.tmpl | 8 ++-- .../overlays/nutanix/kustomization.yaml.tmpl | 10 ++--- .../nutanix/clusterconfig/variables.go | 8 ++-- .../mutation/controlplaneendpoint/inject.go | 12 +++--- .../tests/generate_patches.go | 4 +- .../controlplaneendpoint/variables_test.go | 8 ++-- .../machinedetails/inject_control_plane.go | 12 +++--- .../mutation/machinedetails/inject_worker.go | 12 +++--- .../machinedetails/tests/generate_patches.go | 4 +- .../mutation/machinedetails/variables_test.go | 8 ++-- .../nutanix/mutation/metapatch_handler.go | 12 +++--- .../mutation/metapatch_handler_test.go | 40 +++++++++---------- .../mutation/prismcentralendpoint/inject.go | 12 +++--- .../tests/generate_patches.go | 4 +- .../prismcentralendpoint/variables_test.go | 8 ++-- pkg/handlers/nutanix/mutation/suite_test.go | 2 +- .../nutanix/workerconfig/variables.go | 8 ++-- .../nutanix/workerconfig/variables_test.go | 6 +-- test/e2e/config/cre.yaml | 6 +-- 20 files changed, 96 insertions(+), 96 deletions(-) diff --git a/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml b/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml index c17c34a8f..947724f4f 100644 --- a/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml +++ b/charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml @@ -66,12 +66,12 @@ spec: name: nutanix-quick-start-nct patches: - external: - discoverVariablesExtension: nutanixclusterconfigvars.capi-runtime-extensions - generateExtension: nutanixclusterconfigpatch.capi-runtime-extensions + discoverVariablesExtension: nutanixclusterconfigvars.cluster-api-runtime-extensions-nutanix + generateExtension: nutanixclusterconfigpatch.cluster-api-runtime-extensions-nutanix name: cluster-config - external: - discoverVariablesExtension: nutanixworkerconfigvars.capi-runtime-extensions - generateExtension: nutanixworkerconfigpatch.capi-runtime-extensions + discoverVariablesExtension: nutanixworkerconfigvars.cluster-api-runtime-extensions-nutanix + generateExtension: nutanixworkerconfigpatch.cluster-api-runtime-extensions-nutanix name: worker-config workers: machineDeployments: diff --git a/hack/examples/base/nutanix/clusterclass/kustomization.yaml.tmpl b/hack/examples/base/nutanix/clusterclass/kustomization.yaml.tmpl index dbfe1cc93..566d70560 100644 --- a/hack/examples/base/nutanix/clusterclass/kustomization.yaml.tmpl +++ b/hack/examples/base/nutanix/clusterclass/kustomization.yaml.tmpl @@ -24,11 +24,11 @@ patches: value: - name: "cluster-config" external: - generateExtension: "nutanixclusterconfigpatch.capi-runtime-extensions" - discoverVariablesExtension: "nutanixclusterconfigvars.capi-runtime-extensions" + generateExtension: "nutanixclusterconfigpatch.cluster-api-runtime-extensions-nutanix" + discoverVariablesExtension: "nutanixclusterconfigvars.cluster-api-runtime-extensions-nutanix" - name: "worker-config" external: - generateExtension: "nutanixworkerconfigpatch.capi-runtime-extensions" - discoverVariablesExtension: "nutanixworkerconfigvars.capi-runtime-extensions" + generateExtension: "nutanixworkerconfigpatch.cluster-api-runtime-extensions-nutanix" + discoverVariablesExtension: "nutanixworkerconfigvars.cluster-api-runtime-extensions-nutanix" - op: "remove" path: "/spec/variables" diff --git a/hack/examples/overlays/nutanix/kustomization.yaml.tmpl b/hack/examples/overlays/nutanix/kustomization.yaml.tmpl index 943283714..f599a3543 100644 --- a/hack/examples/overlays/nutanix/kustomization.yaml.tmpl +++ b/hack/examples/overlays/nutanix/kustomization.yaml.tmpl @@ -6,7 +6,7 @@ kind: Kustomization resources: # TODO: current kustomize structure is incorrect and need base + overlay structure as to avoid -# following error: recursed merging from path '/go/src/github.com/deepakm-ntnx/capi-runtime-extensions/hack/examples/bases/nutanix/calico/helm-addon': \ +# following error: recursed merging from path '/go/src/github.com/deepakm-ntnx/cluster-api-runtime-extensions-nutanix/hack/examples/bases/nutanix/calico/helm-addon': \ # may not add resource with an already registered id: ConfigMap.v1.[noGrp]/$${CLUSTER_NAME}-pc-trusted-ca-bundle.[noNs] # - ./cilium/crs # - ./cilium/helm-addon @@ -122,11 +122,11 @@ patches: value: - name: "cluster-config" external: - generateExtension: "nutanixclusterconfigpatch.capi-runtime-extensions" - discoverVariablesExtension: "nutanixclusterconfigvars.capi-runtime-extensions" + generateExtension: "nutanixclusterconfigpatch.cluster-api-runtime-extensions-nutanix" + discoverVariablesExtension: "nutanixclusterconfigvars.cluster-api-runtime-extensions-nutanix" - name: "worker-config" external: - generateExtension: "nutanixworkerconfigpatch.capi-runtime-extensions" - discoverVariablesExtension: "nutanixworkerconfigvars.capi-runtime-extensions" + generateExtension: "nutanixworkerconfigpatch.cluster-api-runtime-extensions-nutanix" + discoverVariablesExtension: "nutanixworkerconfigvars.cluster-api-runtime-extensions-nutanix" - op: "remove" path: "/spec/variables" diff --git a/pkg/handlers/nutanix/clusterconfig/variables.go b/pkg/handlers/nutanix/clusterconfig/variables.go index 4816e5f18..cebff93c6 100644 --- a/pkg/handlers/nutanix/clusterconfig/variables.go +++ b/pkg/handlers/nutanix/clusterconfig/variables.go @@ -9,10 +9,10 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - commonhandlers "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + commonhandlers "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) var ( diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go index 4ea8c911f..37d6fc26b 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/inject.go @@ -12,12 +12,12 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - capxv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" + capxv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) const ( diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests/generate_patches.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests/generate_patches.go index e8d8d94b4..973de079a 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests/generate_patches.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests/generate_patches.go @@ -6,8 +6,8 @@ package tests import ( "testing" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" ) func TestGeneratePatches( diff --git a/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go b/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go index c1ee3fe95..751fefaa3 100644 --- a/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go +++ b/pkg/handlers/nutanix/mutation/controlplaneendpoint/variables_test.go @@ -8,10 +8,10 @@ import ( "k8s.io/utils/ptr" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" - nutanixclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/clusterconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" + nutanixclusterconfig "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) func TestVariableValidation(t *testing.T) { diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go index 9eee6038a..f157e7956 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_control_plane.go @@ -13,12 +13,12 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - capxv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" + capxv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) const ( diff --git a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go index c26464b32..4c851007a 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/inject_worker.go @@ -13,12 +13,12 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - capxv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig" + capxv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) type nutanixMachineDetailsWorkerPatchHandler struct { diff --git a/pkg/handlers/nutanix/mutation/machinedetails/tests/generate_patches.go b/pkg/handlers/nutanix/mutation/machinedetails/tests/generate_patches.go index 0cef0af1b..81a443096 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/tests/generate_patches.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/tests/generate_patches.go @@ -6,8 +6,8 @@ package tests import ( "testing" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" ) func TestControlPlaneGeneratePatches( diff --git a/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go b/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go index 233e1a4c4..b7d949494 100644 --- a/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go +++ b/pkg/handlers/nutanix/mutation/machinedetails/variables_test.go @@ -8,10 +8,10 @@ import ( "k8s.io/utils/ptr" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" - nutanixclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/clusterconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" + nutanixclusterconfig "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) func TestVariableValidation(t *testing.T) { diff --git a/pkg/handlers/nutanix/mutation/metapatch_handler.go b/pkg/handlers/nutanix/mutation/metapatch_handler.go index 0e211226e..3c1272c5e 100644 --- a/pkg/handlers/nutanix/mutation/metapatch_handler.go +++ b/pkg/handlers/nutanix/mutation/metapatch_handler.go @@ -6,12 +6,12 @@ package mutation import ( "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - genericmutation "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/controlplaneendpoint" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/machinedetails" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/prismcentralendpoint" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + genericmutation "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/controlplaneendpoint" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/machinedetails" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/prismcentralendpoint" ) // MetaPatchHandler returns a meta patch handler for mutating CAPX clusters. diff --git a/pkg/handlers/nutanix/mutation/metapatch_handler_test.go b/pkg/handlers/nutanix/mutation/metapatch_handler_test.go index a64816ca9..2b0475349 100644 --- a/pkg/handlers/nutanix/mutation/metapatch_handler_test.go +++ b/pkg/handlers/nutanix/mutation/metapatch_handler_test.go @@ -8,26 +8,26 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" - auditpolicytests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/auditpolicy/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/etcd" - etcdtests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/etcd/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/extraapiservercertsans" - extraapiservercertsanstests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/extraapiservercertsans/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/httpproxy" - httpproxytests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/httpproxy/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/imageregistries" - imageregistrycredentialstests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/imageregistries/credentials/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/kubernetesimagerepository" - kubernetesimagerepositorytests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/kubernetesimagerepository/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/mirrors" - globalimageregistrymirrortests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/mutation/mirrors/tests" - nutanixclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/clusterconfig" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/controlplaneendpoint" - controlplaneendpointtests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/prismcentralendpoint" - prismcentralendpointtests "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" + auditpolicytests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/auditpolicy/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/etcd" + etcdtests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/etcd/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/extraapiservercertsans" + extraapiservercertsanstests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/extraapiservercertsans/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/httpproxy" + httpproxytests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/httpproxy/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries" + imageregistrycredentialstests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/imageregistries/credentials/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubernetesimagerepository" + kubernetesimagerepositorytests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/kubernetesimagerepository/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/mirrors" + globalimageregistrymirrortests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/mutation/mirrors/tests" + nutanixclusterconfig "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/controlplaneendpoint" + controlplaneendpointtests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/controlplaneendpoint/tests" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/prismcentralendpoint" + prismcentralendpointtests "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests" ) func metaPatchGeneratorFunc(mgr manager.Manager) func() mutation.GeneratePatches { diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go index d07c05f06..b62d11464 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/inject.go @@ -13,12 +13,12 @@ import ( ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - capxv1 "github.com/d2iq-labs/capi-runtime-extensions/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/patches/selectors" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/variables" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" + capxv1 "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/external/github.com/nutanix-cloud-native/cluster-api-provider-nutanix/api/v1beta1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/patches/selectors" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/variables" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" ) const ( diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests/generate_patches.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests/generate_patches.go index 243a80060..59e96374a 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests/generate_patches.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/tests/generate_patches.go @@ -6,8 +6,8 @@ package tests import ( "testing" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" ) func TestGeneratePatches( diff --git a/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go b/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go index f16107577..b0ce66e1b 100644 --- a/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go +++ b/pkg/handlers/nutanix/mutation/prismcentralendpoint/variables_test.go @@ -8,10 +8,10 @@ import ( "k8s.io/utils/ptr" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/clusterconfig" - nutanixclusterconfig "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/nutanix/clusterconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/clusterconfig" + nutanixclusterconfig "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/nutanix/clusterconfig" ) func TestVariableValidation(t *testing.T) { diff --git a/pkg/handlers/nutanix/mutation/suite_test.go b/pkg/handlers/nutanix/mutation/suite_test.go index 0170ad48e..20633d531 100644 --- a/pkg/handlers/nutanix/mutation/suite_test.go +++ b/pkg/handlers/nutanix/mutation/suite_test.go @@ -9,7 +9,7 @@ import ( ctrl "sigs.k8s.io/controller-runtime" - "github.com/d2iq-labs/capi-runtime-extensions/test/helpers" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/test/helpers" ) var ( diff --git a/pkg/handlers/nutanix/workerconfig/variables.go b/pkg/handlers/nutanix/workerconfig/variables.go index 9ac09e1f2..719be0404 100644 --- a/pkg/handlers/nutanix/workerconfig/variables.go +++ b/pkg/handlers/nutanix/workerconfig/variables.go @@ -9,10 +9,10 @@ import ( clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - commonhandlers "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/capi/clustertopology/handlers/mutation" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + commonhandlers "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/capi/clustertopology/handlers/mutation" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) var ( diff --git a/pkg/handlers/nutanix/workerconfig/variables_test.go b/pkg/handlers/nutanix/workerconfig/variables_test.go index 9d934fda1..aad787ce8 100644 --- a/pkg/handlers/nutanix/workerconfig/variables_test.go +++ b/pkg/handlers/nutanix/workerconfig/variables_test.go @@ -8,9 +8,9 @@ import ( "k8s.io/utils/ptr" - "github.com/d2iq-labs/capi-runtime-extensions/api/v1alpha1" - "github.com/d2iq-labs/capi-runtime-extensions/common/pkg/testutils/capitest" - "github.com/d2iq-labs/capi-runtime-extensions/pkg/handlers/generic/workerconfig" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/api/v1alpha1" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/common/pkg/testutils/capitest" + "github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/generic/workerconfig" ) func TestVariableValidation(t *testing.T) { diff --git a/test/e2e/config/cre.yaml b/test/e2e/config/cre.yaml index 0ae733972..3cc341f73 100644 --- a/test/e2e/config/cre.yaml +++ b/test/e2e/config/cre.yaml @@ -115,7 +115,7 @@ providers: contract: v1beta1 files: - sourcePath: "../data/shared/v1beta1/metadata.yaml" - - sourcePath: "../../../charts/capi-runtime-extensions/defaultclusterclasses/nutanix-cluster-class.yaml" + - sourcePath: "../../../charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml" targetName: clusterclass-nutanix-quick-start.yaml - sourcePath: "../../../examples/capi-quick-start/nutanix-cluster-cilium-helm-addon.yaml" targetName: cluster-template-topology-cilium-helm-addon.yaml @@ -129,8 +129,8 @@ providers: - name: cre type: RuntimeExtensionProvider versions: - - name: "{go://github.com/d2iq-labs/capi-runtime-extensions@v0.5}" - value: "https://github.com/d2iq-labs/capi-runtime-extensions/releases/download/{go://github.com/d2iq-labs/capi-runtime-extensions@v0.5}/runtime-extension-components.yaml" + - name: "{go://github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix@v0.5}" + value: "https://github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/releases/download/{go://github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix@v0.5}/runtime-extension-components.yaml" type: "url" contract: v1beta1 files: