Skip to content

Commit ccc157d

Browse files
pleshakovpleshakov
authored
Update dependencies (nginx#220)
Also, start using glide instead of godep
1 parent eaa9b19 commit ccc157d

File tree

5,411 files changed

+2000883
-411755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,411 files changed

+2000883
-411755
lines changed

‎Godeps/Godeps.json

-785
This file was deleted.

‎glide.lock

+250
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎glide.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package: github.com/nginxinc/kubernetes-ingress
2+
import:
3+
- package: k8s.io/client-go
4+
version: v6.0.0

‎nginx-controller/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ TAG = $(VERSION)
55
PREFIX = nginxdemos/nginx-ingress
66

77
DOCKER_RUN = docker run --rm -v $(shell pwd)/../:/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/nginx-controller/
8-
GOLANG_CONTAINER = golang:1.8
8+
GOLANG_CONTAINER = golang:1.9
99
DOCKERFILE = Dockerfile
1010

1111
BUILD_IN_CONTAINER = 1

‎nginx-controller/controller/controller.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ import (
3434
"k8s.io/client-go/tools/cache"
3535
"k8s.io/client-go/tools/record"
3636

37+
api_v1 "k8s.io/api/core/v1"
38+
extensions "k8s.io/api/extensions/v1beta1"
3739
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
38-
api_v1 "k8s.io/client-go/pkg/api/v1"
39-
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
4040
)
4141

4242
const (
@@ -554,13 +554,13 @@ func (lbc *LoadBalancerController) syncCfgm(task Task) {
554554
cfg.ProxyMaxTempFileSize = proxyMaxTempFileSize
555555
}
556556

557-
if mainMainSnippets, exists, err := nginx.GetMapKeyAsStringSlice(cfgm.Data, "main-snippets", cfgm, "\n"); exists {
558-
if err != nil {
559-
glog.Error(err)
560-
} else {
561-
cfg.MainMainSnippets = mainMainSnippets
562-
}
563-
}
557+
if mainMainSnippets, exists, err := nginx.GetMapKeyAsStringSlice(cfgm.Data, "main-snippets", cfgm, "\n"); exists {
558+
if err != nil {
559+
glog.Error(err)
560+
} else {
561+
cfg.MainMainSnippets = mainMainSnippets
562+
}
563+
}
564564
if mainHTTPSnippets, exists, err := nginx.GetMapKeyAsStringSlice(cfgm.Data, "http-snippets", cfgm, "\n"); exists {
565565
if err != nil {
566566
glog.Error(err)

‎nginx-controller/controller/utils.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import (
2525
"k8s.io/client-go/tools/cache"
2626
"k8s.io/client-go/util/workqueue"
2727

28-
api_v1 "k8s.io/client-go/pkg/api/v1"
29-
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
28+
api_v1 "k8s.io/api/core/v1"
29+
extensions "k8s.io/api/extensions/v1beta1"
3030

3131
"github.com/golang/glog"
3232
)

‎nginx-controller/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import (
1212
"github.com/nginxinc/kubernetes-ingress/nginx-controller/controller"
1313
"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx"
1414
"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx/plus"
15+
api_v1 "k8s.io/api/core/v1"
1516
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1617
"k8s.io/client-go/kubernetes"
17-
"k8s.io/client-go/pkg/api"
1818
"k8s.io/client-go/rest"
1919
"k8s.io/client-go/tools/clientcmd"
2020
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
@@ -34,7 +34,7 @@ var (
3434
are not written to the disk, instead they are printed to stdout. Also NGINX
3535
is not getting invoked. This flag is for testing.`)
3636

37-
watchNamespace = flag.String("watch-namespace", api.NamespaceAll,
37+
watchNamespace = flag.String("watch-namespace", api_v1.NamespaceAll,
3838
`Namespace to watch for Ingress/Services/Endpoints. By default the controller
3939
watches acrosss all namespaces`)
4040

‎nginx-controller/nginx/configurator.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/golang/glog"
1111
"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx/plus"
12+
api_v1 "k8s.io/api/core/v1"
13+
extensions "k8s.io/api/extensions/v1beta1"
1214
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13-
api_v1 "k8s.io/client-go/pkg/api/v1"
14-
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
1515
)
1616

1717
const emptyHost = ""

‎nginx-controller/nginx/convert_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"reflect"
55
"testing"
66

7+
api_v1 "k8s.io/api/core/v1"
8+
extensions "k8s.io/api/extensions/v1beta1"
79
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8-
api_v1 "k8s.io/client-go/pkg/api/v1"
9-
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
1010
)
1111

1212
var configMap = api_v1.ConfigMap{

‎nginx-controller/nginx/ingress.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package nginx
22

33
import (
4-
api_v1 "k8s.io/client-go/pkg/api/v1"
5-
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
4+
api_v1 "k8s.io/api/core/v1"
5+
extensions "k8s.io/api/extensions/v1beta1"
66
)
77

88
// IngressEx holds an Ingress along with Secrets and Endpoints of the services

‎nginx-controller/nginx/secret.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package nginx
33
import (
44
"fmt"
55

6-
api_v1 "k8s.io/client-go/pkg/api/v1"
6+
api_v1 "k8s.io/api/core/v1"
77
)
88

99
const (

0 commit comments

Comments
 (0)