From a534990da7b6767c5eb17846f5ea7320f742ee02 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:50:38 -0800
Subject: [PATCH] Merge pull request #88411 from
liggitt/automated-cherry-pick-of-#88381-upstream-release-1.17
Automated cherry pick of #88381: update golang.org/x/crypto
Kubernetes-commit: 23eb2180c65472f5c25fdec551b594f0b2db427d
---
Godeps/Godeps.json | 4 ++--
go.mod | 17 ++++++++---------
go.sum | 4 ++++
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e10e426d..568c58d2 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -272,7 +272,7 @@
},
{
"ImportPath": "golang.org/x/crypto",
- "Rev": "60c769a6c586"
+ "Rev": "bac4c82f6975"
},
{
"ImportPath": "golang.org/x/exp",
@@ -380,7 +380,7 @@
},
{
"ImportPath": "k8s.io/client-go",
- "Rev": "0cdd283dfd7a"
+ "Rev": "2a689211e542"
},
{
"ImportPath": "k8s.io/code-generator",
diff --git a/go.mod b/go.mod
index f5594471..2dea8c28 100644
--- a/go.mod
+++ b/go.mod
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
go 1.12
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-20200131193051-d9adff57e763
+ k8s.io/apimachinery v0.0.0-20200131192631-731dcecc2054
+ k8s.io/client-go v0.0.0-20200228082956-2a689211e542
+ k8s.io/code-generator v0.0.0-20200131192142-4ae19cfe9b46
k8s.io/klog v1.0.0
)
replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
- 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-20200131193051-d9adff57e763
+ k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131192631-731dcecc2054
+ k8s.io/client-go => k8s.io/client-go v0.0.0-20200228082956-2a689211e542
+ k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200131192142-4ae19cfe9b46
)
diff --git a/go.sum b/go.sum
index 88870fae..fa6575fc 100644
--- a/go.sum
+++ b/go.sum
@@ -220,6 +220,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/api v0.0.0-20200131193051-d9adff57e763/go.mod h1:cAXok2H0KIzuH1pNDM7ILEuVowKuvJuRkbYH6v0rg2s=
+k8s.io/apimachinery v0.0.0-20200131192631-731dcecc2054/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
+k8s.io/client-go v0.0.0-20200228082956-2a689211e542/go.mod h1:FNi/6m1bffmmFyPGQpWjHt5vYBTjCqdum2D+yzUr93s=
+k8s.io/code-generator v0.0.0-20200131192142-4ae19cfe9b46/go.mod h1:l8BLVwASXQZTo2xamW5mQNFCe1XPiAesVq7Y1t7PiQQ=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=