Skip to content
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

Jump to bottom

Fixed the port mapping issue #54

Merged
merged 1 commit into from
Oct 12, 2016
Merged

Fixed the port mapping issue #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
113 changes: 97 additions & 16 deletions nginx-controller/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ import (

"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx"
"k8s.io/kubernetes/pkg/api"
podutil "k8s.io/kubernetes/pkg/api/pod"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/watch"
)

Expand Down Expand Up @@ -384,13 +387,13 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) nginx.
ingEx.Secrets[secretName] = secret
}

ingEx.Endpoints = make(map[string]*api.Endpoints)
ingEx.Endpoints = make(map[string][]string)
if ing.Spec.Backend != nil {
endps, err := lbc.getEndpointsForIngressBackend(ing.Spec.Backend, ing.Namespace)
if err != nil {
glog.V(3).Infof("Error retrieving endpoints for the services %v: %v", ing.Spec.Backend.ServiceName, err)
glog.Warningf("Error retrieving endpoints for the service %v: %v", ing.Spec.Backend.ServiceName, err)
} else {
ingEx.Endpoints[ing.Spec.Backend.ServiceName] = endps
ingEx.Endpoints[ing.Spec.Backend.ServiceName+ing.Spec.Backend.ServicePort.String()] = endps
}
}

Expand All @@ -402,35 +405,113 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) nginx.
for _, path := range rule.HTTP.Paths {
endps, err := lbc.getEndpointsForIngressBackend(&path.Backend, ing.Namespace)
if err != nil {
glog.V(3).Infof("Error retrieving endpoints for the services %v: %v", path.Backend.ServiceName, err)
glog.Warningf("Error retrieving endpoints for the service %v: %v", path.Backend.ServiceName, err)
} else {
ingEx.Endpoints[path.Backend.ServiceName] = endps
ingEx.Endpoints[path.Backend.ServiceName+path.Backend.ServicePort.String()] = endps
}

}
}

return ingEx
}

func (lbc *LoadBalancerController) getEndpointsForIngressBackend(backend *extensions.IngressBackend, namespace string) (*api.Endpoints, error) {
func (lbc *LoadBalancerController) getEndpointsForIngressBackend(backend *extensions.IngressBackend, namespace string) ([]string, error) {
svc, err := lbc.getServiceForIngressBackend(backend, namespace)
if err != nil {
glog.V(3).Infof("Error getting service %v: %v", backend.ServiceName, err)
return nil, err
}

endps, err := lbc.endpLister.GetServiceEndpoints(svc)
if err != nil {
glog.V(3).Infof("Error getting endpoints for service %s from the cache: %v", svc.Name, err)
return nil, err
}

result, err := lbc.getEndpointsForPort(endps, backend.ServicePort, svc)
if err != nil {
glog.V(3).Infof("Error getting endpoints for service %s port %v: %v", svc.Name, backend.ServicePort, err)
return nil, err
}
return result, nil
}

func (lbc *LoadBalancerController) getEndpointsForPort(endps api.Endpoints, ingSvcPort intstr.IntOrString, svc *api.Service) ([]string, error) {
var targetPort int
var err error
found := false

for _, port := range svc.Spec.Ports {
if (ingSvcPort.Type == intstr.Int && port.Port == ingSvcPort.IntValue()) || (ingSvcPort.Type == intstr.String && port.Name == ingSvcPort.String()) {
targetPort, err = lbc.getTargetPort(&port, svc)
if err != nil {
return nil, fmt.Errorf("Error determining target port for port %v in Ingress: %v", ingSvcPort, err)
}
found = true
break
}
}

if !found {
return nil, fmt.Errorf("No port %v in service %s", ingSvcPort, svc.Name)
}

for _, subset := range endps.Subsets {
for _, port := range subset.Ports {
if port.Port == targetPort {
var endpoints []string
for _, address := range subset.Addresses {
endpoint := fmt.Sprintf("%v:%v", address.IP, port.Port)
endpoints = append(endpoints, endpoint)
}
return endpoints, nil
}
}
}

return nil, fmt.Errorf("No endpoints for target port %v in service %s", targetPort, svc.Name)
}

func (lbc *LoadBalancerController) getTargetPort(svcPort *api.ServicePort, svc *api.Service) (int, error) {
if (svcPort.TargetPort == intstr.IntOrString{}) {
return svcPort.Port, nil
}

if svcPort.TargetPort.Type == intstr.Int {
return svcPort.TargetPort.IntValue(), nil
}

pods, err := lbc.client.Pods(svc.Namespace).List(api.ListOptions{LabelSelector: labels.Set(svc.Spec.Selector).AsSelector()})
if err != nil {
return 0, fmt.Errorf("Error getting pod information: %v", err)
}

if len(pods.Items) == 0 {
return 0, fmt.Errorf("No pods of service %s", svc.Name)
}

pod := &pods.Items[0]

portNum, err := podutil.FindPort(pod, svcPort)
if err != nil {
return 0, fmt.Errorf("Error finding named port %v in pod %s: %v", svcPort, pod.Name, err)
}

return portNum, nil
}

func (lbc *LoadBalancerController) getServiceForIngressBackend(backend *extensions.IngressBackend, namespace string) (*api.Service, error) {
svcKey := namespace + "/" + backend.ServiceName
svcObj, svcExists, err := lbc.svcLister.Store.GetByKey(svcKey)
if err != nil {
glog.V(3).Infof("error getting service %v from the cache: %v", svcKey, err)
return nil, err
}

if svcExists {
svc := svcObj.(*api.Service)
endps, err := lbc.endpLister.GetServiceEndpoints(svc)
if err != nil {
glog.V(3).Infof("error getting endpoints for service %v from the cache: %v", svc, err)
return nil, err
}
return &endps, nil
return svcObj.(*api.Service), nil
}
return nil, fmt.Errorf("service %s doesn't exists", svcKey)

return nil, fmt.Errorf("service %s doesn't exists", svcKey)
}

func parseNginxConfigMaps(nginxConfigMaps string) (string, string, error) {
Expand Down
25 changes: 6 additions & 19 deletions nginx-controller/nginx/configurator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,13 @@ func createLocation(path string, upstream Upstream, cfg *Config, websocket bool)
func (cnf *Configurator) createUpstream(ingEx *IngressEx, name string, backend *extensions.IngressBackend, namespace string) Upstream {
ups := NewUpstreamWithDefaultServer(name)

endps, exists := ingEx.Endpoints[backend.ServiceName]
endps, exists := ingEx.Endpoints[backend.ServiceName+backend.ServicePort.String()]
if exists {
upsServers := endpointsToUpstreamServers(*endps, backend.ServicePort.IntValue())
var upsServers []UpstreamServer
for _, endp := range endps {
addressport := strings.Split(endp, ":")
upsServers = append(upsServers, UpstreamServer{addressport[0], addressport[1]})
}
if len(upsServers) > 0 {
ups.UpstreamServers = upsServers
}
Expand All @@ -221,23 +225,6 @@ func pathOrDefault(path string) string {
return path
}

func endpointsToUpstreamServers(endps api.Endpoints, servicePort int) []UpstreamServer {
var upsServers []UpstreamServer
for _, subset := range endps.Subsets {
for _, port := range subset.Ports {
if port.Port == servicePort {
for _, address := range subset.Addresses {
ups := UpstreamServer{Address: address.IP, Port: fmt.Sprintf("%v", servicePort)}
upsServers = append(upsServers, ups)
}
break
}
}
}

return upsServers
}

func getNameForUpstream(ing *extensions.Ingress, host string, service string) string {
return fmt.Sprintf("%v-%v-%v-%v", ing.Namespace, ing.Name, host, service)
}
Expand Down
2 changes: 1 addition & 1 deletion nginx-controller/nginx/ingress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ import "k8s.io/kubernetes/pkg/apis/extensions"
type IngressEx struct {
Ingress *extensions.Ingress
Secrets map[string]*api.Secret
Endpoints map[string]*api.Endpoints
Endpoints map[string][]string
}
111 changes: 96 additions & 15 deletions nginx-plus-controller/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ import (

"github.com/nginxinc/kubernetes-ingress/nginx-plus-controller/nginx"
"k8s.io/kubernetes/pkg/api"
podutil "k8s.io/kubernetes/pkg/api/pod"
"k8s.io/kubernetes/pkg/apis/extensions"
"k8s.io/kubernetes/pkg/client/cache"
client "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/controller/framework"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/intstr"
"k8s.io/kubernetes/pkg/watch"
)

Expand Down Expand Up @@ -384,13 +387,13 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) nginx.
ingEx.Secrets[secretName] = secret
}

ingEx.Endpoints = make(map[string]*api.Endpoints)
ingEx.Endpoints = make(map[string][]string)
if ing.Spec.Backend != nil {
endps, err := lbc.getEndpointsForIngressBackend(ing.Spec.Backend, ing.Namespace)
if err != nil {
glog.V(3).Infof("Error retrieving endpoints for the services %v: %v", ing.Spec.Backend.ServiceName, err)
glog.Warningf("Error retrieving endpoints for the service %v: %v", ing.Spec.Backend.ServiceName, err)
} else {
ingEx.Endpoints[ing.Spec.Backend.ServiceName] = endps
ingEx.Endpoints[ing.Spec.Backend.ServiceName+ing.Spec.Backend.ServicePort.String()] = endps
}
}

Expand All @@ -402,32 +405,110 @@ func (lbc *LoadBalancerController) createIngress(ing *extensions.Ingress) nginx.
for _, path := range rule.HTTP.Paths {
endps, err := lbc.getEndpointsForIngressBackend(&path.Backend, ing.Namespace)
if err != nil {
glog.V(3).Infof("Error retrieving endpoints for the services %v: %v", path.Backend.ServiceName, err)
glog.Warningf("Error retrieving endpoints for the service %v: %v", path.Backend.ServiceName, err)
} else {
ingEx.Endpoints[path.Backend.ServiceName] = endps
ingEx.Endpoints[path.Backend.ServiceName+path.Backend.ServicePort.String()] = endps
}

}
}

return ingEx
}

func (lbc *LoadBalancerController) getEndpointsForIngressBackend(backend *extensions.IngressBackend, namespace string) (*api.Endpoints, error) {
func (lbc *LoadBalancerController) getEndpointsForIngressBackend(backend *extensions.IngressBackend, namespace string) ([]string, error) {
svc, err := lbc.getServiceForIngressBackend(backend, namespace)
if err != nil {
glog.V(3).Infof("Error getting service %v: %v", backend.ServiceName, err)
return nil, err
}

endps, err := lbc.endpLister.GetServiceEndpoints(svc)
if err != nil {
glog.V(3).Infof("Error getting endpoints for service %s from the cache: %v", svc.Name, err)
return nil, err
}

result, err := lbc.getEndpointsForPort(endps, backend.ServicePort, svc)
if err != nil {
glog.V(3).Infof("Error getting endpoints for service %s port %v: %v", svc.Name, backend.ServicePort, err)
return nil, err
}
return result, nil
}

func (lbc *LoadBalancerController) getEndpointsForPort(endps api.Endpoints, ingSvcPort intstr.IntOrString, svc *api.Service) ([]string, error) {
var targetPort int
var err error
found := false

for _, port := range svc.Spec.Ports {
if (ingSvcPort.Type == intstr.Int && port.Port == ingSvcPort.IntValue()) || (ingSvcPort.Type == intstr.String && port.Name == ingSvcPort.String()) {
targetPort, err = lbc.getTargetPort(&port, svc)
if err != nil {
return nil, fmt.Errorf("Error determining target port for port %v in Ingress: %v", ingSvcPort, err)
}
found = true
break
}
}

if !found {
return nil, fmt.Errorf("No port %v in service %s", ingSvcPort, svc.Name)
}

for _, subset := range endps.Subsets {
for _, port := range subset.Ports {
if port.Port == targetPort {
var endpoints []string
for _, address := range subset.Addresses {
endpoint := fmt.Sprintf("%v:%v", address.IP, port.Port)
endpoints = append(endpoints, endpoint)
}
return endpoints, nil
}
}
}

return nil, fmt.Errorf("No endpoints for target port %v in service %s", targetPort, svc.Name)
}

func (lbc *LoadBalancerController) getTargetPort(svcPort *api.ServicePort, svc *api.Service) (int, error) {
if (svcPort.TargetPort == intstr.IntOrString{}) {
return svcPort.Port, nil
}

if svcPort.TargetPort.Type == intstr.Int {
return svcPort.TargetPort.IntValue(), nil
}

pods, err := lbc.client.Pods(svc.Namespace).List(api.ListOptions{LabelSelector: labels.Set(svc.Spec.Selector).AsSelector()})
if err != nil {
return 0, fmt.Errorf("Error getting pod information: %v", err)
}

if len(pods.Items) == 0 {
return 0, fmt.Errorf("No pods of service %s", svc.Name)
}

pod := &pods.Items[0]

portNum, err := podutil.FindPort(pod, svcPort)
if err != nil {
return 0, fmt.Errorf("Error finding named port %v in pod %s: %v", svcPort, pod.Name, err)
}

return portNum, nil
}

func (lbc *LoadBalancerController) getServiceForIngressBackend(backend *extensions.IngressBackend, namespace string) (*api.Service, error) {
svcKey := namespace + "/" + backend.ServiceName
svcObj, svcExists, err := lbc.svcLister.Store.GetByKey(svcKey)
if err != nil {
glog.V(3).Infof("error getting service %v from the cache: %v", svcKey, err)
return nil, err
}

if svcExists {
svc := svcObj.(*api.Service)
endps, err := lbc.endpLister.GetServiceEndpoints(svc)
if err != nil {
glog.V(3).Infof("error getting endpoints for service %v from the cache: %v", svc, err)
return nil, err
}
return &endps, nil
return svcObj.(*api.Service), nil
}

return nil, fmt.Errorf("service %s doesn't exists", svcKey)
Expand Down
Loading