From 3970dc451e9a6872e8912fae0b36ace1bbc0d89e Mon Sep 17 00:00:00 2001 From: Kubernetes Publisher Date: Mon, 6 Jul 2020 09:52:52 -0700 Subject: [PATCH] Merge pull request #92786 from answer1991/feature/enhance-bootstrap-certificate make Kubelet bootstrap certificate signal aware Kubernetes-commit: a26e5881d8aa38aaa0a56c78050fd4ea14611c9f --- Godeps/Godeps.json | 6 +++--- go.mod | 12 ++++++------ go.sum | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index e57f51905..5a8237426 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -668,7 +668,7 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "34238374cd52" + "Rev": "6943fd7f818f" }, { "ImportPath": "k8s.io/apimachinery", @@ -676,11 +676,11 @@ }, { "ImportPath": "k8s.io/client-go", - "Rev": "ae79ca62dbf0" + "Rev": "1e6150831a96" }, { "ImportPath": "k8s.io/component-base", - "Rev": "df61fd08516e" + "Rev": "b3613baa4e60" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index 5d90a46b8..7c051abc8 100644 --- a/go.mod +++ b/go.mod @@ -41,10 +41,10 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.8 - k8s.io/api v0.0.0-20200702090436-34238374cd52 + k8s.io/api v0.0.0-20200706140252-6943fd7f818f k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2 - k8s.io/client-go v0.0.0-20200702090712-ae79ca62dbf0 - k8s.io/component-base v0.0.0-20200702091254-df61fd08516e + k8s.io/client-go v0.0.0-20200703120315-1e6150831a96 + k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60 k8s.io/klog/v2 v2.2.0 k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9 k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19 @@ -54,8 +54,8 @@ require ( ) replace ( - k8s.io/api => k8s.io/api v0.0.0-20200702090436-34238374cd52 + k8s.io/api => k8s.io/api v0.0.0-20200706140252-6943fd7f818f k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2 - k8s.io/client-go => k8s.io/client-go v0.0.0-20200702090712-ae79ca62dbf0 - k8s.io/component-base => k8s.io/component-base v0.0.0-20200702091254-df61fd08516e + k8s.io/client-go => k8s.io/client-go v0.0.0-20200703120315-1e6150831a96 + k8s.io/component-base => k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60 ) diff --git a/go.sum b/go.sum index a0cd7cf0e..0d8bc9077 100644 --- a/go.sum +++ b/go.sum @@ -508,10 +508,10 @@ 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-20200702090436-34238374cd52/go.mod h1:PFJ2b4cud2iXU+DzN8Tf+HsJsN2KKcJUfbMmckp2bhI= +k8s.io/api v0.0.0-20200706140252-6943fd7f818f/go.mod h1:PFJ2b4cud2iXU+DzN8Tf+HsJsN2KKcJUfbMmckp2bhI= k8s.io/apimachinery v0.0.0-20200702090251-3c2682fedbf2/go.mod h1:87+lSRzC+mGLZTTwIcPY67sorIVlqPhdNrvsToaUUns= -k8s.io/client-go v0.0.0-20200702090712-ae79ca62dbf0/go.mod h1:FOr+6mK5IOJNdqcwn6f5OX41VN/TjEojjQBPz3HonwQ= -k8s.io/component-base v0.0.0-20200702091254-df61fd08516e/go.mod h1:A8//EOJst1cT38h2/Xp3XNcXMevkmQZmnxWRCJIfgOQ= +k8s.io/client-go v0.0.0-20200703120315-1e6150831a96/go.mod h1:TlvCDNHtv58YP5GaIXe4USyRFvfXxi99PNTzT0JkNe0= +k8s.io/component-base v0.0.0-20200702170821-b3613baa4e60/go.mod h1:lJJT3Us7yQo3JPMkF7G18sl3dWSHe6wrtFgrzX/7ucQ= 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=