feat(source/pod): add support for fqdn templating #5512
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,9 @@ package source | |
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "maps" | ||
| "text/template" | ||
|
|
||
| log "github.com/sirupsen/logrus" | ||
| corev1 "k8s.io/api/core/v1" | ||
|
|
@@ -27,14 +30,19 @@ import ( | |
| "k8s.io/client-go/kubernetes" | ||
| "k8s.io/client-go/tools/cache" | ||
|
|
||
| "sigs.k8s.io/external-dns/source/fqdn" | ||
|
|
||
| "sigs.k8s.io/external-dns/endpoint" | ||
| "sigs.k8s.io/external-dns/source/annotations" | ||
| "sigs.k8s.io/external-dns/source/informers" | ||
| ) | ||
|
|
||
| type podSource struct { | ||
| client kubernetes.Interface | ||
| namespace string | ||
| fqdnTemplate *template.Template | ||
| combineFQDNAnnotation bool | ||
|
|
||
| podInformer coreinformers.PodInformer | ||
| nodeInformer coreinformers.NodeInformer | ||
| compatibility string | ||
|
|
@@ -43,18 +51,27 @@ type podSource struct { | |
| } | ||
|
|
||
| // NewPodSource creates a new podSource with the given config. | ||
| func NewPodSource( | ||
| ctx context.Context, | ||
| kubeClient kubernetes.Interface, | ||
| namespace string, | ||
| compatibility string, | ||
| ignoreNonHostNetworkPods bool, | ||
| podSourceDomain string, | ||
| fqdnTemplate string, | ||
| combineFqdnAnnotation bool, | ||
| ) (Source, error) { | ||
| informerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(kubeClient, 0, kubeinformers.WithNamespace(namespace)) | ||
| podInformer := informerFactory.Core().V1().Pods() | ||
| nodeInformer := informerFactory.Core().V1().Nodes() | ||
|
|
||
| _, _ = podInformer.Informer().AddEventHandler( | ||
| cache.ResourceEventHandlerFuncs{ | ||
| AddFunc: func(obj interface{}) { | ||
| }, | ||
| }, | ||
| ) | ||
| _, _ = nodeInformer.Informer().AddEventHandler( | ||
| cache.ResourceEventHandlerFuncs{ | ||
| AddFunc: func(obj interface{}) { | ||
| }, | ||
|
|
@@ -68,6 +85,11 @@ func NewPodSource(ctx context.Context, kubeClient kubernetes.Interface, namespac | |
| return nil, err | ||
| } | ||
|
|
||
| tmpl, err := fqdn.ParseTemplate(fqdnTemplate) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &podSource{ | ||
| client: kubeClient, | ||
| podInformer: podInformer, | ||
|
|
@@ -76,22 +98,39 @@ func NewPodSource(ctx context.Context, kubeClient kubernetes.Interface, namespac | |
| compatibility: compatibility, | ||
| ignoreNonHostNetworkPods: ignoreNonHostNetworkPods, | ||
| podSourceDomain: podSourceDomain, | ||
| fqdnTemplate: tmpl, | ||
| combineFQDNAnnotation: combineFqdnAnnotation, | ||
| }, nil | ||
| } | ||
|
|
||
| func (*podSource) AddEventHandler(_ context.Context, _ func()) { | ||
|
Contributor
There was a problem hiding this comment. Out of curiosity, do you know why this function does nothing? (Other sources often add the handler to informers)
Member
Author
There was a problem hiding this comment. Yeah. We need to fix that as well. Related PR #5274 We need to review and fix all the handlers. It's a useful feature. I'm not too sure how it differ from adding handlers in constructur, that the only gotcha |
||
| } | ||
|
|
||
| func (ps *podSource) Endpoints(_ context.Context) ([]*endpoint.Endpoint, error) { | ||
| pods, err := ps.podInformer.Lister().Pods(ps.namespace).List(labels.Everything()) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| endpointMap := make(map[endpoint.EndpointKey][]string) | ||
| fqdnEndpointMap := make(map[endpoint.EndpointKey][]string) | ||
|
||
| for _, pod := range pods { | ||
| if ps.fqdnTemplate == nil || ps.combineFQDNAnnotation { | ||
| ps.addPodEndpointsToEndpointMap(endpointMap, pod) | ||
| } | ||
|
|
||
| if ps.fqdnTemplate != nil { | ||
| fqdnHosts, err := ps.hostsFromTemplate(pod) | ||
| if err != nil { | ||
| log.Debug(err) | ||
|
||
| continue | ||
| } | ||
| maps.Copy(fqdnEndpointMap, fqdnHosts) | ||
| } | ||
| } | ||
|
|
||
| maps.Copy(endpointMap, fqdnEndpointMap) | ||
|
|
||
| var endpoints []*endpoint.Endpoint | ||
| for key, targets := range endpointMap { | ||
| endpoints = append(endpoints, endpoint.NewEndpoint(key.DNSName, key.RecordType, targets...)) | ||
|
|
@@ -180,6 +219,30 @@ func (ps *podSource) addPodNodeEndpointsToEndpointMap(endpointMap map[endpoint.E | |
| } | ||
| } | ||
|
|
||
| func (ps *podSource) hostsFromTemplate(pod *corev1.Pod) (map[endpoint.EndpointKey][]string, error) { | ||
| hosts, err := fqdn.ExecTemplate(ps.fqdnTemplate, pod) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("skipping generating endpoints from template for pod %s: %w", pod.Name, err) | ||
| } | ||
|
|
||
| result := make(map[endpoint.EndpointKey][]string) | ||
| for _, target := range hosts { | ||
| for _, address := range pod.Status.PodIPs { | ||
| if address.IP == "" { | ||
| log.Debugf("skipping pod %q. PodIP is empty with phasae is %q", pod.Name, pod.Status.Phase) | ||
ivankatliarchuk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| continue | ||
| } | ||
| key := endpoint.EndpointKey{ | ||
| DNSName: target, | ||
| RecordType: suitableType(address.IP), | ||
| } | ||
| result[key] = append(result[key], address.IP) | ||
| } | ||
| } | ||
|
|
||
| return result, nil | ||
| } | ||
|
|
||
| func addTargetsToEndpointMap(endpointMap map[endpoint.EndpointKey][]string, targets []string, domainList ...string) { | ||
| for _, domain := range domainList { | ||
| for _, target := range targets { | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.