Skip to content

Commit

Permalink
Remove unwanted stacktrace from log (#139)
Browse files Browse the repository at this point in the history
  • Loading branch information
sadlil authored and tamalsaha committed Jun 2, 2017
1 parent 5b5ecd4 commit b00fe77
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 11 deletions.
26 changes: 24 additions & 2 deletions pkg/controller/ingress/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,30 @@ func (lbc *EngressController) ensureResources() {
// if there is already an resource with this name
// delete those resource and create the new resource.
log.Debugln("trying to delete already existing resources.")
lbc.deleteConfigMap()
lbc.deleteLB()
_, err := lbc.KubeClient.Core().ConfigMaps(lbc.Config.Namespace).Get(VoyagerPrefix + lbc.Config.Name)
if err == nil {
lbc.deleteConfigMap()
}
if lbc.Options.LBType == LBTypeDaemon || lbc.Options.LBType == LBTypeHostPort {
_, err := lbc.KubeClient.Extensions().DaemonSets(lbc.Config.Namespace).Get(VoyagerPrefix + lbc.Config.Name)
if err == nil {
lbc.deleteHostPortPods()
}
} else if lbc.Options.LBType == LBTypeNodePort {
_, err := lbc.KubeClient.Extensions().Deployments(lbc.Config.Namespace).Get(VoyagerPrefix + lbc.Config.Name)
if err == nil {
lbc.deleteNodePortPods()

}
} else {
// Ignore Error.
lbc.deleteResidualPods()
_, err := lbc.KubeClient.Extensions().Deployments(lbc.Config.Namespace).Get(VoyagerPrefix + lbc.Config.Name)
if err == nil {
lbc.deleteNodePortPods()
}
}
lbc.deleteLBSvc()
}

func (lbc *EngressController) createConfigMap() error {
Expand Down
15 changes: 9 additions & 6 deletions pkg/controller/ingress/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"github.com/appscode/errors"
"github.com/appscode/log"
kapi "k8s.io/kubernetes/pkg/api"
kerr "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/selection"
"k8s.io/kubernetes/pkg/util/sets"
Expand Down Expand Up @@ -53,7 +52,10 @@ func (lbc *EngressController) deleteLB() error {
return errors.FromErr(err).Err()
}
}
return lbc.deleteLBSvc()
}

func (lbc *EngressController) deleteLBSvc() error {
svc, err := lbc.KubeClient.Core().Services(lbc.Config.Namespace).Get(VoyagerPrefix + lbc.Config.Name)
if err == nil {
// delete service
Expand Down Expand Up @@ -83,8 +85,6 @@ func (lbc *EngressController) deleteLB() error {
}
}
}
} else if !kerr.IsNotFound(err) {
return errors.FromErr(err).Err()
}
return nil
}
Expand Down Expand Up @@ -132,13 +132,15 @@ func (lbc *EngressController) deleteNodePortPods() error {
func (lbc *EngressController) deleteResidualPods() error {
rc, err := lbc.KubeClient.Core().ReplicationControllers(lbc.Config.Namespace).Get(VoyagerPrefix + lbc.Config.Name)
if err != nil {
return errors.FromErr(err).Err()
log.Warningln(err)
return err
}
// resize the controller to zero (effectively deleting all pods) before deleting it.
rc.Spec.Replicas = 0
_, err = lbc.KubeClient.Core().ReplicationControllers(lbc.Config.Namespace).Update(rc)
if err != nil {
return errors.FromErr(err).Err()
log.Warningln(err)
return err
}

log.Debugln("Waiting before delete the RC")
Expand All @@ -149,7 +151,8 @@ func (lbc *EngressController) deleteResidualPods() error {
OrphanDependents: &falseVar,
})
if err != nil {
return errors.FromErr(err).Err()
log.Warningln(err)
return err
}
lbc.deletePodsForSelector(rc.Spec.Selector)
return nil
Expand Down
10 changes: 7 additions & 3 deletions pkg/controller/ingress/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ingress

import (
"encoding/json"
goerr "errors"
"strconv"
"strings"

Expand Down Expand Up @@ -43,19 +44,22 @@ func (lbc *EngressController) serviceEndpoints(name string, port intstr.IntOrStr
log.Infoln("looking for services in namespace", namespace, "with name", name)
service, err := lbc.KubeClient.Core().Services(namespace).Get(name)
if err != nil {
return nil, errors.FromErr(err).Err()
log.Warningln(err)
return nil, err
}
p, ok := getSpecifiedPort(service.Spec.Ports, port)
if !ok {
return nil, errors.New("service port unavaiable").Err()
log.Warningln("service port unavailable")
return nil, goerr.New("service port unavailable")
}
return lbc.getEndpoints(service, p, hostNames)
}

func (lbc *EngressController) getEndpoints(s *kapi.Service, servicePort *kapi.ServicePort, hostNames []string) (eps []*Endpoint, err error) {
ep, err := lbc.EndpointStore.GetServiceEndpoints(s)
if err != nil {
return nil, errors.FromErr(err).Err()
log.Warningln(err)
return nil, err
}

// The intent here is to create a union of all subsets that match a targetPort.
Expand Down

0 comments on commit b00fe77

Please sign in to comment.