-
Notifications
You must be signed in to change notification settings - Fork 743
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract routing to dedicated package
- split routing management into Kubernetes service router and Istio Virtual service router
- Loading branch information
1 parent
535a92e
commit 3f5c22d
Showing
7 changed files
with
747 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package router | ||
|
|
||
| import ( | ||
| istioclientset "github.com/knative/pkg/client/clientset/versioned" | ||
| clientset "github.com/stefanprodan/flagger/pkg/client/clientset/versioned" | ||
| "go.uber.org/zap" | ||
| "k8s.io/client-go/kubernetes" | ||
| ) | ||
|
|
||
| type Factory struct { | ||
| kubeClient kubernetes.Interface | ||
| istioClient istioclientset.Interface | ||
| flaggerClient clientset.Interface | ||
| logger *zap.SugaredLogger | ||
| } | ||
|
|
||
| func NewFactory(kubeClient kubernetes.Interface, | ||
| flaggerClient clientset.Interface, | ||
| logger *zap.SugaredLogger, | ||
| istioClient istioclientset.Interface) *Factory { | ||
| return &Factory{ | ||
| istioClient: istioClient, | ||
| kubeClient: kubeClient, | ||
| flaggerClient: flaggerClient, | ||
| logger: logger, | ||
| } | ||
| } | ||
|
|
||
| func (factory *Factory) ServiceRouter() *ServiceRouter { | ||
| return &ServiceRouter{ | ||
| logger: factory.logger, | ||
| flaggerClient: factory.flaggerClient, | ||
| kubeClient: factory.kubeClient, | ||
| } | ||
| } | ||
|
|
||
| func (factory *Factory) IstioRouter() *IstioRouter { | ||
| return &IstioRouter{ | ||
| logger: factory.logger, | ||
| flaggerClient: factory.flaggerClient, | ||
| kubeClient: factory.kubeClient, | ||
| istioClient: factory.istioClient, | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,218 @@ | ||
| package router | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/google/go-cmp/cmp" | ||
| "github.com/google/go-cmp/cmp/cmpopts" | ||
| istiov1alpha3 "github.com/knative/pkg/apis/istio/v1alpha3" | ||
| istioclientset "github.com/knative/pkg/client/clientset/versioned" | ||
| flaggerv1 "github.com/stefanprodan/flagger/pkg/apis/flagger/v1alpha3" | ||
| clientset "github.com/stefanprodan/flagger/pkg/client/clientset/versioned" | ||
| "go.uber.org/zap" | ||
| "k8s.io/apimachinery/pkg/api/errors" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "k8s.io/client-go/kubernetes" | ||
| ) | ||
|
|
||
| // IstioRouter is managing Istio virtual services | ||
| type IstioRouter struct { | ||
| kubeClient kubernetes.Interface | ||
| istioClient istioclientset.Interface | ||
| flaggerClient clientset.Interface | ||
| logger *zap.SugaredLogger | ||
| } | ||
|
|
||
| // Sync creates or updates the the Istio virtual service. | ||
| func (ir *IstioRouter) Sync(cd *flaggerv1.Canary) error { | ||
| targetName := cd.Spec.TargetRef.Name | ||
| primaryName := fmt.Sprintf("%s-primary", targetName) | ||
| hosts := append(cd.Spec.Service.Hosts, targetName) | ||
| gateways := cd.Spec.Service.Gateways | ||
| var hasMeshGateway bool | ||
| for _, g := range gateways { | ||
| if g == "mesh" { | ||
| hasMeshGateway = true | ||
| } | ||
| } | ||
| if !hasMeshGateway { | ||
| gateways = append(gateways, "mesh") | ||
| } | ||
|
|
||
| route := []istiov1alpha3.DestinationWeight{ | ||
| { | ||
| Destination: istiov1alpha3.Destination{ | ||
| Host: primaryName, | ||
| Port: istiov1alpha3.PortSelector{ | ||
| Number: uint32(cd.Spec.Service.Port), | ||
| }, | ||
| }, | ||
| Weight: 100, | ||
| }, | ||
| { | ||
| Destination: istiov1alpha3.Destination{ | ||
| Host: fmt.Sprintf("%s-canary", targetName), | ||
| Port: istiov1alpha3.PortSelector{ | ||
| Number: uint32(cd.Spec.Service.Port), | ||
| }, | ||
| }, | ||
| Weight: 0, | ||
| }, | ||
| } | ||
| newSpec := istiov1alpha3.VirtualServiceSpec{ | ||
| Hosts: hosts, | ||
| Gateways: gateways, | ||
| Http: []istiov1alpha3.HTTPRoute{ | ||
| { | ||
| Match: cd.Spec.Service.Match, | ||
| Rewrite: cd.Spec.Service.Rewrite, | ||
| Timeout: cd.Spec.Service.Timeout, | ||
| Retries: cd.Spec.Service.Retries, | ||
| AppendHeaders: cd.Spec.Service.AppendHeaders, | ||
| Route: route, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| virtualService, err := ir.istioClient.NetworkingV1alpha3().VirtualServices(cd.Namespace).Get(targetName, metav1.GetOptions{}) | ||
| // insert | ||
| if errors.IsNotFound(err) { | ||
| virtualService = &istiov1alpha3.VirtualService{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: targetName, | ||
| Namespace: cd.Namespace, | ||
| OwnerReferences: []metav1.OwnerReference{ | ||
| *metav1.NewControllerRef(cd, schema.GroupVersionKind{ | ||
| Group: flaggerv1.SchemeGroupVersion.Group, | ||
| Version: flaggerv1.SchemeGroupVersion.Version, | ||
| Kind: flaggerv1.CanaryKind, | ||
| }), | ||
| }, | ||
| }, | ||
| Spec: newSpec, | ||
| } | ||
| _, err = ir.istioClient.NetworkingV1alpha3().VirtualServices(cd.Namespace).Create(virtualService) | ||
| if err != nil { | ||
| return fmt.Errorf("VirtualService %s.%s create error %v", targetName, cd.Namespace, err) | ||
| } | ||
| ir.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)). | ||
| Infof("VirtualService %s.%s created", virtualService.GetName(), cd.Namespace) | ||
| return nil | ||
| } | ||
|
|
||
| if err != nil { | ||
| return fmt.Errorf("VirtualService %s.%s query error %v", targetName, cd.Namespace, err) | ||
| } | ||
|
|
||
| // update service but keep the original destination weights | ||
| if virtualService != nil { | ||
| if diff := cmp.Diff(newSpec, virtualService.Spec, cmpopts.IgnoreTypes(istiov1alpha3.DestinationWeight{})); diff != "" { | ||
| vtClone := virtualService.DeepCopy() | ||
| vtClone.Spec = newSpec | ||
| if len(virtualService.Spec.Http) > 0 { | ||
| vtClone.Spec.Http[0].Route = virtualService.Spec.Http[0].Route | ||
| } | ||
| _, err = ir.istioClient.NetworkingV1alpha3().VirtualServices(cd.Namespace).Update(vtClone) | ||
| if err != nil { | ||
| return fmt.Errorf("VirtualService %s.%s update error %v", targetName, cd.Namespace, err) | ||
| } | ||
| ir.logger.With("canary", fmt.Sprintf("%s.%s", cd.Name, cd.Namespace)). | ||
| Infof("VirtualService %s.%s updated", virtualService.GetName(), cd.Namespace) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // GetRoutes returns the destinations weight for primary and canary | ||
| func (ir *IstioRouter) GetRoutes(cd *flaggerv1.Canary) ( | ||
| primaryWeight int, | ||
| canaryWeight int, | ||
| err error, | ||
| ) { | ||
| targetName := cd.Spec.TargetRef.Name | ||
| vs := &istiov1alpha3.VirtualService{} | ||
| vs, err = ir.istioClient.NetworkingV1alpha3().VirtualServices(cd.Namespace).Get(targetName, v1.GetOptions{}) | ||
| if err != nil { | ||
| if errors.IsNotFound(err) { | ||
| err = fmt.Errorf("VirtualService %s.%s not found", targetName, cd.Namespace) | ||
| return | ||
| } | ||
| err = fmt.Errorf("VirtualService %s.%s query error %v", targetName, cd.Namespace, err) | ||
| return | ||
| } | ||
|
|
||
| for _, http := range vs.Spec.Http { | ||
| for _, route := range http.Route { | ||
| if route.Destination.Host == fmt.Sprintf("%s-primary", targetName) { | ||
| primaryWeight = route.Weight | ||
| } | ||
| if route.Destination.Host == fmt.Sprintf("%s-canary", targetName) { | ||
| canaryWeight = route.Weight | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if primaryWeight == 0 && canaryWeight == 0 { | ||
| err = fmt.Errorf("VirtualService %s.%s does not contain routes for %s-primary and %s-canary", | ||
| targetName, cd.Namespace, targetName, targetName) | ||
| } | ||
|
|
||
| return | ||
| } | ||
|
|
||
| // SetRoutes updates the destinations weight for primary and canary | ||
| func (ir *IstioRouter) SetRoutes( | ||
| cd *flaggerv1.Canary, | ||
| primaryWeight int, | ||
| canaryWeight int, | ||
| ) error { | ||
| targetName := cd.Spec.TargetRef.Name | ||
| vs, err := ir.istioClient.NetworkingV1alpha3().VirtualServices(cd.Namespace).Get(targetName, v1.GetOptions{}) | ||
| if err != nil { | ||
| if errors.IsNotFound(err) { | ||
| return fmt.Errorf("VirtualService %s.%s not found", targetName, cd.Namespace) | ||
|
|
||
| } | ||
| return fmt.Errorf("VirtualService %s.%s query error %v", targetName, cd.Namespace, err) | ||
| } | ||
|
|
||
| vsCopy := vs.DeepCopy() | ||
| vsCopy.Spec.Http = []istiov1alpha3.HTTPRoute{ | ||
| { | ||
| Match: cd.Spec.Service.Match, | ||
| Rewrite: cd.Spec.Service.Rewrite, | ||
| Timeout: cd.Spec.Service.Timeout, | ||
| Retries: cd.Spec.Service.Retries, | ||
| AppendHeaders: cd.Spec.Service.AppendHeaders, | ||
| Route: []istiov1alpha3.DestinationWeight{ | ||
| { | ||
| Destination: istiov1alpha3.Destination{ | ||
| Host: fmt.Sprintf("%s-primary", targetName), | ||
| Port: istiov1alpha3.PortSelector{ | ||
| Number: uint32(cd.Spec.Service.Port), | ||
| }, | ||
| }, | ||
| Weight: primaryWeight, | ||
| }, | ||
| { | ||
| Destination: istiov1alpha3.Destination{ | ||
| Host: fmt.Sprintf("%s-canary", targetName), | ||
| Port: istiov1alpha3.PortSelector{ | ||
| Number: uint32(cd.Spec.Service.Port), | ||
| }, | ||
| }, | ||
| Weight: canaryWeight, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| vs, err = ir.istioClient.NetworkingV1alpha3().VirtualServices(cd.Namespace).Update(vsCopy) | ||
| if err != nil { | ||
| return fmt.Errorf("VirtualService %s.%s update failed: %v", targetName, cd.Namespace, err) | ||
|
|
||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.