Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update golang dependencies #741

Merged
merged 2 commits into from
May 22, 2017
Merged

Update golang dependencies #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ddf987
Update golang dependencies
aledbf May 21, 2017
b1d6468
Replace NodeLegacyHostIP with NodeInternalIP
aledbf May 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1,060 changes: 545 additions & 515 deletions Godeps/Godeps.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions core/pkg/ingress/status/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func buildSimpleClientSet() *testclient.Clientset {
Status: api_v1.NodeStatus{
Addresses: []api_v1.NodeAddress{
{
Type: api_v1.NodeLegacyHostIP,
Type: api_v1.NodeInternalIP,
Address: "10.0.0.1",
}, {
Type: api_v1.NodeExternalIP,
Expand All @@ -137,7 +137,7 @@ func buildSimpleClientSet() *testclient.Clientset {
Status: api_v1.NodeStatus{
Addresses: []api_v1.NodeAddress{
{
Type: api_v1.NodeLegacyHostIP,
Type: api_v1.NodeInternalIP,
Address: "11.0.0.1",
},
{
Expand Down
2 changes: 1 addition & 1 deletion core/pkg/k8s/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func GetNodeIP(kubeClient clientset.Interface, name string) string {
}
}

if externalIP == "" && address.Type == api.NodeLegacyHostIP {
if externalIP == "" && address.Type == api.NodeInternalIP {
externalIP = address.Address
}
}
Expand Down
16 changes: 8 additions & 8 deletions core/pkg/k8s/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func TestGetNodeIP(t *testing.T) {
Status: api.NodeStatus{
Addresses: []api.NodeAddress{
{
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.1",
},
},
Expand All @@ -206,7 +206,7 @@ func TestGetNodeIP(t *testing.T) {
Status: api.NodeStatus{
Addresses: []api.NodeAddress{
{
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.1",
},
},
Expand All @@ -222,7 +222,7 @@ func TestGetNodeIP(t *testing.T) {
Status: api.NodeStatus{
Addresses: []api.NodeAddress{
{
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.1",
},
},
Expand All @@ -235,7 +235,7 @@ func TestGetNodeIP(t *testing.T) {
Status: api.NodeStatus{
Addresses: []api.NodeAddress{
{
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.2",
},
},
Expand All @@ -251,7 +251,7 @@ func TestGetNodeIP(t *testing.T) {
Status: api.NodeStatus{
Addresses: []api.NodeAddress{
{
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.1",
}, {
Type: api.NodeExternalIP,
Expand All @@ -261,7 +261,7 @@ func TestGetNodeIP(t *testing.T) {
},
}}}), "demo", "10.0.0.2"},

// get NodeLegacyHostIP
// get NodeInternalIP
{testclient.NewSimpleClientset(&api.NodeList{Items: []api.Node{{
ObjectMeta: meta_v1.ObjectMeta{
Name: "demo",
Expand All @@ -272,7 +272,7 @@ func TestGetNodeIP(t *testing.T) {
Type: api.NodeExternalIP,
Address: "",
}, {
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.2",
},
},
Expand Down Expand Up @@ -324,7 +324,7 @@ func TestGetPodDetails(t *testing.T) {
Status: api.NodeStatus{
Addresses: []api.NodeAddress{
{
Type: api.NodeLegacyHostIP,
Type: api.NodeInternalIP,
Address: "10.0.0.1",
},
},
Expand Down
4 changes: 4 additions & 0 deletions vendor/github.com/dgrijalva/jwt-go/.gitignore
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions vendor/github.com/dgrijalva/jwt-go/.travis.yml
View file
Open in desktop

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

8 changes: 8 additions & 0 deletions vendor/github.com/dgrijalva/jwt-go/LICENSE
View file
Open in desktop

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

96 changes: 96 additions & 0 deletions vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md
View file
Open in desktop

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

85 changes: 85 additions & 0 deletions vendor/github.com/dgrijalva/jwt-go/README.md
View file
Open in desktop

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

Loading