Merge pull request #32258 from liggitt/ingress-prefix

Automatic merge from submit-queue

Pin ingresses etcd prefix for 1.3 compatibility

fixes https://github.com/kubernetes/kubernetes/issues/32255
This commit is contained in:
Kubernetes Submit Queue
2016-09-08 06:21:18 -07:00
committed by GitHub

View File

@@ -289,6 +289,7 @@ var specialDefaultResourcePrefixes = map[unversioned.GroupResource]string{
unversioned.GroupResource{Group: "", Resource: "endpoints"}: "services/endpoints",
unversioned.GroupResource{Group: "", Resource: "nodes"}: "minions",
unversioned.GroupResource{Group: "", Resource: "services"}: "services/specs",
unversioned.GroupResource{Group: "extensions", Resource: "ingresses"}: "ingress",
}
func (s *DefaultStorageFactory) ResourcePrefix(groupResource unversioned.GroupResource) string {