Skip to content

Commit

Permalink
Update dependencies (#220)
Browse files Browse the repository at this point in the history 
Also, start using glide instead of godep
  • Loading branch information
@pleshakov
pleshakov authored Dec 20, 2017
1 parent eaa9b19 commit ccc157d
Show file tree
Hide file tree
Showing 5,411 changed files with 2,000,883 additions and 411,755 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
785 changes: 0 additions & 785 deletions Godeps/Godeps.json
View file

This file was deleted.

250 changes: 250 additions & 0 deletions glide.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions glide.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
package: github.com/nginxinc/kubernetes-ingress
import:
- package: k8s.io/client-go
version: v6.0.0
2 changes: 1 addition & 1 deletion nginx-controller/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TAG = $(VERSION)
PREFIX = nginxdemos/nginx-ingress

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/
GOLANG_CONTAINER = golang:1.8
GOLANG_CONTAINER = golang:1.9
DOCKERFILE = Dockerfile

BUILD_IN_CONTAINER = 1
Expand Down
18 changes: 9 additions & 9 deletions nginx-controller/controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record"

api_v1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api_v1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
)

const (
Expand Down Expand Up @@ -554,13 +554,13 @@ func (lbc *LoadBalancerController) syncCfgm(task Task) {
cfg.ProxyMaxTempFileSize = proxyMaxTempFileSize
}

if mainMainSnippets, exists, err := nginx.GetMapKeyAsStringSlice(cfgm.Data, "main-snippets", cfgm, "\n"); exists {
if err != nil {
glog.Error(err)
} else {
cfg.MainMainSnippets = mainMainSnippets
}
}
if mainMainSnippets, exists, err := nginx.GetMapKeyAsStringSlice(cfgm.Data, "main-snippets", cfgm, "\n"); exists {
if err != nil {
glog.Error(err)
} else {
cfg.MainMainSnippets = mainMainSnippets
}
}
if mainHTTPSnippets, exists, err := nginx.GetMapKeyAsStringSlice(cfgm.Data, "http-snippets", cfgm, "\n"); exists {
if err != nil {
glog.Error(err)
Expand Down
4 changes: 2 additions & 2 deletions nginx-controller/controller/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"k8s.io/client-go/tools/cache"
"k8s.io/client-go/util/workqueue"

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

"github.com/golang/glog"
)
Expand Down
4 changes: 2 additions & 2 deletions nginx-controller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"github.com/nginxinc/kubernetes-ingress/nginx-controller/controller"
"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx"
"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx/plus"
api_v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/pkg/api"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
Expand All @@ -34,7 +34,7 @@ var (
are not written to the disk, instead they are printed to stdout. Also NGINX
is not getting invoked. This flag is for testing.`)

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

Expand Down
4 changes: 2 additions & 2 deletions nginx-controller/nginx/configurator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/golang/glog"
"github.com/nginxinc/kubernetes-ingress/nginx-controller/nginx/plus"
api_v1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api_v1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
)

const emptyHost = ""
Expand Down
4 changes: 2 additions & 2 deletions nginx-controller/nginx/convert_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"reflect"
"testing"

api_v1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
api_v1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
)

var configMap = api_v1.ConfigMap{
Expand Down
4 changes: 2 additions & 2 deletions nginx-controller/nginx/ingress.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package nginx

import (
api_v1 "k8s.io/client-go/pkg/api/v1"
extensions "k8s.io/client-go/pkg/apis/extensions/v1beta1"
api_v1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
)

// IngressEx holds an Ingress along with Secrets and Endpoints of the services
Expand Down
2 changes: 1 addition & 1 deletion nginx-controller/nginx/secret.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package nginx
import (
"fmt"

api_v1 "k8s.io/client-go/pkg/api/v1"
api_v1 "k8s.io/api/core/v1"
)

const (
Expand Down
Loading

0 comments on commit ccc157d

Please sign in to comment.