Merge pull request #671 from zhengxiexie/zhengxie/rm_stale

Remove ippool CRD and other stale resources
vmware-tanzu · Aug 9, 2024 · 98a84f1 · 98a84f1
2 parents b3bdcba + e4c141f
commit 98a84f1
Show file tree

Hide file tree

Showing 79 changed files with 186 additions and 7,066 deletions.
diff --git 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/crd.nsx.vmware.com/v1alpha1;github.com/vmware-tanzu/nsx-operator/pkg/apis/crd.nsx.vmware.com/v1alpha2" output:crd:artifacts:config=build/yaml/crd/vpc/
+	$(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="github.com/vmware-tanzu/nsx-operator/pkg/apis/crd.nsx.vmware.com/v1alpha1" output:crd:artifacts:config=build/yaml/crd/vpc/
 
 .PHONY: generate
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.

diff --git a/build/yaml/crd/vpc/crd.nsx.vmware.com_ippools.yaml b/build/yaml/crd/vpc/crd.nsx.vmware.com_ippools.yaml
diff --git a/cmd/main.go b/cmd/main.go
@@ -20,13 +20,10 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
 	crdv1alpha1 "github.com/vmware-tanzu/nsx-operator/pkg/apis/crd.nsx.vmware.com/v1alpha1"
-	crdv1alpha2 "github.com/vmware-tanzu/nsx-operator/pkg/apis/crd.nsx.vmware.com/v1alpha2"
 	"github.com/vmware-tanzu/nsx-operator/pkg/apis/nsx.vmware.com/v1alpha1"
-	"github.com/vmware-tanzu/nsx-operator/pkg/apis/nsx.vmware.com/v1alpha2"
 	"github.com/vmware-tanzu/nsx-operator/pkg/controllers/ipaddressallocation"
 
 	"github.com/vmware-tanzu/nsx-operator/pkg/config"
-	ippool2 "github.com/vmware-tanzu/nsx-operator/pkg/controllers/ippool"
 	namespacecontroller "github.com/vmware-tanzu/nsx-operator/pkg/controllers/namespace"
 	networkinfocontroller "github.com/vmware-tanzu/nsx-operator/pkg/controllers/networkinfo"
 	networkpolicycontroller "github.com/vmware-tanzu/nsx-operator/pkg/controllers/networkpolicy"
@@ -50,7 +47,6 @@ import (
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/common"
 	ipaddressallocationservice "github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/ipaddressallocation"
-	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/ippool"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/nsxserviceaccount"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/services/vpc"
 	"github.com/vmware-tanzu/nsx-operator/pkg/nsx/util"
@@ -67,9 +63,7 @@ func init() {
 	var err error
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 	utilruntime.Must(crdv1alpha1.AddToScheme(scheme))
-	utilruntime.Must(crdv1alpha2.AddToScheme(scheme))
 	utilruntime.Must(v1alpha1.AddToScheme(scheme))
-	utilruntime.Must(v1alpha2.AddToScheme(scheme))
 	utilruntime.Must(vmv1alpha1.AddToScheme(scheme))
 	config.AddFlags()
 
@@ -115,22 +109,6 @@ func StartNSXServiceAccountController(mgr ctrl.Manager, commonService common.Ser
 	go commonctl.GenericGarbageCollector(make(chan bool), common.GCInterval, nsxServiceAccountReconcile.CollectGarbage)
 }
 
-func StartIPPoolController(mgr ctrl.Manager, ipPoolService *ippool.IPPoolService, vpcService common.VPCServiceProvider) {
-	ippoolReconcile := &ippool2.IPPoolReconciler{
-		Client:     mgr.GetClient(),
-		Scheme:     mgr.GetScheme(),
-		Service:    ipPoolService,
-		VPCService: vpcService,
-		Recorder:   mgr.GetEventRecorderFor("ippool-controller"),
-	}
-
-	if err := ippoolReconcile.Start(mgr); err != nil {
-		log.Error(err, "failed to create controller", "controller", "IPPool")
-		os.Exit(1)
-	}
-	go commonctl.GenericGarbageCollector(make(chan bool), common.GCInterval, ippoolReconcile.CollectGarbage)
-}
-
 func StartNetworkInfoController(mgr ctrl.Manager, vpcService *vpc.VPCService) {
 	networkInfoReconciler := &networkinfocontroller.NetworkInfoReconciler{
 		Client:   mgr.GetClient(),
@@ -205,10 +183,6 @@ func startServiceController(mgr manager.Manager, nsxClient *nsx.Client) {
 			log.Error(err, "failed to initialize subnet commonService")
 			os.Exit(1)
 		}
-		ipPoolService, err := ippool.InitializeIPPool(commonService, vpcService)
-		if err != nil {
-			log.Error(err, "failed to initialize ippool commonService", "controller", "IPPool")
-		}
 		ipAddressAllocationService, err := ipaddressallocationservice.InitializeIPAddressAllocation(commonService, vpcService)
 		if err != nil {
 			log.Error(err, "failed to initialize ipaddressallocation commonService", "controller", "IPAddressAllocation")
@@ -248,7 +222,6 @@ func startServiceController(mgr manager.Manager, nsxClient *nsx.Client) {
 		staticroutecontroller.StartStaticRouteController(mgr, staticRouteService)
 		subnetport.StartSubnetPortController(mgr, subnetPortService, subnetService, vpcService)
 		pod.StartPodController(mgr, subnetPortService, subnetService, vpcService, nodeService)
-		StartIPPoolController(mgr, ipPoolService, vpcService)
 		StartIPAddressAllocationController(mgr, ipAddressAllocationService, vpcService)
 		networkpolicycontroller.StartNetworkPolicyController(mgr, commonService, vpcService)
 		service.StartServiceLbController(mgr, commonService)

diff --git a/go.mod b/go.mod
@@ -5,7 +5,6 @@ go 1.22.5
 replace (
 	github.com/vmware-tanzu/nsx-operator/pkg/apis => ./pkg/apis
 	github.com/vmware-tanzu/nsx-operator/pkg/apis/crd.nsx.vmware.com/v1alpha1 => ./pkg/apis/crd.nsx.vmware.com/v1alpha1
-	github.com/vmware-tanzu/nsx-operator/pkg/apis/crd.nsx.vmware.com/v1alpha2 => ./pkg/apis/crd.nsx.vmware.com/v1alpha2
 	github.com/vmware-tanzu/nsx-operator/pkg/client => ./pkg/client
 	github.com/vmware/vsphere-automation-sdk-go/lib => github.com/zhengxiexie/vsphere-automation-sdk-go/lib v0.7.3-0.20240628090521-3ad1af047210
 	github.com/vmware/vsphere-automation-sdk-go/runtime => github.com/zhengxiexie/vsphere-automation-sdk-go/runtime v0.7.3-0.20240628090521-3ad1af047210
@@ -24,11 +23,10 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/kevinburke/ssh_config v1.2.0
 	github.com/openlyinc/pointy v1.1.2
-	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
 	github.com/sirupsen/logrus v1.9.0
 	github.com/stretchr/testify v1.8.4
-	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240805022824-6e7c54aba36a
+	github.com/vmware-tanzu/nsx-operator/pkg/apis v0.0.0-20240807075532-2cc0f8de2fc1
 	github.com/vmware-tanzu/nsx-operator/pkg/client v0.0.0-20240102061654-537b080e159f
 	github.com/vmware-tanzu/vm-operator/api v1.8.2
 	github.com/vmware/govmomi v0.27.4
@@ -76,6 +74,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_model v0.4.0 // indirect
 	github.com/prometheus/common v0.44.0 // indirect

diff --git a/hack/update-codegen.sh b/hack/update-codegen.sh
@@ -16,14 +16,15 @@ CODEGEN_PKG=$(go env GOMODCACHE)/k8s.io/[email protected]
 rm -fr "${APIS:?}/${GROUP:?}"
 rm -fr ./pkg/client
 
-for VERSION in v1alpha1 v1alpha2; do
+# shellcheck disable=SC2043
+for VERSION in v1alpha1 ; do
   mkdir -p "${APIS}/${GROUP}/${VERSION}"
   cp -r "${APIS}/${VERSION}"/* "${APIS}/${GROUP}/${VERSION}/"
 done
 
 bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \
 ${OUTPUT_PKG} ${APIS_PKG} \
-${GROUP}:v1alpha1,v1alpha2 \
+${GROUP}:v1alpha1 \
 --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
 --output-base "${SCRIPT_ROOT}" -v 10