From 242ed50474b17e9c209c32dea393d1ca8c8e7554 Mon Sep 17 00:00:00 2001
From: deads2k <deads@redhat.com>
Date: Fri, 9 Sep 2016 13:51:21 -0400
Subject: [PATCH] filter enabled versions by enablement

---
 pkg/apimachinery/registered/registered.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkg/apimachinery/registered/registered.go b/pkg/apimachinery/registered/registered.go
index 16923a36d37..3d3a5c8ff8f 100644
--- a/pkg/apimachinery/registered/registered.go
+++ b/pkg/apimachinery/registered/registered.go
@@ -173,7 +173,11 @@ func (m *APIRegistrationManager) IsEnabledVersion(v unversioned.GroupVersion) bo
 func (m *APIRegistrationManager) EnabledVersions() []unversioned.GroupVersion {
 	ret := []unversioned.GroupVersion{}
 	for _, groupMeta := range m.groupMetaMap {
-		ret = append(ret, groupMeta.GroupVersions...)
+		for _, version := range groupMeta.GroupVersions {
+			if m.IsEnabledVersion(version) {
+				ret = append(ret, version)
+			}
+		}
 	}
 	return ret
 }
@@ -185,7 +189,13 @@ func (m *APIRegistrationManager) EnabledVersionsForGroup(group string) []unversi
 		return []unversioned.GroupVersion{}
 	}
 
-	return append([]unversioned.GroupVersion{}, groupMeta.GroupVersions...)
+	ret := []unversioned.GroupVersion{}
+	for _, version := range groupMeta.GroupVersions {
+		if m.IsEnabledVersion(version) {
+			ret = append(ret, version)
+		}
+	}
+	return ret
 }
 
 // Group returns the metadata of a group if the group is registered, otherwise