kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1497 from r2d4/tpr-patch-fix 

Fix patch for TPR panics in localkube
pull/1481/head
Matt Rickard 2017-05-15 20:39:08 -07:00 committed by GitHub
parent 4e23392c03 b02235c134
commit 1ba206f9b1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/tpr-patch.diff
View File

@ -2,7 +2,7 @@ diff --git a/vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.g
index f2e32c88c..f1c96c43d 100644 index f2e32c88c..f1c96c43d 100644
--- a/vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go --- a/vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go
+++ b/vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go +++ b/vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go
@@ -282,7 +282,11 @@ func (m *APIRegistrationManager) RESTMapper(versionPatterns ...schema.GroupVersi @@ -282,7 +282,12 @@ func (m *APIRegistrationManager) RESTMapper(versionPatterns ...schema.GroupVersi
for enabledVersion := range m.enabledVersions { for enabledVersion := range m.enabledVersions {
if !unionedGroups.Has(enabledVersion.Group) { if !unionedGroups.Has(enabledVersion.Group) {
unionedGroups.Insert(enabledVersion.Group) unionedGroups.Insert(enabledVersion.Group)
@ -11,6 +11,7 @@ index f2e32c88c..f1c96c43d 100644
+ // TODO(r2d4): hack until tprs are decoupled from restMapper + // TODO(r2d4): hack until tprs are decoupled from restMapper
+ if !found { + if !found {
+ glog.Warningf("Could not find groupMeta for %s", enabledVersion.Group) + glog.Warningf("Could not find groupMeta for %s", enabledVersion.Group)
+ continue
+ } + }
unionMapper = append(unionMapper, groupMeta.RESTMapper) unionMapper = append(unionMapper, groupMeta.RESTMapper)
} }

1
vendor/k8s.io/apimachinery/pkg/apimachinery/registered/registered.go generated vendored
View File

@ -286,6 +286,7 @@ func (m *APIRegistrationManager) RESTMapper(versionPatterns ...schema.GroupVersi
// TODO(r2d4): hack until tprs are decoupled from restMapper // TODO(r2d4): hack until tprs are decoupled from restMapper
if !found { if !found {
glog.Warningf("Could not find groupMeta for %s", enabledVersion.Group) glog.Warningf("Could not find groupMeta for %s", enabledVersion.Group)
continue
} }
unionMapper = append(unionMapper, groupMeta.RESTMapper) unionMapper = append(unionMapper, groupMeta.RESTMapper)
} }