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

chore: update go dependencies #3157

Merged
merged 3 commits into from
Aug 9, 2018
Merged

chore: update go dependencies #3157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a834fd1
chore: update go dependencies
pengx17 Jul 19, 2018
8e18560
fix: fix go tests
pengx17 Jul 19, 2018
a288e2c
chore: revert go-restful version
pengx17 Jul 19, 2018
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
  •  
  •  
  •  
136 changes: 21 additions & 115 deletions Gopkg.lock
View file
Open in desktop

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

24 changes: 14 additions & 10 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md for detailed Gopkg.toml documentation.

[prune]
go-tests = true
#unused-packages = true

[[constraint]]
name = "k8s.io/api"
branch = "release-1.9"
version="kubernetes-1.10.0"

[[constraint]]
name = "k8s.io/apimachinery"
branch = "release-1.9"
version="kubernetes-1.10.0"

[[constraint]]
name = "k8s.io/client-go"
branch = "release-6.0"
version="kubernetes-1.10.1"

[[constraint]]
name = "k8s.io/heapster"
Expand All @@ -30,7 +34,7 @@

[[constraint]]
name = "github.com/spf13/pflag"
version = "1.0.0"
version = "1.0.1"

[[constraint]]
name = "golang.org/x/net"
Expand All @@ -45,13 +49,13 @@
branch = "v2"

[[constraint]]
name = "github.com/square/go-jose"
version = "2.1.3"
name = "github.com/kubernetes-sigs/application"
branch = "master"

[[override]]
[[constraint]]
name = "github.com/emicklei/go-restful"
version = "1.0.0"

[[constraint]]
name = "github.com/kubernetes-sigs/application"
branch = "master"
[[override]]
name = "github.com/square/go-jose"
version = "2.1.3"
2 changes: 2 additions & 0 deletions i18n/messages-en.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@
<translation id="6219798353623882069" key="MSG_CRONJOB_DETAIL_ACTIONBAR_0" desc="Cron Job\'s resource kind name.">Cron Job</translation>
<translation id="5152871798838609000" key="MSG_CRONJOB_DETAIL_DETAIL_0" desc="Active Jobs card title, displayed on Cron Job details page.">Active Jobs</translation>
<translation id="2080014846980293516" key="MSG_CRONJOB_DETAIL_DETAIL_1" desc="(no description provided)">There are currently no Jobs managed by this Cron Job.</translation>
<translation id="4910697302285925429" key="MSG_CRONJOB_DETAIL_DETAIL_2" desc="Inactive Jobs card title, displayed on Cron Job details page.">Inactive Jobs</translation>
<translation id="5132781400764099616" key="MSG_CRONJOB_DETAIL_DETAIL_3" desc="(no description provided)">There are currently no inactive Jobs managed by this Cron Job.</translation>
<translation id="2068898769567977603" key="MSG_CRONJOB_DETAIL_INFO_0" desc="Cron Job\'s details card header.">Details</translation>
<translation id="9026215886401416721" key="MSG_CRONJOB_DETAIL_INFO_1" desc="Cron Job\'s attribute label.">Schedule</translation>
<translation id="6247369684436975092" key="MSG_CRONJOB_DETAIL_INFO_2" desc="Cron Job\'s attribute label.">Active</translation>
Expand Down
2 changes: 2 additions & 0 deletions i18n/messages-ja.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@
<translation id="6219798353623882069" key="MSG_CRONJOB_DETAIL_ACTIONBAR_0" desc="Cron Job\'s resource kind name.">Cron ジョブ</translation>
<translation id="5152871798838609000" key="MSG_CRONJOB_DETAIL_DETAIL_0" desc="Active Jobs card title, displayed on Cron Job details page.">アクティブなジョブ</translation>
<translation id="2080014846980293516" key="MSG_CRONJOB_DETAIL_DETAIL_1" desc="(no description provided)">現在この Cron ジョブ によって管理されているジョブはありません。</translation>
<translation id="4910697302285925429" key="MSG_CRONJOB_DETAIL_DETAIL_2" desc="Inactive Jobs card title, displayed on Cron Job details page.">Inactive Jobs</translation>
<translation id="5132781400764099616" key="MSG_CRONJOB_DETAIL_DETAIL_3" desc="(no description provided)">There are currently no inactive Jobs managed by this Cron Job.</translation>
<translation id="2068898769567977603" key="MSG_CRONJOB_DETAIL_INFO_0" desc="Cron Job\'s details card header.">詳細</translation>
<translation id="9026215886401416721" key="MSG_CRONJOB_DETAIL_INFO_1" desc="Cron Job\'s attribute label.">スケジュール</translation>
<translation id="6247369684436975092" key="MSG_CRONJOB_DETAIL_INFO_2" desc="Cron Job\'s attribute label.">アクティブ</translation>
Expand Down
2 changes: 2 additions & 0 deletions i18n/messages-ko.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@
<translation id="6219798353623882069" key="MSG_CRONJOB_DETAIL_ACTIONBAR_0" desc="Cron Job\'s resource kind name.">크론 잡</translation>
<translation id="5152871798838609000" key="MSG_CRONJOB_DETAIL_DETAIL_0" desc="Active Jobs card title, displayed on Cron Job details page.">액티브 잡</translation>
<translation id="2080014846980293516" key="MSG_CRONJOB_DETAIL_DETAIL_1" desc="(no description provided)">현재 이 크론 잡으로 관리되는 잡이 없습니다.</translation>
<translation id="4910697302285925429" key="MSG_CRONJOB_DETAIL_DETAIL_2" desc="Inactive Jobs card title, displayed on Cron Job details page.">Inactive Jobs</translation>
<translation id="5132781400764099616" key="MSG_CRONJOB_DETAIL_DETAIL_3" desc="(no description provided)">There are currently no inactive Jobs managed by this Cron Job.</translation>
<translation id="2068898769567977603" key="MSG_CRONJOB_DETAIL_INFO_0" desc="Cron Job\'s details card header.">상세</translation>
<translation id="9026215886401416721" key="MSG_CRONJOB_DETAIL_INFO_1" desc="Cron Job\'s attribute label.">스케줄</translation>
<translation id="6247369684436975092" key="MSG_CRONJOB_DETAIL_INFO_2" desc="Cron Job\'s attribute label.">Active</translation>
Expand Down
2 changes: 2 additions & 0 deletions i18n/messages-zh-tw.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@
<translation id="6219798353623882069" key="MSG_CRONJOB_DETAIL_ACTIONBAR_0" desc="Cron Job\'s resource kind name.">Cron Job</translation>
<translation id="5152871798838609000" key="MSG_CRONJOB_DETAIL_DETAIL_0" desc="Active Jobs card title, displayed on Cron Job details page.">活躍的 Jobs</translation>
<translation id="2080014846980293516" key="MSG_CRONJOB_DETAIL_DETAIL_1" desc="(no description provided)">目前這個 Cron Job 沒有 Job 正在執行</translation>
<translation id="4910697302285925429" key="MSG_CRONJOB_DETAIL_DETAIL_2" desc="Inactive Jobs card title, displayed on Cron Job details page.">Inactive Jobs</translation>
<translation id="5132781400764099616" key="MSG_CRONJOB_DETAIL_DETAIL_3" desc="(no description provided)">There are currently no inactive Jobs managed by this Cron Job.</translation>
<translation id="2068898769567977603" key="MSG_CRONJOB_DETAIL_INFO_0" desc="Cron Job\'s details card header.">詳細資訊</translation>
<translation id="9026215886401416721" key="MSG_CRONJOB_DETAIL_INFO_1" desc="Cron Job\'s attribute label.">排程</translation>
<translation id="6247369684436975092" key="MSG_CRONJOB_DETAIL_INFO_2" desc="Cron Job\'s attribute label.">活躍中</translation>
Expand Down
2 changes: 2 additions & 0 deletions i18n/messages-zh.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@
<translation id="6219798353623882069" key="MSG_CRONJOB_DETAIL_ACTIONBAR_0" desc="Cron Job\'s resource kind name.">定时任务</translation>
<translation id="5152871798838609000" key="MSG_CRONJOB_DETAIL_DETAIL_0" desc="Active Jobs card title, displayed on Cron Job details page.">活跃任务</translation>
<translation id="2080014846980293516" key="MSG_CRONJOB_DETAIL_DETAIL_1" desc="(no description provided)">此定时任务目前没有任务运行</translation>
<translation id="4910697302285925429" key="MSG_CRONJOB_DETAIL_DETAIL_2" desc="Inactive Jobs card title, displayed on Cron Job details page.">Inactive Jobs</translation>
<translation id="5132781400764099616" key="MSG_CRONJOB_DETAIL_DETAIL_3" desc="(no description provided)">There are currently no inactive Jobs managed by this Cron Job.</translation>
<translation id="2068898769567977603" key="MSG_CRONJOB_DETAIL_INFO_0" desc="Cron Job\'s details card header.">详情</translation>
<translation id="9026215886401416721" key="MSG_CRONJOB_DETAIL_INFO_1" desc="Cron Job\'s attribute label.">计划</translation>
<translation id="6247369684436975092" key="MSG_CRONJOB_DETAIL_INFO_2" desc="Cron Job\'s attribute label.">活跃中</translation>
Expand Down
6 changes: 3 additions & 3 deletions src/app/backend/client/verber_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ func (c *FakeRESTClient) Delete() *restclient.Request {
return c.response, c.err
}), "DELETE", nil, "/api/v1", restclient.ContentConfig{}, restclient.Serializers{
Encoder: codec,
}, nil, nil)
}, nil, nil, 0)
}

func (c *FakeRESTClient) Put() *restclient.Request {
return restclient.NewRequest(clientFunc(func(req *http.Request) (*http.Response, error) {
return c.response, c.err
}), "PUT", nil, "/api/v1", restclient.ContentConfig{}, restclient.Serializers{}, nil, nil)
}), "PUT", nil, "/api/v1", restclient.ContentConfig{}, restclient.Serializers{}, nil, nil, 0)
}

func (c *FakeRESTClient) Get() *restclient.Request {
return restclient.NewRequest(clientFunc(func(req *http.Request) (*http.Response, error) {
return c.response, c.err
}), "GET", nil, "/api/v1", restclient.ContentConfig{}, restclient.Serializers{}, nil, nil)
}), "GET", nil, "/api/v1", restclient.ContentConfig{}, restclient.Serializers{}, nil, nil, 0)
}

func TestDeleteShouldPropagateErrorsAndChoseClient(t *testing.T) {
Expand Down
12 changes: 0 additions & 12 deletions vendor/github.com/PuerkitoBio/purell/LICENSE
View file
Open in desktop

This file was deleted.

Loading