add new source for istio virtual services

kubernetes-sigs · May 28, 2020 · cfa76c1 · cfa76c1
1 parent deaeca2
commit cfa76c1
Show file tree

Hide file tree

Showing 5 changed files with 2,032 additions and 10 deletions.
diff --git a/source/gateway.go b/source/gateway.go
@@ -220,23 +220,23 @@ func (sc *gatewaySource) setResourceLabel(gateway networkingv1alpha3.Gateway, en
 	}
 }
 
-func (sc *gatewaySource) targetsFromGatewayConfig(gateway networkingv1alpha3.Gateway) (targets endpoint.Targets, err error) {
-	labelSelector, err := metav1.ParseToLabelSelector(labels.Set(gateway.Spec.Selector).String())
-	if err != nil {
-		return nil, err
-	}
-	selector, err := metav1.LabelSelectorAsSelector(labelSelector)
-	if err != nil {
-		return nil, err
+func (sc *gatewaySource) targetsFromGateway(gateway networkingv1alpha3.Gateway) (targets endpoint.Targets, err error) {
+	targets = getTargetsFromTargetAnnotation(gateway.Annotations)
+	if len(targets) > 0 {
+		return
 	}
 
-	services, err := sc.serviceInformer.Lister().Services(sc.namespace).List(selector)
+	services, err := sc.serviceInformer.Lister().Services(sc.namespace).List(labels.Everything())
 	if err != nil {
 		log.Error(err)
 		return
 	}
 
 	for _, service := range services {
+		if !gatewaySelectorMatchesServiceSelector(gateway.Spec.Selector, service.Spec.Selector) {
+			continue
+		}
+
 		for _, lb := range service.Status.LoadBalancer.Ingress {
 			if lb.IP != "" {
 				targets = append(targets, lb.IP)
@@ -262,7 +262,7 @@ func (sc *gatewaySource) endpointsFromGateway(hostnames []string, gateway networ
 	targets := getTargetsFromTargetAnnotation(annotations)
 
 	if len(targets) == 0 {
-		targets, err = sc.targetsFromGatewayConfig(gateway)
+		targets, err = sc.targetsFromGateway(gateway)
 		if err != nil {
 			return nil, err
 		}
@@ -316,3 +316,12 @@ func (sc *gatewaySource) hostNamesFromTemplate(gateway networkingv1alpha3.Gatewa
 	hostnames := strings.Split(strings.Replace(buf.String(), " ", "", -1), ",")
 	return hostnames, nil
 }
+
+func gatewaySelectorMatchesServiceSelector(gwSelector, svcSelector map[string]string) bool {
+	for k, v := range gwSelector {
+		if lbl, ok := svcSelector[k]; !ok || lbl != v {
+			return false
+		}
+	}
+	return true
+}
diff --git a/source/gateway_test.go b/source/gateway_test.go
@@ -1151,6 +1151,7 @@ type fakeIngressGatewayService struct {
 	hostnames []string
 	namespace string
 	name      string
+	selector  map[string]string
 }
 
 func (ig fakeIngressGatewayService) Service() *v1.Service {
@@ -1164,6 +1165,9 @@ func (ig fakeIngressGatewayService) Service() *v1.Service {
 				Ingress: []v1.LoadBalancerIngress{},
 			},
 		},
+		Spec: v1.ServiceSpec{
+			Selector: ig.selector,
+		},
 	}
 
 	for _, ip := range ig.ips {

diff --git a/source/store.go b/source/store.go
@@ -196,6 +196,16 @@ func BuildWithConfig(source string, p ClientGenerator, cfg *Config) (Source, err
 			return nil, err
 		}
 		return NewIstioGatewaySource(kubernetesClient, istioClient, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation, cfg.IgnoreHostnameAnnotation)
+	case "istio-virtualservice":
+		kubernetesClient, err := p.KubeClient()
+		if err != nil {
+			return nil, err
+		}
+		istioClient, err := p.IstioClient()
+		if err != nil {
+			return nil, err
+		}
+		return NewIstioVirtualServiceSource(kubernetesClient, istioClient, cfg.Namespace, cfg.AnnotationFilter, cfg.FQDNTemplate, cfg.CombineFQDNAndAnnotation, cfg.IgnoreHostnameAnnotation)
 	case "cloudfoundry":
 		cfClient, err := p.CloudFoundryClient(cfg.CFAPIEndpoint, cfg.CFUsername, cfg.CFPassword)
 		if err != nil {