Merge pull request #80123 from sttts/sttts-bump-kube-openapi2

Bump kube-openapi and structured-merge-diff

Kubernetes-commit: eee3a3749add92cd67b4c6f80567cd438a6c24e6
This commit is contained in:
Kubernetes Publisher
2019-07-16 17:37:12 -07:00
parent 5335398820
commit 38d625004d
3 changed files with 34 additions and 15 deletions
+8 -9
View File
@@ -5,10 +5,10 @@ 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-20190717022910-653c86b0609b
k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
k8s.io/client-go v0.0.0-20190717023132-0c47f9da0001
k8s.io/code-generator v0.0.0-20190717022600-77f3a1fe56bb
k8s.io/klog v0.3.1
)
@@ -19,9 +19,8 @@ replace (
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
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-20190717022910-653c86b0609b
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
k8s.io/client-go => k8s.io/client-go v0.0.0-20190717023132-0c47f9da0001
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190717022600-77f3a1fe56bb
)