diff --git a/Makefile b/Makefile index 1997ffcfa..c737e88e9 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ help: ## Display this help. .PHONY: manifests manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. - $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" output:crd:artifacts:config=build/yaml/crd/t1/ + $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" output:crd:artifacts:config=build/yaml/crd/legacy/ $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" output:crd:artifacts:config=build/yaml/crd/vpc/ .PHONY: generate diff --git a/build/yaml/crd/t1/nsx.vmware.com_nsxserviceaccounts.yaml b/build/yaml/crd/legacy/nsx.vmware.com_nsxserviceaccounts.yaml similarity index 100% rename from build/yaml/crd/t1/nsx.vmware.com_nsxserviceaccounts.yaml rename to build/yaml/crd/legacy/nsx.vmware.com_nsxserviceaccounts.yaml diff --git a/build/yaml/crd/t1/nsx.vmware.com_securitypolicies.yaml b/build/yaml/crd/legacy/nsx.vmware.com_securitypolicies.yaml similarity index 100% rename from build/yaml/crd/t1/nsx.vmware.com_securitypolicies.yaml rename to build/yaml/crd/legacy/nsx.vmware.com_securitypolicies.yaml diff --git a/cmd/main.go b/cmd/main.go index a6825ec74..6bac7cd23 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/manager" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" crdv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/controllers/ipaddressallocation" diff --git a/pkg/apis/t1/v1alpha1/condition_types.go b/pkg/apis/legacy/v1alpha1/condition_types.go similarity index 100% rename from pkg/apis/t1/v1alpha1/condition_types.go rename to pkg/apis/legacy/v1alpha1/condition_types.go diff --git a/pkg/apis/t1/v1alpha1/doc.go b/pkg/apis/legacy/v1alpha1/doc.go similarity index 100% rename from pkg/apis/t1/v1alpha1/doc.go rename to pkg/apis/legacy/v1alpha1/doc.go diff --git a/pkg/apis/t1/v1alpha1/groupversion_info.go b/pkg/apis/legacy/v1alpha1/groupversion_info.go similarity index 100% rename from pkg/apis/t1/v1alpha1/groupversion_info.go rename to pkg/apis/legacy/v1alpha1/groupversion_info.go diff --git a/pkg/apis/t1/v1alpha1/nsxserviceaccount_types.go b/pkg/apis/legacy/v1alpha1/nsxserviceaccount_types.go similarity index 100% rename from pkg/apis/t1/v1alpha1/nsxserviceaccount_types.go rename to pkg/apis/legacy/v1alpha1/nsxserviceaccount_types.go diff --git a/pkg/apis/t1/v1alpha1/register.go b/pkg/apis/legacy/v1alpha1/register.go similarity index 100% rename from pkg/apis/t1/v1alpha1/register.go rename to pkg/apis/legacy/v1alpha1/register.go diff --git a/pkg/apis/t1/v1alpha1/securitypolicy_types.go b/pkg/apis/legacy/v1alpha1/securitypolicy_types.go similarity index 100% rename from pkg/apis/t1/v1alpha1/securitypolicy_types.go rename to pkg/apis/legacy/v1alpha1/securitypolicy_types.go diff --git a/pkg/apis/t1/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/legacy/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from pkg/apis/t1/v1alpha1/zz_generated.deepcopy.go rename to pkg/apis/legacy/v1alpha1/zz_generated.deepcopy.go diff --git a/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller.go b/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller.go index c8a196471..8e07ea9e3 100644 --- a/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller.go +++ b/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/predicate" - nsxvmwarecomv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + nsxvmwarecomv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/controllers/common" "github.com/vmware-tanzu/nsx-operator/pkg/logger" diff --git a/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go b/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go index 710b19523..7d86dbb96 100644 --- a/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go +++ b/pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go @@ -24,7 +24,7 @@ import ( controllerruntime "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client/fake" - nsxvmwarecomv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + nsxvmwarecomv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/config" mock_client "github.com/vmware-tanzu/nsx-operator/pkg/mock/controller-runtime/client" diff --git a/pkg/controllers/securitypolicy/securitypolicy_controller.go b/pkg/controllers/securitypolicy/securitypolicy_controller.go index 500e36706..f90a9f444 100644 --- a/pkg/controllers/securitypolicy/securitypolicy_controller.go +++ b/pkg/controllers/securitypolicy/securitypolicy_controller.go @@ -25,7 +25,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" crdv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/controllers/common" diff --git a/pkg/controllers/securitypolicy/securitypolicy_controller_test.go b/pkg/controllers/securitypolicy/securitypolicy_controller_test.go index b2f901c8d..d047c247d 100644 --- a/pkg/controllers/securitypolicy/securitypolicy_controller_test.go +++ b/pkg/controllers/securitypolicy/securitypolicy_controller_test.go @@ -28,7 +28,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/ratelimiter" "github.com/vmware-tanzu/nsx-operator/pkg/config" diff --git a/pkg/nsx/services/nsxserviceaccount/builder.go b/pkg/nsx/services/nsxserviceaccount/builder.go index c7921fcca..61b489dd4 100644 --- a/pkg/nsx/services/nsxserviceaccount/builder.go +++ b/pkg/nsx/services/nsxserviceaccount/builder.go @@ -6,7 +6,7 @@ package nsxserviceaccount import ( "github.com/vmware/vsphere-automation-sdk-go/services/nsxt/model" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" ) diff --git a/pkg/nsx/services/nsxserviceaccount/cluster.go b/pkg/nsx/services/nsxserviceaccount/cluster.go index 32073db4c..c6b3a76fb 100644 --- a/pkg/nsx/services/nsxserviceaccount/cluster.go +++ b/pkg/nsx/services/nsxserviceaccount/cluster.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/logger" "github.com/vmware-tanzu/nsx-operator/pkg/nsx" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" diff --git a/pkg/nsx/services/nsxserviceaccount/cluster_test.go b/pkg/nsx/services/nsxserviceaccount/cluster_test.go index 0f3a76688..2730280fc 100644 --- a/pkg/nsx/services/nsxserviceaccount/cluster_test.go +++ b/pkg/nsx/services/nsxserviceaccount/cluster_test.go @@ -26,7 +26,7 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/config" "github.com/vmware-tanzu/nsx-operator/pkg/nsx" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" diff --git a/pkg/nsx/services/securitypolicy/builder.go b/pkg/nsx/services/securitypolicy/builder.go index e6936d89e..b7cef914d 100644 --- a/pkg/nsx/services/securitypolicy/builder.go +++ b/pkg/nsx/services/securitypolicy/builder.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" nsxutil "github.com/vmware-tanzu/nsx-operator/pkg/nsx/util" "github.com/vmware-tanzu/nsx-operator/pkg/util" diff --git a/pkg/nsx/services/securitypolicy/builder_test.go b/pkg/nsx/services/securitypolicy/builder_test.go index 370c6d84c..005e3dead 100644 --- a/pkg/nsx/services/securitypolicy/builder_test.go +++ b/pkg/nsx/services/securitypolicy/builder_test.go @@ -14,7 +14,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/config" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" ) diff --git a/pkg/nsx/services/securitypolicy/convert.go b/pkg/nsx/services/securitypolicy/convert.go index df44a4555..fd6ba2d38 100644 --- a/pkg/nsx/services/securitypolicy/convert.go +++ b/pkg/nsx/services/securitypolicy/convert.go @@ -3,7 +3,7 @@ package securitypolicy import ( "unsafe" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" crdv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" ) diff --git a/pkg/nsx/services/securitypolicy/expand.go b/pkg/nsx/services/securitypolicy/expand.go index 7d687110e..3d802ff88 100644 --- a/pkg/nsx/services/securitypolicy/expand.go +++ b/pkg/nsx/services/securitypolicy/expand.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" nsxutil "github.com/vmware-tanzu/nsx-operator/pkg/nsx/util" "github.com/vmware-tanzu/nsx-operator/pkg/util" diff --git a/pkg/nsx/services/securitypolicy/expand_test.go b/pkg/nsx/services/securitypolicy/expand_test.go index f8e09cfef..782a4a636 100644 --- a/pkg/nsx/services/securitypolicy/expand_test.go +++ b/pkg/nsx/services/securitypolicy/expand_test.go @@ -15,7 +15,7 @@ import ( "k8s.io/client-go/tools/cache" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/config" "github.com/vmware-tanzu/nsx-operator/pkg/nsx" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" diff --git a/pkg/nsx/services/securitypolicy/firewall.go b/pkg/nsx/services/securitypolicy/firewall.go index 6173095ea..50559d9f4 100644 --- a/pkg/nsx/services/securitypolicy/firewall.go +++ b/pkg/nsx/services/securitypolicy/firewall.go @@ -15,7 +15,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/logger" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" nsxutil "github.com/vmware-tanzu/nsx-operator/pkg/nsx/util" diff --git a/pkg/nsx/services/securitypolicy/firewall_test.go b/pkg/nsx/services/securitypolicy/firewall_test.go index 0704c8f06..d1a51a643 100644 --- a/pkg/nsx/services/securitypolicy/firewall_test.go +++ b/pkg/nsx/services/securitypolicy/firewall_test.go @@ -19,7 +19,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/config" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" ) diff --git a/pkg/nsx/services/securitypolicy/parse.go b/pkg/nsx/services/securitypolicy/parse.go index f025ba5eb..1ba794296 100644 --- a/pkg/nsx/services/securitypolicy/parse.go +++ b/pkg/nsx/services/securitypolicy/parse.go @@ -3,7 +3,7 @@ package securitypolicy import ( "errors" - "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common" "github.com/vmware-tanzu/nsx-operator/pkg/util" ) diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 695b6dda9..c78cdd72c 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" - t1v1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/t1/v1alpha1" + t1v1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/legacy/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/apis/vpc/v1alpha1" "github.com/vmware-tanzu/nsx-operator/pkg/logger" "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common"