Skip to content

Commit

Permalink
Merge pull request #687 from zhengxiexie/zhengxie/t1_to_legacy
Browse files Browse the repository at this point in the history 
Update pkg name t1 to legacy
  • Loading branch information
@zhengxiexie
zhengxiexie authored Aug 14, 2024
2 parents 1ea3e50 + d639c5d commit d5107ef
Show file tree
Hide file tree
Showing 27 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...t1/nsx.vmware.com_nsxserviceaccounts.yaml → ...cy/nsx.vmware.com_nsxserviceaccounts.yaml
View file
File renamed without changes.
0 ...d/t1/nsx.vmware.com_securitypolicies.yaml → ...gacy/nsx.vmware.com_securitypolicies.yaml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
0 pkg/apis/t1/v1alpha1/condition_types.go → pkg/apis/legacy/v1alpha1/condition_types.go
View file
File renamed without changes.
0 pkg/apis/t1/v1alpha1/doc.go → pkg/apis/legacy/v1alpha1/doc.go
View file
File renamed without changes.
0 pkg/apis/t1/v1alpha1/groupversion_info.go → ...apis/legacy/v1alpha1/groupversion_info.go
View file
File renamed without changes.
0 ...is/t1/v1alpha1/nsxserviceaccount_types.go → ...egacy/v1alpha1/nsxserviceaccount_types.go
View file
File renamed without changes.
0 pkg/apis/t1/v1alpha1/register.go → pkg/apis/legacy/v1alpha1/register.go
View file
File renamed without changes.
0 pkg/apis/t1/v1alpha1/securitypolicy_types.go → ...s/legacy/v1alpha1/securitypolicy_types.go
View file
File renamed without changes.
0 ...apis/t1/v1alpha1/zz_generated.deepcopy.go → .../legacy/v1alpha1/zz_generated.deepcopy.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/nsxserviceaccount/nsxserviceaccount_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/securitypolicy/securitypolicy_controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/securitypolicy/securitypolicy_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/nsxserviceaccount/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/nsxserviceaccount/cluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/nsxserviceaccount/cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/builder_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/convert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/expand.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/expand_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/firewall.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/firewall_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/nsx/services/securitypolicy/parse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit d5107ef

Please sign in to comment.