From 3beea3b660ddbf8e93cb8d1da4670d4b0e44741d Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Tue, 3 Mar 2015 21:12:50 -0500
Subject: [PATCH] Skip types that are not registered on an API version

---
 pkg/apiserver/api_installer.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go
index 9ccb315aa54..db4ef1adba7 100644
--- a/pkg/apiserver/api_installer.go
+++ b/pkg/apiserver/api_installer.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
 
 	"github.com/emicklei/go-restful"
@@ -106,6 +107,9 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage RESTStorage
 		return err
 	}
 	versionedPtr, err := api.Scheme.New(a.version, kind)
+	if conversion.IsNotRegisteredError(err) {
+		return nil
+	}
 	if err != nil {
 		return err
 	}