Added fix for istio gateway and vs heterogenous deployment (#6)

adobe · Aug 3, 2023 · fc05690 · fc05690
1 parent ceba31b
commit fc05690
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/charts/external-dns/templates/deployment.yaml b/charts/external-dns/templates/deployment.yaml
@@ -73,6 +73,9 @@ spec:
             {{- if .Values.triggerLoopOnEvent }}
             - --events
             {{- end }}
+            {{- if .Values.awsPreferCname }}
+            - --aws-prefer-cname
+            {{- end }}
             {{- if .Values.watchNamespaces }}
             - --namespace={{ .Values.watchNamespaces | join "," }}
             {{- end }}

diff --git a/source/istio_virtualservice.go b/source/istio_virtualservice.go
@@ -302,7 +302,7 @@ func (sc *virtualServiceSource) targetsFromVirtualService(ctx context.Context, v
 		if !virtualServiceBindsToGateway(virtualService, gateway, vsHost) {
 			continue
 		}
-		tgs, err := sc.targetsFromGateway(gateway)
+		tgs, err := sc.targetsFromGateway(ctx, gateway)
 		if err != nil {
 			return targets, err
 		}
@@ -431,19 +431,20 @@ func parseGateway(gateway string) (namespace, name string, err error) {
 	return
 }
 
-func (sc *virtualServiceSource) targetsFromGateway(gateway *networkingv1alpha3.Gateway) (targets endpoint.Targets, err error) {
+func (sc *virtualServiceSource) targetsFromGateway(ctx context.Context, 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(labels.Everything())
+	// Use kubeclient instead of informers to fetch services from gateway namespace
+	services, err := sc.kubeClient.CoreV1().Services(gateway.Namespace).List(ctx, metav1.ListOptions{})
 	if err != nil {
 		log.Error(err)
 		return
 	}
 
-	for _, service := range services {
+	for _, service := range services.Items {
 		if !gatewaySelectorMatchesServiceSelector(gateway.Spec.Selector, service.Spec.Selector) {
 			continue
 		}