Skip to content

Commit 1a68536

Browse files
aledbfaledbf
authored
Merge pull request #1382 from aledbf/cleanup
Cleanup
2 parents f478084 + 0661eaa commit 1a68536

29 files changed

+264
-281
lines changed

‎.travis.yml

+1-11
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,10 @@ notifications:
99
email: true
1010

1111
go:
12-
- 1.8.3
12+
- 1.9
1313

1414
go_import_path: k8s.io/ingress
1515

16-
env:
17-
global:
18-
# to add additional secure variables:
19-
# docker run --rm caktux/travis-cli encrypt key=value -r kubernetes/ingress
20-
- RELEASE="ci-${TRAVIS_BUILD_ID}"
21-
22-
before_script:
23-
- export PATH=$PATH:$PWD/hack/e2e-internal/
24-
2516
jobs:
2617
include:
2718
- stage: Static Check
@@ -34,4 +25,3 @@ jobs:
3425
- go get github.com/modocache/gover
3526
- if ! go get github.com/golang/tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
3627
- make cover
37-
#- make test-e2e

‎Makefile

-18
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,6 @@ all: fmt lint vet
22

33
BUILDTAGS=
44

5-
# building inside travis generates a custom version of the
6-
# backends in order to run e2e tests agains the build.
7-
ifdef TRAVIS_BUILD_ID
8-
RELEASE := ci-build-${TRAVIS_BUILD_ID}
9-
endif
10-
11-
# 0.0 shouldn't clobber any release builds
12-
RELEASE?=0.0
13-
14-
# by default build a linux version
15-
GOOS?=linux
16-
17-
REPO_INFO=$(shell git config --get remote.origin.url)
18-
19-
ifndef COMMIT
20-
COMMIT := git-$(shell git rev-parse --short HEAD)
21-
endif
22-
235
# base package. It contains the common and backends code
246
PKG := "k8s.io/ingress"
257

‎controllers/nginx/pkg/cmd/controller/nginx.go

+9-10
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ import (
3535
"github.com/spf13/pflag"
3636

3737
proxyproto "github.com/armon/go-proxyproto"
38-
api "k8s.io/api/core/v1"
39-
api_v1 "k8s.io/api/core/v1"
38+
apiv1 "k8s.io/api/core/v1"
4039
extensions "k8s.io/api/extensions/v1beta1"
4140

4241
"k8s.io/ingress/controllers/nginx/pkg/config"
@@ -83,7 +82,7 @@ func newNGINXController() *NGINXController {
8382

8483
n := &NGINXController{
8584
binary: ngx,
86-
configmap: &api_v1.ConfigMap{},
85+
configmap: &apiv1.ConfigMap{},
8786
isIPV6Enabled: isIPv6Enabled(),
8887
resolver: h,
8988
ports: &config.ListenPorts{},
@@ -123,7 +122,7 @@ type NGINXController struct {
123122
controller *controller.GenericController
124123
t *ngx_template.Template
125124

126-
configmap *api_v1.ConfigMap
125+
configmap *apiv1.ConfigMap
127126

128127
storeLister ingress.StoreLister
129128

@@ -309,7 +308,7 @@ func (n NGINXController) DefaultEndpoint() ingress.Endpoint {
309308
return ingress.Endpoint{
310309
Address: "127.0.0.1",
311310
Port: fmt.Sprintf("%v", n.ports.Default),
312-
Target: &api.ObjectReference{},
311+
Target: &apiv1.ObjectReference{},
313312
}
314313
}
315314

@@ -443,7 +442,7 @@ Error: %v
443442
}
444443

445444
// SetConfig sets the configured configmap
446-
func (n *NGINXController) SetConfig(cmap *api_v1.ConfigMap) {
445+
func (n *NGINXController) SetConfig(cmap *apiv1.ConfigMap) {
447446
n.configmap = cmap
448447
n.isProxyProtocolEnabled = false
449448

@@ -469,7 +468,7 @@ func (n *NGINXController) SetListers(lister ingress.StoreLister) {
469468
}
470469

471470
// UpdateIngressStatus custom Ingress status update
472-
func (n *NGINXController) UpdateIngressStatus(*extensions.Ingress) []api_v1.LoadBalancerIngress {
471+
func (n *NGINXController) UpdateIngressStatus(*extensions.Ingress) []apiv1.LoadBalancerIngress {
473472
return nil
474473
}
475474

@@ -598,7 +597,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
598597
}
599598

600599
if exists {
601-
setHeaders = cmap.(*api_v1.ConfigMap).Data
600+
setHeaders = cmap.(*apiv1.ConfigMap).Data
602601
}
603602
}
604603

@@ -610,7 +609,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
610609
}
611610

612611
if exists {
613-
addHeaders = cmap.(*api_v1.ConfigMap).Data
612+
addHeaders = cmap.(*apiv1.ConfigMap).Data
614613
}
615614
}
616615

@@ -623,7 +622,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
623622
}
624623

625624
if exists {
626-
secret := s.(*api_v1.Secret)
625+
secret := s.(*apiv1.Secret)
627626
nsSecName := strings.Replace(secretName, "/", "-", -1)
628627

629628
dh, ok := secret.Data["dhparam.pem"]

‎controllers/nginx/pkg/cmd/controller/tcp.go

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"net"
77

88
"github.com/golang/glog"
9+
910
"github.com/paultag/sniff/parser"
1011
)
1112

‎controllers/nginx/pkg/cmd/controller/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import (
2424
"os/exec"
2525
"syscall"
2626

27-
"k8s.io/kubernetes/pkg/util/sysctl"
28-
2927
"github.com/golang/glog"
28+
29+
"k8s.io/kubernetes/pkg/util/sysctl"
3030
)
3131

3232
// sysctlSomaxconn returns the value of net.core.somaxconn, i.e.

‎controllers/nginx/pkg/metric/collector/nginx.go

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package collector
1818

1919
import (
2020
"github.com/golang/glog"
21+
2122
"github.com/prometheus/client_golang/prometheus"
2223
)
2324

‎controllers/nginx/pkg/metric/collector/process.go

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"path/filepath"
2121

2222
"github.com/golang/glog"
23+
2324
common "github.com/ncabatoff/process-exporter"
2425
"github.com/ncabatoff/process-exporter/proc"
2526
"github.com/prometheus/client_golang/prometheus"

‎controllers/nginx/pkg/metric/collector/vts.go

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"reflect"
2121

2222
"github.com/golang/glog"
23+
2324
"github.com/prometheus/client_golang/prometheus"
2425
)
2526

‎controllers/nginx/pkg/template/configmap.go

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"strings"
2424

2525
"github.com/golang/glog"
26+
2627
"github.com/mitchellh/mapstructure"
2728

2829
"k8s.io/ingress/controllers/nginx/pkg/config"

‎controllers/nginx/pkg/template/template.go

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
text_template "text/template"
3131

3232
"github.com/golang/glog"
33+
3334
"github.com/pborman/uuid"
3435

3536
extensions "k8s.io/api/extensions/v1beta1"

‎controllers/nginx/pkg/template/template_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package template
1919
import (
2020
"encoding/json"
2121
"io/ioutil"
22+
"net"
2223
"os"
2324
"path"
2425
"reflect"
@@ -29,7 +30,6 @@ import (
2930
"k8s.io/ingress/core/pkg/ingress"
3031
"k8s.io/ingress/core/pkg/ingress/annotations/authreq"
3132
"k8s.io/ingress/core/pkg/ingress/annotations/rewrite"
32-
"net"
3333
)
3434

3535
var (

‎core/pkg/ingress/controller/annotations.go

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package controller
1818

1919
import (
2020
"github.com/golang/glog"
21+
2122
extensions "k8s.io/api/extensions/v1beta1"
2223
"k8s.io/ingress/core/pkg/ingress/annotations/alias"
2324
"k8s.io/ingress/core/pkg/ingress/annotations/auth"

‎core/pkg/ingress/controller/annotations_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ package controller
1919
import (
2020
"testing"
2121

22-
api "k8s.io/api/core/v1"
22+
apiv1 "k8s.io/api/core/v1"
2323
extensions "k8s.io/api/extensions/v1beta1"
24-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2525
"k8s.io/apimachinery/pkg/util/intstr"
2626

2727
"k8s.io/ingress/core/pkg/ingress/defaults"
@@ -40,19 +40,19 @@ const (
4040
)
4141

4242
type mockCfg struct {
43-
MockSecrets map[string]*api.Secret
44-
MockServices map[string]*api.Service
43+
MockSecrets map[string]*apiv1.Secret
44+
MockServices map[string]*apiv1.Service
4545
}
4646

4747
func (m mockCfg) GetDefaultBackend() defaults.Backend {
4848
return defaults.Backend{}
4949
}
5050

51-
func (m mockCfg) GetSecret(name string) (*api.Secret, error) {
51+
func (m mockCfg) GetSecret(name string) (*apiv1.Secret, error) {
5252
return m.MockSecrets[name], nil
5353
}
5454

55-
func (m mockCfg) GetService(name string) (*api.Service, error) {
55+
func (m mockCfg) GetService(name string) (*apiv1.Service, error) {
5656
return m.MockServices[name], nil
5757
}
5858

@@ -88,9 +88,9 @@ func buildIngress() *extensions.Ingress {
8888
}
8989

9090
return &extensions.Ingress{
91-
ObjectMeta: meta_v1.ObjectMeta{
91+
ObjectMeta: metav1.ObjectMeta{
9292
Name: "foo",
93-
Namespace: api.NamespaceDefault,
93+
Namespace: apiv1.NamespaceDefault,
9494
},
9595
Spec: extensions.IngressSpec{
9696
Backend: &extensions.IngressBackend{
@@ -142,9 +142,9 @@ func TestSecureUpstream(t *testing.T) {
142142

143143
func TestSecureVerifyCACert(t *testing.T) {
144144
ec := newAnnotationExtractor(mockCfg{
145-
MockSecrets: map[string]*api.Secret{
145+
MockSecrets: map[string]*apiv1.Secret{
146146
"default/secure-verify-ca": {
147-
ObjectMeta: meta_v1.ObjectMeta{
147+
ObjectMeta: metav1.ObjectMeta{
148148
Name: "secure-verify-ca",
149149
},
150150
},

‎core/pkg/ingress/controller/backend_ssl.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323

2424
"github.com/golang/glog"
2525

26-
api "k8s.io/api/core/v1"
26+
apiv1 "k8s.io/api/core/v1"
2727
"k8s.io/client-go/tools/cache"
2828

2929
"k8s.io/ingress/core/pkg/ingress"
@@ -75,9 +75,9 @@ func (ic *GenericController) getPemCertificate(secretName string) (*ingress.SSLC
7575
return nil, fmt.Errorf("secret named %v does not exist", secretName)
7676
}
7777

78-
secret := secretInterface.(*api.Secret)
79-
cert, okcert := secret.Data[api.TLSCertKey]
80-
key, okkey := secret.Data[api.TLSPrivateKeyKey]
78+
secret := secretInterface.(*apiv1.Secret)
79+
cert, okcert := secret.Data[apiv1.TLSCertKey]
80+
key, okkey := secret.Data[apiv1.TLSPrivateKeyKey]
8181

8282
ca := secret.Data["ca.crt"]
8383

‎core/pkg/ingress/controller/backend_ssl_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ package controller
1818

1919
import (
2020
"encoding/base64"
21+
"fmt"
2122
"io/ioutil"
2223
"testing"
2324

24-
"fmt"
25-
26-
api_v1 "k8s.io/api/core/v1"
27-
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
apiv1 "k8s.io/api/core/v1"
26+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
testclient "k8s.io/client-go/kubernetes/fake"
2928
cache_client "k8s.io/client-go/tools/cache"
29+
3030
"k8s.io/ingress/core/pkg/ingress"
3131
"k8s.io/ingress/core/pkg/ingress/store"
3232
"k8s.io/kubernetes/pkg/api"
@@ -70,9 +70,9 @@ func buildIngListenerForBackendSSL() store.IngressLister {
7070
return ingLister
7171
}
7272

73-
func buildSecretForBackendSSL() *api_v1.Secret {
74-
return &api_v1.Secret{
75-
ObjectMeta: meta_v1.ObjectMeta{
73+
func buildSecretForBackendSSL() *apiv1.Secret {
74+
return &apiv1.Secret{
75+
ObjectMeta: metav1.ObjectMeta{
7676
Name: "foo_secret",
7777
Namespace: api.NamespaceDefault,
7878
},

0 commit comments

Comments
 (0)