Skip to content

Fixes #4 and #11: Include ClusterIP services and avoid empty namespaces #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jackpizarro wants to merge 2 commits into from
Closed

Fixes #4 and #11: Include ClusterIP services and avoid empty namespaces #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22202bf
fixes empty namespaces and track ClusterIP services
geromunoz Oct 5, 2018
079c314
fixes empty namespaces and track ClusterIP services
geromunoz Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions catalog/from-k8s/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ func (t *ServiceResource) Upsert(key string, raw interface{}) error {
// If we care about endpoints, we should do the initial endpoints load.
if t.shouldTrackEndpoints(key) {
endpoints, err := t.Client.CoreV1().
Endpoints(t.namespace()).
Endpoints(service.Namespace).
Get(service.Name, metav1.GetOptions{})
if err != nil {
t.Log.Warn("error loading initial endpoints",
Expand Down Expand Up @@ -183,8 +183,7 @@ func (t *ServiceResource) shouldSync(svc *apiv1.Service) bool {
func (t *ServiceResource) shouldTrackEndpoints(key string) bool {
// The service must be one we care about for us to watch the endpoints.
// We care about a service that exists in our service map (is enabled
// for syncing) and is a NodePort type. Only NodePort type services
// use the endpoints at all.
// for syncing) and is either NodePort or ClusterIP type.
if t.serviceMap == nil {
return false
}
Expand All @@ -193,7 +192,8 @@ func (t *ServiceResource) shouldTrackEndpoints(key string) bool {
return false
}

return svc.Spec.Type == apiv1.ServiceTypeNodePort
return (svc.Spec.Type == apiv1.ServiceTypeNodePort ||
svc.Spec.Type == apiv1.ServiceTypeClusterIP)
}

// generateRegistrations generates the necessary Consul registrations for
Expand Down Expand Up @@ -245,7 +245,8 @@ func (t *ServiceResource) generateRegistrations(key string) {

// Determine the default port
if len(svc.Spec.Ports) > 0 {
nodePort := svc.Spec.Type == apiv1.ServiceTypeNodePort
nodePort := (svc.Spec.Type == apiv1.ServiceTypeNodePort ||
svc.Spec.Type == apiv1.ServiceTypeClusterIP)
main := svc.Spec.Ports[0].Name

// If a specific port is specified, then use that port value
Expand Down Expand Up @@ -340,10 +341,10 @@ func (t *ServiceResource) generateRegistrations(key string) {
t.consulMap[key] = append(t.consulMap[key], &r)
}

// For NodePort services, we create a service instance for each
// endpoint of the service. This way we don't register _every_ K8S
// node as part of the service.
case apiv1.ServiceTypeNodePort:
// For NodePort and ClusterIP services, we create a service instance
// for each endpoint of the service. This way we don't register
// _every_ K8S node as part of the service.
case apiv1.ServiceTypeNodePort, apiv1.ServiceTypeClusterIP:
if t.endpointsMap == nil {
return
}
Expand Down