Merge pull request #100514 from joelsmith/release-1.18

[1.18] Cherry pick of #98477: update gogo/protobuf to v1.3.2

Kubernetes-commit: 55c7f26659b8cf4ce1a424a4619197c2499e2247
This commit is contained in:
Kubernetes Publisher
2021-03-29 20:22:31 +00:00
parent f3099dcb98
commit 4a746fece9
3 changed files with 18 additions and 15 deletions
+8 -9
View File
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.13
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-20210329192540-b13e135d81e8
k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33
k8s.io/client-go v0.0.0-20210329193311-08715c7129b4
k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5
k8s.io/klog v1.0.0
)
@@ -16,9 +16,8 @@ replace (
golang.org/x/crypto => golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/text => golang.org/x/text v0.3.2
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-20210329192540-b13e135d81e8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210329191935-937f6a48eb33
k8s.io/client-go => k8s.io/client-go v0.0.0-20210329193311-08715c7129b4
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210329191452-2558db0b36b5
)