Skip to content

Commit

Permalink
chore: clean up useless code (#902)
Browse files Browse the repository at this point in the history 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
  • Loading branch information
@tao12345666333
tao12345666333 committed Mar 9, 2022
1 parent 4025151 commit 75098d1
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 327 deletions.
288 changes: 0 additions & 288 deletions pkg/kube/translation/apisix_route.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,111 +29,6 @@ import (
apisixv1 "github.com/apache/apisix-ingress-controller/pkg/types/apisix/v1"
)

//func (t *translator) TranslateRouteV1(ar *configv1.ApisixRoute) (*TranslateContext, error) {
// ctx := &TranslateContext{
// upstreamMap: make(map[string]struct{}),
// }
// plugins := t.translateAnnotations(ar.Annotations)
//
// for _, r := range ar.Spec.Rules {
// for _, p := range r.Http.Paths {
// pluginMap := make(apisixv1.Plugins)
// // 1.add annotation plugins
// for k, v := range plugins {
// pluginMap[k] = v
// }
// // 2.add route plugins
// for _, plugin := range p.Plugins {
// if !plugin.Enable {
// continue
// }
// if plugin.Config != nil {
// pluginMap[plugin.Name] = plugin.Config
// } else if plugin.ConfigSet != nil {
// pluginMap[plugin.Name] = plugin.ConfigSet
// } else {
// pluginMap[plugin.Name] = make(map[string]interface{})
// }
// }
//
// upstreamName := apisixv1.ComposeUpstreamName(ar.Namespace, p.Backend.ServiceName, "", int32(p.Backend.ServicePort))
// route := apisixv1.NewDefaultRoute()
// route.Name = r.Host + p.Path
// route.ID = id.GenID(route.Name)
// route.Host = r.Host
// route.Uri = p.Path
// route.Plugins = pluginMap
// route.UpstreamId = id.GenID(upstreamName)
//
// if !ctx.checkUpstreamExist(upstreamName) {
// ups, err := t.TranslateUpstream(ar.Namespace, p.Backend.ServiceName, "", int32(p.Backend.ServicePort))
// if err != nil {
// return nil, err
// }
// ups.ID = route.UpstreamId
// ups.Name = upstreamName
// ctx.addUpstream(ups)
// }
// ctx.addRoute(route)
// }
// }
// return ctx, nil
//}

// TranslateRouteV2alpha1NotStrictly translates route v2alpha1 with a loose way, only generate ID and Name for delete Event.
//func (t *translator) TranslateRouteV2alpha1NotStrictly(ar *configv2alpha1.ApisixRoute) (*TranslateContext, error) {
// ctx := &TranslateContext{
// upstreamMap: make(map[string]struct{}),
// }
//
// if err := t.translateHTTPRouteNotStrictly(ctx, ar); err != nil {
// return nil, err
// }
// if err := t.translateTCPRouteNotStrictly(ctx, ar); err != nil {
// return nil, err
// }
// return ctx, nil
//}

//func (t *translator) TranslateRouteV2alpha1(ar *configv2alpha1.ApisixRoute) (*TranslateContext, error) {
// ctx := &TranslateContext{
// upstreamMap: make(map[string]struct{}),
// }
//
// if err := t.translateHTTPRoute(ctx, ar); err != nil {
// return nil, err
// }
// if err := t.translateTCPRoute(ctx, ar); err != nil {
// return nil, err
// }
// return ctx, nil
//}

// translateHTTPRouteNotStrictly translates http route with a loose way, only generate ID and Name for delete Event.
//func (t *translator) translateHTTPRouteNotStrictly(ctx *TranslateContext, ar *configv2beta3.ApisixRoute) error {
// for _, part := range ar.Spec.HTTP {
// backends := part.Backends
// if len(backends) > 0 {
// // Use the first backend as the default backend in Route,
// // others will be configured in traffic-split plugin.
// backend := backends[0]
// upstreamName := apisixv1.ComposeUpstreamName(ar.Namespace, backend.ServiceName, backend.Subset, backend.ServicePort.IntVal)
// route := apisixv1.NewDefaultRoute()
// route.Name = apisixv1.ComposeRouteName(ar.Namespace, ar.Name, part.Name)
// route.ID = id.GenID(route.Name)
// ctx.addRoute(route)
// if !ctx.checkUpstreamExist(upstreamName) {
// ups, err := t.translateUpstreamNotStrictly(ar.Namespace, backend.ServiceName, backend.Subset, backend.ServicePort.IntVal)
// if err != nil {
// return err
// }
// ctx.addUpstream(ups)
// }
// }
// }
// return nil
//}

func (t *translator) TranslateRouteV2beta1(ar *configv2beta1.ApisixRoute) (*TranslateContext, error) {
ctx := defaultEmptyTranslateContext()

Expand Down Expand Up @@ -561,133 +456,6 @@ func (t *translator) translateHTTPRouteV2beta3(ctx *TranslateContext, ar *config
return nil
}

//func (t *translator) translateHTTPRoute(ctx *TranslateContext, ar *configv2beta3.ApisixRoute) error {
// ruleNameMap := make(map[string]struct{})
// for _, part := range ar.Spec.HTTP {
// if _, ok := ruleNameMap[part.Name]; ok {
// return errors.New("duplicated route rule name")
// }
// ruleNameMap[part.Name] = struct{}{}
// backends := part.Backends
//
// // Use the first backend as the default backend in Route,
// // others will be configured in traffic-split plugin.
// backend := backends[0]
// backends = backends[1:]
//
// svcClusterIP, svcPort, err := t.getServiceClusterIPAndPort(&backend, ar.Namespace)
// if err != nil {
// log.Errorw("failed to get service port in backend",
// zap.Any("backend", backend),
// zap.Any("apisix_route", ar),
// zap.Error(err),
// )
// return err
// }
//
// timeout := &apisixv1.UpstreamTimeout{
// Connect: apisixv1.DefaultUpstreamTimeout,
// Read: apisixv1.DefaultUpstreamTimeout,
// Send: apisixv1.DefaultUpstreamTimeout,
// }
// if part.Timeout != nil {
// if part.Timeout.Connect.Duration > 0 {
// timeout.Connect = int(part.Timeout.Connect.Seconds())
// }
// if part.Timeout.Read.Duration > 0 {
// timeout.Read = int(part.Timeout.Read.Seconds())
// }
// if part.Timeout.Send.Duration > 0 {
// timeout.Send = int(part.Timeout.Send.Seconds())
// }
// }
// pluginMap := make(apisixv1.Plugins)
// // 2.add route plugins
// for _, plugin := range part.Plugins {
// if !plugin.Enable {
// continue
// }
// if plugin.Config != nil {
// pluginMap[plugin.Name] = plugin.Config
// } else {
// pluginMap[plugin.Name] = make(map[string]interface{})
// }
// }
//
// // add KeyAuth and basicAuth plugin
// if part.Authentication.Enable {
// switch part.Authentication.Type {
// case "keyAuth":
// pluginMap["key-auth"] = part.Authentication.KeyAuth
// case "basicAuth":
// pluginMap["basic-auth"] = make(map[string]interface{})
// default:
// pluginMap["basic-auth"] = make(map[string]interface{})
// }
// }
//
// var exprs [][]apisixv1.StringOrSlice
// if part.Match.NginxVars != nil {
// exprs, err = t.translateRouteMatchExprs(part.Match.NginxVars)
// if err != nil {
// log.Errorw("ApisixRoute with bad nginxVars",
// zap.Error(err),
// zap.Any("ApisixRoute", ar),
// )
// return err
// }
// }
// if err := validateRemoteAddrs(part.Match.RemoteAddrs); err != nil {
// log.Errorw("ApisixRoute with invalid remote addrs",
// zap.Error(err),
// zap.Strings("remote_addrs", part.Match.RemoteAddrs),
// zap.Any("ApisixRoute", ar),
// )
// return err
// }
//
// upstreamName := apisixv1.ComposeUpstreamName(ar.Namespace, backend.ServiceName, backend.Subset, svcPort)
// route := apisixv1.NewDefaultRoute()
// route.Name = apisixv1.ComposeRouteName(ar.Namespace, ar.Name, part.Name)
// route.ID = id.GenID(route.Name)
// route.Priority = part.Priority
// route.RemoteAddrs = part.Match.RemoteAddrs
// route.Vars = exprs
// route.Hosts = part.Match.Hosts
// route.Uris = part.Match.Paths
// route.Methods = part.Match.Methods
// route.UpstreamId = id.GenID(upstreamName)
// route.EnableWebsocket = part.Websocket
// route.Plugins = pluginMap
// route.Timeout = timeout
//
// if len(backends) > 0 {
// weight := _defaultWeight
// if backend.Weight != nil {
// weight = *backend.Weight
// }
// plugin, err := t.translateTrafficSplitPlugin(ctx, ar.Namespace, weight, backends)
// if err != nil {
// log.Errorw("failed to translate traffic-split plugin",
// zap.Error(err),
// zap.Any("ApisixRoute", ar),
// )
// return err
// }
// route.Plugins["traffic-split"] = plugin
// }
// ctx.addRoute(route)
// if !ctx.checkUpstreamExist(upstreamName) {
// ups, err := t.translateUpstream(ar.Namespace, backend.ServiceName, backend.Subset, backend.ResolveGranularity, svcClusterIP, svcPort)
// if err != nil {
// return err
// }
// ctx.addUpstream(ups)
// }
// }
// return nil
//}

func (t *translator) translateRouteMatchExprs(nginxVars []configv2beta3.ApisixRouteHTTPMatchExpr) ([][]apisixv1.StringOrSlice, error) {
var (
vars [][]apisixv1.StringOrSlice
Expand Down Expand Up @@ -788,27 +556,6 @@ func (t *translator) translateRouteMatchExprs(nginxVars []configv2beta3.ApisixRo
return vars, nil
}

//// translateTCPRouteNotStrictly translates tcp route with a loose way, only generate ID and Name for delete Event.
//func (t *translator) translateTCPRouteNotStrictly(ctx *TranslateContext, ar *configv2beta3.ApisixRoute) error {
// for _, part := range ar.Spec.TCP {
// backend := &part.Backend
// sr := apisixv1.NewDefaultStreamRoute()
// name := apisixv1.ComposeStreamRouteName(ar.Namespace, ar.Name, part.Name)
// sr.ID = id.GenID(name)
// sr.ServerPort = part.Match.IngressPort
// ups, err := t.translateUpstreamNotStrictly(ar.Namespace, backend.ServiceName, backend.Subset, backend.ServicePort.IntVal)
// if err != nil {
// return err
// }
// sr.UpstreamId = ups.ID
// ctx.addStreamRoute(sr)
// if !ctx.checkUpstreamExist(ups.Name) {
// ctx.addUpstream(ups)
// }
// }
// return nil
//}

func (t *translator) translateStreamRoute(ctx *TranslateContext, ar *configv2beta1.ApisixRoute) error {
ruleNameMap := make(map[string]struct{})
for _, part := range ar.Spec.Stream {
Expand Down Expand Up @@ -843,41 +590,6 @@ func (t *translator) translateStreamRoute(ctx *TranslateContext, ar *configv2bet
return nil
}

//func (t *translator) translateTCPRoute(ctx *TranslateContext, ar *configv2alpha1.ApisixRoute) error {
// ruleNameMap := make(map[string]struct{})
// for _, part := range ar.Spec.TCP {
// if _, ok := ruleNameMap[part.Name]; ok {
// return errors.New("duplicated route rule name")
// }
// ruleNameMap[part.Name] = struct{}{}
// backend := &part.Backend
// svcClusterIP, svcPort, err := t.getTCPServiceClusterIPAndPort(backend, ar)
// if err != nil {
// log.Errorw("failed to get service port in backend",
// zap.Any("backend", backend),
// zap.Any("apisix_route", ar),
// zap.Error(err),
// )
// return err
// }
// sr := apisixv1.NewDefaultStreamRoute()
// name := apisixv1.ComposeStreamRouteName(ar.Namespace, ar.Name, part.Name)
// sr.ID = id.GenID(name)
// sr.ServerPort = part.Match.IngressPort
// ups, err := t.translateUpstream(ar.Namespace, backend.ServiceName, backend.Subset, backend.ResolveGranularity, svcClusterIP, svcPort)
// if err != nil {
// return err
// }
// sr.UpstreamId = ups.ID
// ctx.addStreamRoute(sr)
// if !ctx.checkUpstreamExist(ups.Name) {
// ctx.addUpstream(ups)
// }
//
// }
// return nil
//}

// translateHTTPRouteV2beta1NotStrictly translates http route with a loose way, only generate ID and Name for delete Event.
func (t *translator) translateHTTPRouteV2beta1NotStrictly(ctx *TranslateContext, ar *configv2beta1.ApisixRoute) error {
for _, part := range ar.Spec.HTTP {
Expand Down
39 changes: 0 additions & 39 deletions pkg/kube/translation/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,45 +73,6 @@ loop:
return svc.Spec.ClusterIP, svcPort, nil
}

//func (t *translator) getTCPServiceClusterIPAndPort(backend *configv2beta3.ApisixRouteTCPBackend, ar *configv2beta3.ApisixRoute) (string, int32, error) {
// svc, err := t.ServiceLister.Services(ar.Namespace).Get(backend.ServiceName)
// if err != nil {
// return "", 0, err
// }
// svcPort := int32(-1)
// if backend.ResolveGranularity == "service" && svc.Spec.ClusterIP == "" {
// log.Errorw("ApisixRoute refers to a headless service but want to use the service level resolve granularity",
// zap.Any("ApisixRoute", ar),
// zap.Any("service", svc),
// )
// return "", 0, errors.New("conflict headless service and backend resolve granularity")
// }
//loop:
// for _, port := range svc.Spec.Ports {
// switch backend.ServicePort.Type {
// case intstr.Int:
// if backend.ServicePort.IntVal == port.Port {
// svcPort = port.Port
// break loop
// }
// case intstr.String:
// if backend.ServicePort.StrVal == port.Name {
// svcPort = port.Port
// break loop
// }
// }
// }
// if svcPort == -1 {
// log.Errorw("ApisixRoute refers to non-existent Service port",
// zap.Any("ApisixRoute", ar),
// zap.String("port", backend.ServicePort.String()),
// )
// return "", 0, err
// }
//
// return svc.Spec.ClusterIP, svcPort, nil
//}

// getStreamServiceClusterIPAndPort is for v2beta1 streamRoute
func (t *translator) getStreamServiceClusterIPAndPort(backend configv2beta1.ApisixRouteStreamBackend, ns string) (string, int32, error) {
svc, err := t.ServiceLister.Services(ns).Get(backend.ServiceName)
Expand Down

0 comments on commit 75098d1

Please sign in to comment.