From 03667fd6b18f174b14cf19e1a71e8cf494ecd919 Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Tue, 30 Jun 2020 00:03:16 -0700 Subject: [PATCH] Merge pull request #92544 from sttts/sttts-NewNonInteractiveDeferredLoadingClientConfig-NFE clientcmd: fix NPE in NewNonInteractiveDeferredLoadingClientConfig with nil overrides Kubernetes-commit: 8ce80c2292d938c8767459c7c40aeca91ed264a6 --- Godeps/Godeps.json | 4 ++-- go.mod | 8 ++++---- go.sum | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b6270bcf..ee05b90e 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -440,11 +440,11 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "f849118f70f6" + "Rev": "aaebd44608df" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "3b98a76529ae" + "Rev": "61490fe38e78" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 9b22ea11..3dfec5e2 100644 --- a/go.mod +++ b/go.mod @@ -26,14 +26,14 @@ require ( golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 golang.org/x/time v0.0.0-20191024005414-555d28b269f0 - k8s.io/api v0.0.0-20200626130448-f849118f70f6 - k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae + k8s.io/api v0.0.0-20200630090439-aaebd44608df + k8s.io/apimachinery v0.0.0-20200630050232-61490fe38e78 k8s.io/klog/v2 v2.1.0 k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 sigs.k8s.io/yaml v1.2.0 ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20200626130448-f849118f70f6 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae + k8s.io/api => k8s.io/api v0.0.0-20200630090439-aaebd44608df + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200630050232-61490fe38e78 ) diff --git a/go.sum b/go.sum index 2ad94f25..4be67d91 100644 --- a/go.sum +++ b/go.sum @@ -330,8 +330,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-20200626130448-f849118f70f6/go.mod h1:NKnRcQSY4TIqMb0OI3a9oDdDJflkQO6p9sY6iKIpvco= -k8s.io/apimachinery v0.0.0-20200626130251-3b98a76529ae/go.mod h1:m5QoVMHU94aieNFPfLqf7WmU8HLVLm3JasG64COkSXQ= +k8s.io/api v0.0.0-20200630090439-aaebd44608df/go.mod h1:cQk/DBCsCL81chJRAZjSBZ4suDeNugUZE3LqnYmbQ8Q= +k8s.io/apimachinery v0.0.0-20200630050232-61490fe38e78/go.mod h1:m5QoVMHU94aieNFPfLqf7WmU8HLVLm3JasG64COkSXQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=