Revert "feat(platform): support lb (#2091)" (#2111)

This reverts commit f0ae6ee.
tkestack · Oct 14, 2022 · 85ea2eb · 85ea2eb
1 parent 27734eb
commit 85ea2eb
Show file tree

Hide file tree

Showing 11 changed files with 357 additions and 930 deletions.
diff --git a/api/openapi/zz_generated.openapi.go b/api/openapi/zz_generated.openapi.go
diff --git a/api/platform/types.go b/api/platform/types.go
@@ -568,17 +568,10 @@ type HA struct {
 }
 
 type TKEHA struct {
-	VIP        string
-	VRID       *int32
-	DirectorIP string //an inner vip used by tcs-lb components
-	VIPPool    *VIPPool
+	VIP  string
+	VRID *int32
 }
 
-//vippool: vippool is a pool of vips, supported by tcs lb
-type VIPPool struct {
-	Inner []string //private ip pool, svc using a vip in inner pool will not be exposed on Internet
-	Outer []string //public ip pool, svc using a vip in outer pool will be exposed on Internet
-}
 type ThirdPartyHA struct {
 	VIP   string
 	VPort int32

diff --git a/api/platform/v1/generated.pb.go b/api/platform/v1/generated.pb.go
diff --git a/api/platform/v1/generated.proto b/api/platform/v1/generated.proto
diff --git a/api/platform/v1/types.go b/api/platform/v1/types.go
@@ -585,18 +585,6 @@ type HA struct {
 type TKEHA struct {
 	VIP  string `json:"vip" protobuf:"bytes,1,name=vip"`
 	VRID *int32 `json:"vrid,omitempty" protobuf:"bytes,2,name=vrid"`
-	//DirectorIP: an inner vip used by tcs-lb components
-	DirectorIP string   `json:"directorip,omitempty" protobuf:"bytes,3,name=directorip"`
-	VIPPool    *VIPPool `json:"vippool,omitempty" protobuf:"bytes,4,name=vippool"`
-}
-
-//vippool: vippool is a pool of vips, supported by tcs lb
-type VIPPool struct {
-	//Inner: private ip pool, svc using a vip in inner pool will not be exposed on Internet
-	Inner []string `json:"inner,omitempty" protobuf:"bytes,1,name=inner"`
-
-	//Outer: public ip pool, svc using a vip in outer pool will be exposed on Internet
-	Outer []string `json:"outer,omitempty" protobuf:"bytes,2,name=outer"`
 }
 
 type ThirdPartyHA struct {

diff --git a/api/platform/v1/types_swagger_doc_generated.go b/api/platform/v1/types_swagger_doc_generated.go
diff --git a/api/platform/v1/zz_generated.conversion.go b/api/platform/v1/zz_generated.conversion.go
diff --git a/api/platform/v1/zz_generated.deepcopy.go b/api/platform/v1/zz_generated.deepcopy.go
diff --git a/api/platform/zz_generated.deepcopy.go b/api/platform/zz_generated.deepcopy.go
diff --git a/pkg/platform/types/types.go b/pkg/platform/types/types.go
@@ -86,32 +86,6 @@ func (c *Cluster) GetMainIP() string {
 	return mainIP
 }
 
-func (c *Cluster) GetDirectorIP() string {
-	if c.Spec.Features.HA != nil {
-		if c.Spec.Features.HA.TKEHA != nil {
-			return c.Spec.Features.HA.TKEHA.DirectorIP
-		}
-	}
-	return ""
-}
-
-func (c *Cluster) GetInnerVIPs() []string {
-	if c.Spec.Features.HA != nil {
-		if c.Spec.Features.HA.TKEHA != nil && c.Spec.Features.HA.TKEHA.VIPPool != nil {
-			return c.Spec.Features.HA.TKEHA.VIPPool.Inner
-		}
-	}
-	return nil
-}
-
-func (c *Cluster) GetMasterIPs() []string {
-	var IPs []string
-	for _, machine := range c.Spec.Machines {
-		IPs = append(IPs, machine.IP)
-	}
-	return IPs
-}
-
 func (c *Cluster) Clientset() (kubernetes.Interface, error) {
 	config, err := c.RESTConfig()
 	if err != nil {

diff --git a/pkg/platform/types/v1/types.go b/pkg/platform/types/v1/types.go
@@ -71,32 +71,6 @@ func (c *Cluster) GetMainIP() string {
 	return mainIP
 }
 
-func (c *Cluster) GetDirectorIP() string {
-	if c.Spec.Features.HA != nil {
-		if c.Spec.Features.HA.TKEHA != nil {
-			return c.Spec.Features.HA.TKEHA.DirectorIP
-		}
-	}
-	return ""
-}
-
-func (c *Cluster) GetInnerVIPs() []string {
-	if c.Spec.Features.HA != nil {
-		if c.Spec.Features.HA.TKEHA != nil && c.Spec.Features.HA.TKEHA.VIPPool != nil {
-			return c.Spec.Features.HA.TKEHA.VIPPool.Inner
-		}
-	}
-	return nil
-}
-
-func (c *Cluster) GetMasterIPs() []string {
-	var IPs []string
-	for _, machine := range c.Spec.Machines {
-		IPs = append(IPs, machine.IP)
-	}
-	return IPs
-}
-
 func (c *Cluster) ClientsetForBootstrap() (kubernetes.Interface, error) {
 	config, err := c.RESTConfigForBootstrap()
 	if err != nil {