diff --git a/core/pkg/ingress/annotations/sessionaffinity/main.go b/core/pkg/ingress/annotations/sessionaffinity/main.go index d6760f156e..b79c261392 100644 --- a/core/pkg/ingress/annotations/sessionaffinity/main.go +++ b/core/pkg/ingress/annotations/sessionaffinity/main.go @@ -92,10 +92,7 @@ type affinity struct { // ParseAnnotations parses the annotations contained in the ingress // rule used to configure the affinity directives func (a affinity) Parse(ing *extensions.Ingress) (interface{}, error) { - - var cookieAffinityConfig *CookieConfig - cookieAffinityConfig = &CookieConfig{} - + cookieAffinityConfig := &CookieConfig{} // Check the type of affinity that will be used at, err := parser.GetStringAnnotation(annotationAffinityType, ing) if err != nil { diff --git a/core/pkg/ingress/controller/annotations.go b/core/pkg/ingress/controller/annotations.go index 47f0a9acff..a66a87e33d 100644 --- a/core/pkg/ingress/controller/annotations.go +++ b/core/pkg/ingress/controller/annotations.go @@ -72,7 +72,7 @@ func newAnnotationExtractor(cfg extractorConfig) annotationExtractor { } func (e *annotationExtractor) Extract(ing *extensions.Ingress) map[string]interface{} { - anns := make(map[string]interface{}, 0) + anns := make(map[string]interface{}) for name, annotationParser := range e.annotations { val, err := annotationParser.Parse(ing) glog.V(5).Infof("annotation %v in Ingress %v/%v: %v", name, ing.GetNamespace(), ing.GetName(), val) diff --git a/core/pkg/ingress/controller/annotations_test.go b/core/pkg/ingress/controller/annotations_test.go index 0da4458abe..d96b6ccdcb 100644 --- a/core/pkg/ingress/controller/annotations_test.go +++ b/core/pkg/ingress/controller/annotations_test.go @@ -37,7 +37,6 @@ const ( annotationAffinityType = "ingress.kubernetes.io/affinity" annotationAffinityCookieName = "ingress.kubernetes.io/session-cookie-name" annotationAffinityCookieHash = "ingress.kubernetes.io/session-cookie-hash" - annotationAuthTlsSecret = "ingress.kubernetes.io/auth-tls-secret" ) type mockCfg struct { diff --git a/core/pkg/ingress/controller/controller.go b/core/pkg/ingress/controller/controller.go index 7f2b8a36bc..f0d97c6ce1 100644 --- a/core/pkg/ingress/controller/controller.go +++ b/core/pkg/ingress/controller/controller.go @@ -58,10 +58,9 @@ import ( ) const ( - defUpstreamName = "upstream-default-backend" - defServerName = "_" - podStoreSyncedPollPeriod = 1 * time.Second - rootLocation = "/" + defUpstreamName = "upstream-default-backend" + defServerName = "_" + rootLocation = "/" ) var ( @@ -1043,7 +1042,7 @@ func (ic *GenericController) getEndpoints( // avoid duplicated upstream servers when the service // contains multiple port definitions sharing the same // targetport. - adus := make(map[string]bool, 0) + adus := make(map[string]bool) // ExternalName services if s.Spec.Type == api.ServiceTypeExternalName {