From b8d9e8c247129e53962d0dcfc08a4e8b47477318 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Fri, 12 Mar 2021 18:01:15 -0800 Subject: [PATCH] Merge pull request #100156 from ehashman/issue-100155 Upgrade klog to avoid panics crashing components Kubernetes-commit: 998f218606a149048e7b564ef27478bacab0f90f --- Godeps/Godeps.json | 10 +++++----- go.mod | 17 ++++++++--------- go.sum | 4 ++++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index a16f54b4..3b554282 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -476,19 +476,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "937dc44c61ed" + "Rev": "51a1c5553d68" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "ae8b5f5092d3" + "Rev": "57f2a0733447" }, { "ImportPath": "k8s.io/client-go", - "Rev": "a5722b416f4b" + "Rev": "f6ce18ae578c" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "e0b5c433e941" + "Rev": "5bc604e30f37" }, { "ImportPath": "k8s.io/gengo", @@ -496,7 +496,7 @@ }, { "ImportPath": "k8s.io/klog/v2", - "Rev": "v2.5.0" + "Rev": "v2.8.0" }, { "ImportPath": "k8s.io/kube-openapi", diff --git a/go.mod b/go.mod index ecac9372..bff349eb 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-20210313025757-51a1c5553d68 + k8s.io/apimachinery v0.0.0-20210313025227-57f2a0733447 + k8s.io/client-go v0.0.0-20210313030403-f6ce18ae578c + k8s.io/code-generator v0.0.0-20210313024825-5bc604e30f37 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-20210313025757-51a1c5553d68 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210313025227-57f2a0733447 + k8s.io/client-go => k8s.io/client-go v0.0.0-20210313030403-f6ce18ae578c + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210313024825-5bc604e30f37 ) diff --git a/go.sum b/go.sum index 57da6b9c..7e4826ca 100644 --- a/go.sum +++ b/go.sum @@ -435,6 +435,10 @@ 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-20210313025757-51a1c5553d68/go.mod h1:7Byi1J8zhqxObDDyvyvJdvEZioXQZDTsNqSFMk4JMMM= +k8s.io/apimachinery v0.0.0-20210313025227-57f2a0733447/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= +k8s.io/client-go v0.0.0-20210313030403-f6ce18ae578c/go.mod h1:4u6PvPJOUogAjcm6A0yv7SXKhoR4NQafsc4RuKbouZk= +k8s.io/code-generator v0.0.0-20210313024825-5bc604e30f37/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= 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=