@@ -24,10 +24,10 @@ import (
2424 "text/template"
2525
2626 log "github.com/sirupsen/logrus"
27- networkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3 "
27+ networkingv1beta1 "istio.io/client-go/pkg/apis/networking/v1beta1 "
2828 istioclient "istio.io/client-go/pkg/clientset/versioned"
2929 istioinformers "istio.io/client-go/pkg/informers/externalversions"
30- networkingv1alpha3informer "istio.io/client-go/pkg/informers/externalversions/networking/v1alpha3 "
30+ networkingv1beta1informer "istio.io/client-go/pkg/informers/externalversions/networking/v1beta1 "
3131 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232 "k8s.io/apimachinery/pkg/labels"
3333 kubeinformers "k8s.io/client-go/informers"
@@ -57,7 +57,7 @@ type gatewaySource struct {
5757 combineFQDNAnnotation bool
5858 ignoreHostnameAnnotation bool
5959 serviceInformer coreinformers.ServiceInformer
60- gatewayInformer networkingv1alpha3informer .GatewayInformer
60+ gatewayInformer networkingv1beta1informer .GatewayInformer
6161}
6262
6363// NewIstioGatewaySource creates a new gatewaySource with the given config.
@@ -81,18 +81,18 @@ func NewIstioGatewaySource(
8181 informerFactory := kubeinformers .NewSharedInformerFactoryWithOptions (kubeClient , 0 , kubeinformers .WithNamespace (namespace ))
8282 serviceInformer := informerFactory .Core ().V1 ().Services ()
8383 istioInformerFactory := istioinformers .NewSharedInformerFactory (istioClient , 0 )
84- gatewayInformer := istioInformerFactory .Networking ().V1alpha3 ().Gateways ()
84+ gatewayInformer := istioInformerFactory .Networking ().V1beta1 ().Gateways ()
8585
8686 // Add default resource event handlers to properly initialize informer.
87- serviceInformer .Informer ().AddEventHandler (
87+ _ , _ = serviceInformer .Informer ().AddEventHandler (
8888 cache.ResourceEventHandlerFuncs {
8989 AddFunc : func (obj interface {}) {
9090 log .Debug ("service added" )
9191 },
9292 },
9393 )
9494
95- gatewayInformer .Informer ().AddEventHandler (
95+ _ , _ = gatewayInformer .Informer ().AddEventHandler (
9696 cache.ResourceEventHandlerFuncs {
9797 AddFunc : func (obj interface {}) {
9898 log .Debug ("gateway added" )
@@ -127,7 +127,7 @@ func NewIstioGatewaySource(
127127// Endpoints returns endpoint objects for each host-target combination that should be processed.
128128// Retrieves all gateway resources in the source's namespace(s).
129129func (sc * gatewaySource ) Endpoints (ctx context.Context ) ([]* endpoint.Endpoint , error ) {
130- gwList , err := sc .istioClient .NetworkingV1alpha3 ().Gateways (sc .namespace ).List (ctx , metav1.ListOptions {})
130+ gwList , err := sc .istioClient .NetworkingV1beta1 ().Gateways (sc .namespace ).List (ctx , metav1.ListOptions {})
131131 if err != nil {
132132 return nil , err
133133 }
@@ -140,12 +140,14 @@ func (sc *gatewaySource) Endpoints(ctx context.Context) ([]*endpoint.Endpoint, e
140140
141141 var endpoints []* endpoint.Endpoint
142142
143+ log .Debugf ("Found %d gateways in namespace %s" , len (gateways ), sc .namespace )
144+
143145 for _ , gateway := range gateways {
144146 // Check controller annotation to see if we are responsible.
145147 controller , ok := gateway .Annotations [controllerAnnotationKey ]
146148 if ok && controller != controllerAnnotationValue {
147- log .Debugf ("Skipping gateway %s/%s because controller value does not match, found: %s, required: %s" ,
148- gateway .Namespace , gateway .Name , controller , controllerAnnotationValue )
149+ log .Debugf ("Skipping gateway %s/%s,%s because controller value does not match, found: %s, required: %s" ,
150+ gateway .Namespace , gateway .APIVersion , gateway . Name , controller , controllerAnnotationValue )
149151 continue
150152 }
151153
@@ -168,6 +170,8 @@ func (sc *gatewaySource) Endpoints(ctx context.Context) ([]*endpoint.Endpoint, e
168170 }
169171 }
170172
173+ log .Debugf ("Processing gateway '%s/%s.%s' and hosts %q" , gateway .Namespace , gateway .APIVersion , gateway .Name , strings .Join (gwHostnames , "," ))
174+
171175 if len (gwHostnames ) == 0 {
172176 log .Debugf ("No hostnames could be generated from gateway %s/%s" , gateway .Namespace , gateway .Name )
173177 continue
@@ -183,10 +187,11 @@ func (sc *gatewaySource) Endpoints(ctx context.Context) ([]*endpoint.Endpoint, e
183187 continue
184188 }
185189
186- log .Debugf ("Endpoints generated from gateway: %s/%s: %v " , gateway .Namespace , gateway .Name , gwEndpoints )
190+ log .Debugf ("Endpoints generated from %q ' %s/%s.%s' : %q " , gateway .Kind , gateway . Namespace , gateway . APIVersion , gateway .Name , gwEndpoints )
187191 endpoints = append (endpoints , gwEndpoints ... )
188192 }
189193
194+ // TODO: sort on endpoint creation
190195 for _ , ep := range endpoints {
191196 sort .Sort (ep .Targets )
192197 }
@@ -198,11 +203,11 @@ func (sc *gatewaySource) Endpoints(ctx context.Context) ([]*endpoint.Endpoint, e
198203func (sc * gatewaySource ) AddEventHandler (ctx context.Context , handler func ()) {
199204 log .Debug ("Adding event handler for Istio Gateway" )
200205
201- sc .gatewayInformer .Informer ().AddEventHandler (eventHandlerFunc (handler ))
206+ _ , _ = sc .gatewayInformer .Informer ().AddEventHandler (eventHandlerFunc (handler ))
202207}
203208
204209// filterByAnnotations filters a list of configs by a given annotation selector.
205- func (sc * gatewaySource ) filterByAnnotations (gateways []* networkingv1alpha3 .Gateway ) ([]* networkingv1alpha3 .Gateway , error ) {
210+ func (sc * gatewaySource ) filterByAnnotations (gateways []* networkingv1beta1 .Gateway ) ([]* networkingv1beta1 .Gateway , error ) {
206211 selector , err := annotations .ParseFilter (sc .annotationFilter )
207212 if err != nil {
208213 return nil , err
@@ -213,7 +218,7 @@ func (sc *gatewaySource) filterByAnnotations(gateways []*networkingv1alpha3.Gate
213218 return gateways , nil
214219 }
215220
216- var filteredList []* networkingv1alpha3 .Gateway
221+ var filteredList []* networkingv1beta1 .Gateway
217222
218223 for _ , gw := range gateways {
219224 // include if the annotations match the selector
@@ -225,7 +230,7 @@ func (sc *gatewaySource) filterByAnnotations(gateways []*networkingv1alpha3.Gate
225230 return filteredList , nil
226231}
227232
228- func (sc * gatewaySource ) targetsFromIngress (ctx context.Context , ingressStr string , gateway * networkingv1alpha3 .Gateway ) (endpoint.Targets , error ) {
233+ func (sc * gatewaySource ) targetsFromIngress (ctx context.Context , ingressStr string , gateway * networkingv1beta1 .Gateway ) (endpoint.Targets , error ) {
229234 namespace , name , err := ParseIngress (ingressStr )
230235 if err != nil {
231236 return nil , fmt .Errorf ("failed to parse Ingress annotation on Gateway (%s/%s): %w" , gateway .Namespace , gateway .Name , err )
@@ -251,7 +256,7 @@ func (sc *gatewaySource) targetsFromIngress(ctx context.Context, ingressStr stri
251256 return targets , nil
252257}
253258
254- func (sc * gatewaySource ) targetsFromGateway (ctx context.Context , gateway * networkingv1alpha3 .Gateway ) (endpoint.Targets , error ) {
259+ func (sc * gatewaySource ) targetsFromGateway (ctx context.Context , gateway * networkingv1beta1 .Gateway ) (endpoint.Targets , error ) {
255260 targets := annotations .TargetsFromTargetAnnotation (gateway .Annotations )
256261 if len (targets ) > 0 {
257262 return targets , nil
@@ -266,22 +271,21 @@ func (sc *gatewaySource) targetsFromGateway(ctx context.Context, gateway *networ
266271}
267272
268273// endpointsFromGatewayConfig extracts the endpoints from an Istio Gateway Config object
269- func (sc * gatewaySource ) endpointsFromGateway (ctx context.Context , hostnames []string , gateway * networkingv1alpha3 .Gateway ) ([]* endpoint.Endpoint , error ) {
274+ func (sc * gatewaySource ) endpointsFromGateway (ctx context.Context , hostnames []string , gateway * networkingv1beta1 .Gateway ) ([]* endpoint.Endpoint , error ) {
270275 var endpoints []* endpoint.Endpoint
271276 var err error
272277
273- resource := fmt .Sprintf ("gateway/%s/%s" , gateway .Namespace , gateway .Name )
274-
275- ttl := annotations .TTLFromAnnotations (gateway .Annotations , resource )
278+ targets , err := sc .targetsFromGateway (ctx , gateway )
279+ if err != nil {
280+ return nil , err
281+ }
276282
277- targets := annotations .TargetsFromTargetAnnotation (gateway .Annotations )
278283 if len (targets ) == 0 {
279- targets , err = sc .targetsFromGateway (ctx , gateway )
280- if err != nil {
281- return nil , err
282- }
284+ return endpoints , nil
283285 }
284286
287+ resource := fmt .Sprintf ("gateway/%s/%s" , gateway .Namespace , gateway .Name )
288+ ttl := annotations .TTLFromAnnotations (gateway .Annotations , resource )
285289 providerSpecific , setIdentifier := annotations .ProviderSpecificAnnotations (gateway .Annotations )
286290
287291 for _ , host := range hostnames {
@@ -291,7 +295,7 @@ func (sc *gatewaySource) endpointsFromGateway(ctx context.Context, hostnames []s
291295 return endpoints , nil
292296}
293297
294- func (sc * gatewaySource ) hostNamesFromGateway (gateway * networkingv1alpha3 .Gateway ) ([]string , error ) {
298+ func (sc * gatewaySource ) hostNamesFromGateway (gateway * networkingv1beta1 .Gateway ) ([]string , error ) {
295299 var hostnames []string
296300 for _ , server := range gateway .Spec .Servers {
297301 for _ , host := range server .Hosts {
0 commit comments