support virtualservice multi port
Signed-off-by: zackzhangkai <zhangkaiamm@gmail.com>
This commit is contained in:
zackzhangkai
@@ -19,10 +19,6 @@ package virtualservice
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"kubesphere.io/kubesphere/pkg/controller/utils/servicemesh"
|
||||
"reflect"
|
||||
"strings"
|
||||
|
||||
apinetworkingv1alpha3 "istio.io/api/networking/v1alpha3"
|
||||
clientgonetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
|
||||
istioclient "istio.io/client-go/pkg/clientset/versioned"
|
||||
@@ -49,6 +45,8 @@ import (
|
||||
servicemeshclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
|
||||
servicemeshinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/servicemesh/v1alpha2"
|
||||
servicemeshlisters "kubesphere.io/kubesphere/pkg/client/listers/servicemesh/v1alpha2"
|
||||
"kubesphere.io/kubesphere/pkg/controller/utils/servicemesh"
|
||||
"reflect"
|
||||
|
||||
"time"
|
||||
)
|
||||
@@ -320,9 +318,13 @@ func (v *VirtualServiceController) syncService(key string) error {
|
||||
// TODO(jeff): use FQDN to replace service name
|
||||
vs.Spec.Hosts = []string{name}
|
||||
|
||||
vs.Spec.Http = []*apinetworkingv1alpha3.HTTPRoute{}
|
||||
vs.Spec.Tcp = []*apinetworkingv1alpha3.TCPRoute{}
|
||||
|
||||
// check if service has TCP protocol ports
|
||||
for _, port := range service.Spec.Ports {
|
||||
var route apinetworkingv1alpha3.HTTPRouteDestination
|
||||
var match apinetworkingv1alpha3.HTTPMatchRequest
|
||||
if port.Protocol == v1.ProtocolTCP {
|
||||
route = apinetworkingv1alpha3.HTTPRouteDestination{
|
||||
Destination: &apinetworkingv1alpha3.Destination{
|
||||
@@ -335,22 +337,29 @@ func (v *VirtualServiceController) syncService(key string) error {
|
||||
Weight: 100,
|
||||
}
|
||||
|
||||
// a http port, add to HTTPRoute
|
||||
if len(port.Name) > 0 && (port.Name == "http" || strings.HasPrefix(port.Name, "http-")) {
|
||||
vs.Spec.Http = []*apinetworkingv1alpha3.HTTPRoute{{Route: []*apinetworkingv1alpha3.HTTPRouteDestination{&route}}}
|
||||
break
|
||||
}
|
||||
match = apinetworkingv1alpha3.HTTPMatchRequest{Port: uint32(port.Port)}
|
||||
|
||||
// everything else treated as TCPRoute
|
||||
tcpRoute := apinetworkingv1alpha3.TCPRoute{
|
||||
Route: []*apinetworkingv1alpha3.RouteDestination{
|
||||
{
|
||||
Destination: route.Destination,
|
||||
Weight: route.Weight,
|
||||
// a http port, add to HTTPRoute
|
||||
|
||||
if servicemesh.SupportHttpProtocol(port.Name) {
|
||||
httpRoute := apinetworkingv1alpha3.HTTPRoute{
|
||||
Route: []*apinetworkingv1alpha3.HTTPRouteDestination{&route},
|
||||
Match: []*apinetworkingv1alpha3.HTTPMatchRequest{&match},
|
||||
}
|
||||
vs.Spec.Http = append(vs.Spec.Http, &httpRoute)
|
||||
} else {
|
||||
// everything else treated as TCPRoute
|
||||
tcpRoute := apinetworkingv1alpha3.TCPRoute{
|
||||
Route: []*apinetworkingv1alpha3.RouteDestination{
|
||||
{
|
||||
Destination: route.Destination,
|
||||
Weight: route.Weight,
|
||||
},
|
||||
},
|
||||
},
|
||||
Match: []*apinetworkingv1alpha3.L4MatchAttributes{{Port: match.Port}},
|
||||
}
|
||||
vs.Spec.Tcp = append(vs.Spec.Tcp, &tcpRoute)
|
||||
}
|
||||
vs.Spec.Tcp = []*apinetworkingv1alpha3.TCPRoute{&tcpRoute}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -385,7 +394,6 @@ func (v *VirtualServiceController) syncService(key string) error {
|
||||
default:
|
||||
vs.Spec = v.generateVirtualServiceSpec(strategies[0], service).Spec
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
createVirtualService := len(currentVirtualService.ResourceVersion) == 0
|
||||
@@ -542,8 +550,40 @@ func (v *VirtualServiceController) getSubsets(strategy *servicemeshv1alpha2.Stra
|
||||
func (v *VirtualServiceController) generateVirtualServiceSpec(strategy *servicemeshv1alpha2.Strategy, service *v1.Service) *clientgonetworkingv1alpha3.VirtualService {
|
||||
|
||||
// Define VirtualService to be created
|
||||
vs := &clientgonetworkingv1alpha3.VirtualService{
|
||||
Spec: strategy.Spec.Template.Spec,
|
||||
vs := &clientgonetworkingv1alpha3.VirtualService{}
|
||||
vs.Spec.Hosts = strategy.Spec.Template.Spec.Hosts
|
||||
|
||||
// For multi-ports, apply the rules to each port matched http/tcp protocol
|
||||
for _, port := range service.Spec.Ports {
|
||||
s := strategy.DeepCopy()
|
||||
strategyTempSpec := s.Spec.Template.Spec
|
||||
// fill route.destination.port and match.port filed
|
||||
if len(strategyTempSpec.Http) > 0 && servicemesh.SupportHttpProtocol(port.Name) {
|
||||
for _, http := range strategyTempSpec.Http {
|
||||
if len(http.Match) == 0 {
|
||||
http.Match = []*apinetworkingv1alpha3.HTTPMatchRequest{{Port: uint32(port.Port)}}
|
||||
} else {
|
||||
for _, match := range http.Match {
|
||||
match.Port = uint32(port.Port)
|
||||
}
|
||||
}
|
||||
for _, route := range http.Route {
|
||||
route.Destination.Port = &apinetworkingv1alpha3.PortSelector{
|
||||
Number: uint32(port.Port),
|
||||
}
|
||||
}
|
||||
}
|
||||
vs.Spec.Http = append(vs.Spec.Http, strategyTempSpec.Http...)
|
||||
}
|
||||
if len(strategyTempSpec.Tcp) > 0 && !servicemesh.SupportHttpProtocol(port.Name) {
|
||||
for _, tcp := range strategyTempSpec.Tcp {
|
||||
tcp.Match = []*apinetworkingv1alpha3.L4MatchAttributes{{Port: uint32(port.Port)}}
|
||||
for _, r := range tcp.Route {
|
||||
r.Destination.Port = &apinetworkingv1alpha3.PortSelector{Number: uint32(port.Port)}
|
||||
}
|
||||
}
|
||||
vs.Spec.Tcp = append(vs.Spec.Tcp, strategyTempSpec.Tcp...)
|
||||
}
|
||||
}
|
||||
|
||||
// one version rules them all
|
||||
@@ -556,29 +596,34 @@ func (v *VirtualServiceController) generateVirtualServiceSpec(strategy *servicem
|
||||
Weight: 100,
|
||||
}
|
||||
|
||||
if len(strategy.Spec.Template.Spec.Http) > 0 {
|
||||
governorRoute := apinetworkingv1alpha3.HTTPRoute{
|
||||
Route: []*apinetworkingv1alpha3.HTTPRouteDestination{&governorDestinationWeight},
|
||||
}
|
||||
for _, port := range service.Spec.Ports {
|
||||
match := apinetworkingv1alpha3.HTTPMatchRequest{Port: uint32(port.Port)}
|
||||
if len(strategy.Spec.Template.Spec.Http) > 0 {
|
||||
governorRoute := apinetworkingv1alpha3.HTTPRoute{
|
||||
Route: []*apinetworkingv1alpha3.HTTPRouteDestination{&governorDestinationWeight},
|
||||
Match: []*apinetworkingv1alpha3.HTTPMatchRequest{&match},
|
||||
}
|
||||
vs.Spec.Http = []*apinetworkingv1alpha3.HTTPRoute{&governorRoute}
|
||||
|
||||
vs.Spec.Http = []*apinetworkingv1alpha3.HTTPRoute{&governorRoute}
|
||||
} else if len(strategy.Spec.Template.Spec.Tcp) > 0 {
|
||||
tcpRoute := apinetworkingv1alpha3.TCPRoute{
|
||||
Route: []*apinetworkingv1alpha3.RouteDestination{
|
||||
{
|
||||
Destination: &apinetworkingv1alpha3.Destination{
|
||||
Host: governorDestinationWeight.Destination.Host,
|
||||
Subset: governorDestinationWeight.Destination.Subset,
|
||||
}
|
||||
if len(strategy.Spec.Template.Spec.Tcp) > 0 {
|
||||
tcpRoute := apinetworkingv1alpha3.TCPRoute{
|
||||
Route: []*apinetworkingv1alpha3.RouteDestination{
|
||||
{
|
||||
Destination: &apinetworkingv1alpha3.Destination{
|
||||
Host: governorDestinationWeight.Destination.Host,
|
||||
Subset: governorDestinationWeight.Destination.Subset,
|
||||
},
|
||||
Weight: governorDestinationWeight.Weight,
|
||||
},
|
||||
Weight: governorDestinationWeight.Weight,
|
||||
},
|
||||
},
|
||||
Match: []*apinetworkingv1alpha3.L4MatchAttributes{{Port: match.Port}},
|
||||
}
|
||||
|
||||
//governorRoute := v1alpha3.TCPRoute{tcpRoute}
|
||||
vs.Spec.Tcp = []*apinetworkingv1alpha3.TCPRoute{&tcpRoute}
|
||||
}
|
||||
|
||||
//governorRoute := v1alpha3.TCPRoute{tcpRoute}
|
||||
vs.Spec.Tcp = []*apinetworkingv1alpha3.TCPRoute{&tcpRoute}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
servicemesh.FillDestinationPort(vs, service)
|
||||
|
||||
Reference in New Issue
Block a user