diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 42a9d9a88..f33f7c71a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -336,7 +336,7 @@ }, { "ImportPath": "golang.org/x/crypto", - "Rev": "bac4c82f6975" + "Rev": "75b288015ac9" }, { "ImportPath": "golang.org/x/exp", @@ -360,7 +360,7 @@ }, { "ImportPath": "golang.org/x/net", - "Rev": "d3edc9973b7e" + "Rev": "ab3426394381" }, { "ImportPath": "golang.org/x/oauth2", @@ -440,11 +440,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0bfda2331c3c" + "Rev": "83df1b82c014" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "a6609cbba4fc" + "Rev": "7efdc26a675c" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 6091439f2..5c1027810 100644 --- a/go.mod +++ b/go.mod @@ -22,18 +22,18 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.4.0 - golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 - golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 + golang.org/x/net v0.0.0-20200707034311-ab3426394381 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - k8s.io/api v0.0.0-20200717102341-0bfda2331c3c - k8s.io/apimachinery v0.0.0-20200722125135-a6609cbba4fc + k8s.io/api v0.0.0-20200727091507-83df1b82c014 + k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c k8s.io/klog/v2 v2.2.0 k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20200717102341-0bfda2331c3c - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200722125135-a6609cbba4fc + k8s.io/api => k8s.io/api v0.0.0-20200727091507-83df1b82c014 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c ) diff --git a/go.sum b/go.sum index 722cad0af..a7e48cc19 100644 --- a/go.sum +++ b/go.sum @@ -180,8 +180,8 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 h1:/Tl7pH94bvbAAHBdZJT947M/+gp0+CqQXDtMRC0fseo= -golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -215,6 +215,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200707034311-ab3426394381 h1:VXak5I6aEWmAXeQjA+QSZzlgNrpq9mjcfDemuexIKsU= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -332,8 +334,8 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -k8s.io/api v0.0.0-20200717102341-0bfda2331c3c/go.mod h1:cxPAYAuEKCBUKMa/dalW3GjafStRSFWZWTXwOZgIXnk= -k8s.io/apimachinery v0.0.0-20200722125135-a6609cbba4fc/go.mod h1:eHbWZVMaaewmYBAUuRYnAmTTMtDhvpPNZuh8/6Yl7v0= +k8s.io/api v0.0.0-20200727091507-83df1b82c014/go.mod h1:6QwFoKNoXWMinlZZwHtDnpsr0l80pKtzo2w7kUsGqZE= +k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= diff --git a/plugin/pkg/client/auth/azure/azure_test.go b/plugin/pkg/client/auth/azure/azure_test.go index eb186d884..5f9aab769 100644 --- a/plugin/pkg/client/auth/azure/azure_test.go +++ b/plugin/pkg/client/auth/azure/azure_test.go @@ -185,7 +185,7 @@ func TestAzureTokenSource(t *testing.T) { expiresOn = "foo" ) cfg := map[string]string{ - cfgConfigMode: string(configMode), + cfgConfigMode: strconv.Itoa(int(configMode)), cfgApiserverID: serverID, cfgClientID: clientID, cfgTenantID: tenantID, @@ -365,7 +365,7 @@ func TestAzureTokenSourceScenarios(t *testing.T) { persister := newFakePersister() cfg := map[string]string{ - cfgConfigMode: string(configMode), + cfgConfigMode: strconv.Itoa(int(configMode)), } if tc.configToken != nil { cfg = token2Cfg(tc.configToken) diff --git a/tools/record/event_test.go b/tools/record/event_test.go index eadb1331c..67b033d5f 100644 --- a/tools/record/event_test.go +++ b/tools/record/event_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sruntime "k8s.io/apimachinery/pkg/runtime" @@ -509,7 +509,7 @@ func TestLotsOfEvents(t *testing.T) { APIVersion: "version", } // we need to vary the reason to prevent aggregation - go recorder.Eventf(ref, v1.EventTypeNormal, "Reason-"+string(i), strconv.Itoa(i)) + go recorder.Eventf(ref, v1.EventTypeNormal, "Reason-"+strconv.Itoa(i), strconv.Itoa(i)) } // Make sure no events were dropped by either of the listeners. for i := 0; i < maxQueuedEvents; i++ { diff --git a/tools/record/events_cache_test.go b/tools/record/events_cache_test.go index 8cb4a39e8..7eb4d34a9 100644 --- a/tools/record/events_cache_test.go +++ b/tools/record/events_cache_test.go @@ -18,6 +18,7 @@ package record import ( "reflect" + "strconv" "strings" "testing" "time" @@ -69,10 +70,10 @@ func makeUniqueEvents(num int) []v1.Event { events := []v1.Event{} kind := "Pod" for i := 0; i < num; i++ { - reason := strings.Join([]string{"reason", string(i)}, "-") - message := strings.Join([]string{"message", string(i)}, "-") - name := strings.Join([]string{"pod", string(i)}, "-") - namespace := strings.Join([]string{"ns", string(i)}, "-") + reason := strings.Join([]string{"reason", strconv.Itoa(i)}, "-") + message := strings.Join([]string{"message", strconv.Itoa(i)}, "-") + name := strings.Join([]string{"pod", strconv.Itoa(i)}, "-") + namespace := strings.Join([]string{"ns", strconv.Itoa(i)}, "-") involvedObject := makeObjectReference(kind, name, namespace) events = append(events, makeEvent(reason, message, involvedObject)) } @@ -82,7 +83,7 @@ func makeUniqueEvents(num int) []v1.Event { func makeSimilarEvents(num int, template v1.Event, messagePrefix string) []v1.Event { events := makeEvents(num, template) for i := range events { - events[i].Message = strings.Join([]string{messagePrefix, string(i), events[i].Message}, "-") + events[i].Message = strings.Join([]string{messagePrefix, strconv.Itoa(i), events[i].Message}, "-") } return events }