Update apiserver for 1.10

Gopkg.toml

@@ -11,6 +11,8 @@ required = [
 
   # Needed for docs generation
   "k8s.io/code-generator/cmd/openapi-gen",
+  "github.com/kubernetes-incubator/apiserver-builder/cmd/apiserver-boot",
+  "github.com/kubernetes-incubator/reference-docs/gen-apidocs",
 ]
 
 [prune]
@@ -66,6 +68,14 @@ required = [
   name = "k8s.io/kubernetes"
   version = "v1.10.1"
 
+# Needed for docs generation
+[[override]]
+  name = "github.com/kubernetes-incubator/apiserver-builder"
+  revision = "e809ac2f9f0c238f08d08a876f8b3f499604f941"
+[[override]]
+  name = "github.com/kubernetes-incubator/reference-docs"
+  revision = "8fadf91876ccbcfec367b434706a3c449073b0b4"
+
 
 # These come from godeps.json in kubernetes
 [[override]]

pkg/apiserver/apiserver.go

@@ -114,17 +114,34 @@ func (c completedConfig) New() (*KopsServer, error) {
 	apiGroupInfo := server.NewDefaultAPIGroupInfo(kops.GroupName, registry, Scheme, metav1.ParameterCodec, Codecs)
 
 	apiGroupInfo.GroupMeta.GroupVersion = v1alpha2.SchemeGroupVersion
-	v1alpha2storage := map[string]rest.Storage{}
-	v1alpha2storage["clusters"], err = registrycluster.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
-	if err != nil {
-		return nil, fmt.Errorf("error initializing clusters: %v", err)
-	}
-	//v1alpha2storage["clusters/full"] = registrycluster.NewREST(c.RESTOptionsGetter)
-	v1alpha2storage["instancegroups"], err = registryinstancegroup.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
-	if err != nil {
-		return nil, fmt.Errorf("error initializing instancegroups: %v", err)
+
+	// {
+	// 	v1alpha1storage := map[string]rest.Storage{}
+	// 	v1alpha1storage["clusters"], err = registrycluster.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
+	// 	if err != nil {
+	// 		return nil, fmt.Errorf("error initializing clusters: %v", err)
+	// 	}
+	// 	//v1alpha2stv1alpha1storageorage["clusters/full"] = registrycluster.NewREST(c.RESTOptionsGetter)
+	// 	v1alpha1storage["instancegroups"], err = registryinstancegroup.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
+	// 	if err != nil {
+	// 		return nil, fmt.Errorf("error initializing instancegroups: %v", err)
+	// 	}
+	// 	apiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = v1alpha1storage
+	// }
+
+	{
+		v1alpha2storage := map[string]rest.Storage{}
+		v1alpha2storage["clusters"], err = registrycluster.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
+		if err != nil {
+			return nil, fmt.Errorf("error initializing clusters: %v", err)
+		}
+		//v1alpha2storage["clusters/full"] = registrycluster.NewREST(c.RESTOptionsGetter)
+		v1alpha2storage["instancegroups"], err = registryinstancegroup.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter)
+		if err != nil {
+			return nil, fmt.Errorf("error initializing instancegroups: %v", err)
+		}
+		apiGroupInfo.VersionedResourcesStorageMap["v1alpha2"] = v1alpha2storage
 	}
-	apiGroupInfo.VersionedResourcesStorageMap["v1alpha2"] = v1alpha2storage
 
 	if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil {
 		return nil, err