diff --git a/core/pkg/ingress/annotations/sessionaffinity/main.go b/core/pkg/ingress/annotations/sessionaffinity/main.go index d6760f156..b79c26139 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 47f0a9acf..a66a87e33 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 0da4458ab..d96b6ccdc 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 7f2b8a36b..f0d97c6ce 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 { diff --git a/core/pkg/ingress/controller/named_port.go b/core/pkg/ingress/controller/named_port.go deleted file mode 100644 index 99e43c826..000000000 --- a/core/pkg/ingress/controller/named_port.go +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package controller - -import ( - "fmt" - - "k8s.io/apimachinery/pkg/util/intstr" - api_v1 "k8s.io/client-go/pkg/api/v1" -) - -// FindPort locates the container port for the given pod and portName. If the -// targetPort is a number, use that. If the targetPort is a string, look that -// string up in all named ports in all containers in the target pod. If no -// match is found, fail. -func findPort(pod *api_v1.Pod, svcPort *api_v1.ServicePort) (int, error) { - portName := svcPort.TargetPort - switch portName.Type { - case intstr.String: - name := portName.StrVal - for _, container := range pod.Spec.Containers { - for _, port := range container.Ports { - if port.Name == name && port.Protocol == svcPort.Protocol { - return int(port.ContainerPort), nil - } - } - } - case intstr.Int: - return portName.IntValue(), nil - } - - return 0, fmt.Errorf("no suitable port for manifest: %s", pod.UID) -} diff --git a/core/pkg/ingress/controller/named_port_test.go b/core/pkg/ingress/controller/named_port_test.go deleted file mode 100644 index 09637cb25..000000000 --- a/core/pkg/ingress/controller/named_port_test.go +++ /dev/null @@ -1,93 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package controller - -import ( - meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/client-go/kubernetes/fake" - "k8s.io/client-go/pkg/api" - api_v1 "k8s.io/client-go/pkg/api/v1" -) - -func buildSimpleClientSet() *fake.Clientset { - return fake.NewSimpleClientset( - &api_v1.PodList{ - Items: []api_v1.Pod{ - { - ObjectMeta: meta_v1.ObjectMeta{ - Name: "foo1", - Namespace: api.NamespaceDefault, - Labels: map[string]string{ - "lable_sig": "foo_pod", - }, - }, - Spec: api_v1.PodSpec{ - NodeName: "foo_node_1", - Containers: []api_v1.Container{ - { - Ports: []api_v1.ContainerPort{ - { - Name: "foo1_named_port_c1", - Protocol: api_v1.ProtocolTCP, - ContainerPort: 80, - }, - }, - }, - }, - }, - }, - { - ObjectMeta: meta_v1.ObjectMeta{ - Name: "foo1", - Namespace: api.NamespaceSystem, - Labels: map[string]string{ - "lable_sig": "foo_pod", - }, - }, - }, - }, - }, - &api_v1.ServiceList{Items: []api_v1.Service{ - { - ObjectMeta: meta_v1.ObjectMeta{ - Namespace: api.NamespaceDefault, - Name: "named_port_test_service", - }, - }, - }}, - ) -} - -func buildGenericController() *GenericController { - return &GenericController{ - cfg: &Configuration{ - Client: buildSimpleClientSet(), - }, - } -} - -func buildService() *api_v1.Service { - return &api_v1.Service{ - ObjectMeta: meta_v1.ObjectMeta{ - Namespace: api.NamespaceSystem, - Name: "named_port_test_service", - }, - Spec: api_v1.ServiceSpec{ - ClusterIP: "10.10.10.10", - }, - } -}