From 2ae662a69743d1080eeb14f65bfd44604f3b99b2 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 | 8 ++++---- go.mod | 13 ++++++------- go.sum | 3 +++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 05dd3fe0..ddb8c1fa 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -956,15 +956,15 @@ }, { "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/gengo", @@ -972,7 +972,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 59bfb79e..00994f7d 100644 --- a/go.mod +++ b/go.mod @@ -15,17 +15,16 @@ require ( github.com/stretchr/testify v1.6.1 golang.org/x/text v0.3.4 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.0.0 - k8s.io/apimachinery v0.0.0 - k8s.io/client-go 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/kube-openapi v0.0.0-20210305001622-591a79e4bda7 sigs.k8s.io/kustomize/api v0.8.5 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => ../api - k8s.io/apimachinery => ../apimachinery - k8s.io/cli-runtime => ../cli-runtime - k8s.io/client-go => ../client-go + 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 ) diff --git a/go.sum b/go.sum index 6510ab77..1a7b25e7 100644 --- a/go.sum +++ b/go.sum @@ -642,6 +642,9 @@ 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/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.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts=