From af5860b8151fbda150b7907dd9f5e9eae55542e6 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Wed, 19 May 2021 08:48:51 -0700 Subject: [PATCH] Merge pull request #102111 from dims/update-testing-related-deps-for-1.22 Update testing related dependencies (ginkgo|gomega|testify) Kubernetes-commit: bacab40a9f9380e968406e91483bdc81f1b41bb0 --- Godeps/Godeps.json | 20 ++++++++++++-------- go.mod | 17 ++++++++--------- go.sum | 8 ++++++++ 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index afc4227c..68341e14 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -140,7 +140,7 @@ }, { "ImportPath": "github.com/fsnotify/fsnotify", - "Rev": "v1.4.7" + "Rev": "v1.4.9" }, { "ImportPath": "github.com/go-gl/glfw", @@ -306,13 +306,17 @@ "ImportPath": "github.com/niemeyer/pretty", "Rev": "a10e7caefd8e" }, + { + "ImportPath": "github.com/nxadm/tail", + "Rev": "v1.4.4" + }, { "ImportPath": "github.com/onsi/ginkgo", - "Rev": "v1.11.0" + "Rev": "v1.14.0" }, { "ImportPath": "github.com/onsi/gomega", - "Rev": "v1.7.0" + "Rev": "v1.10.1" }, { "ImportPath": "github.com/peterbourgon/diskv", @@ -352,7 +356,7 @@ }, { "ImportPath": "github.com/stretchr/testify", - "Rev": "v1.6.1" + "Rev": "v1.7.0" }, { "ImportPath": "github.com/yuin/goldmark", @@ -476,19 +480,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "bb4775a810cf" + "Rev": "d5fda5562a2e" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "2540c63454fb" + "Rev": "c7322e849168" }, { "ImportPath": "k8s.io/client-go", - "Rev": "03f765c56af0" + "Rev": "b0c8a7cef141" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "994995d2440d" + "Rev": "deed3360ef40" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index ecac9372..b00e7c77 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,16 @@ module k8s.io/sample-controller go 1.16 require ( - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go v0.0.0 - k8s.io/code-generator v0.0.0 + k8s.io/api v0.0.0-20210519190848-d5fda5562a2e + k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168 + k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141 + k8s.io/code-generator v0.0.0-20210519190450-deed3360ef40 k8s.io/klog/v2 v2.8.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/client-go => ../client-go - k8s.io/code-generator => ../code-generator - k8s.io/sample-controller => ../sample-controller + k8s.io/api => k8s.io/api v0.0.0-20210519190848-d5fda5562a2e + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210519190450-deed3360ef40 ) diff --git a/go.sum b/go.sum index 5943fa21..e0f84027 100644 --- a/go.sum +++ b/go.sum @@ -438,6 +438,14 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh 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= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +k8s.io/api v0.0.0-20210519190848-d5fda5562a2e h1:NqV6nJIdQDUI6QvFuT+QDcc2s3kcWYUecGbTc74Y4GU= +k8s.io/api v0.0.0-20210519190848-d5fda5562a2e/go.mod h1:pYZcnMa1kuzJ76ydALsvcwPMSsRcNNkhMonm1K/9Umo= +k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168 h1:mkBvQhy9WPz7t0Y3Muea1rVq2TRB91wvC8iE8xpbfl4= +k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168/go.mod h1:4rwBOLnlX0KG0S4eNjF9Aw8Y92JlZQe1fX+e7TeGWQE= +k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141 h1:5BYLcOnAmuK8uH77cStSu8prBPQ1B3e8j9Sr9P3R2rQ= +k8s.io/client-go v0.0.0-20210519191142-b0c8a7cef141/go.mod h1:ivtaxlOm0rw7eIAy6tUle/YMhQS+k4qdRVfmUtc5ccM= +k8s.io/code-generator v0.0.0-20210519190450-deed3360ef40 h1:4zVT5aPoB+eSOADQVXb+WGDu+9VbzV2jhSMZAn/W0YU= +k8s.io/code-generator v0.0.0-20210519190450-deed3360ef40/go.mod h1:urDPNwb6GPjvEZfcO5Gtfz/W7yVqc4s4lgZbxuPCiJw= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=