Merge pull request #40829 from mbohlool/separation

Automatic merge from submit-queue Move post processing/backward compatibility of openapi out of generic package Post processing step was put into generic package and was the same for both k8s api server and federation api server. They have different backward compatibility list of types. This PR move that step out of generic package and put it in each server's file.

Merge pull request #40829 from mbohlool/separation
0e5cda98 · Kubernetes Submit Queue · GitHub · 4a4678aa · 7c4faba1 · 0e5cda98
Commit 0e5cda98 authored Feb 02, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2017
8 changed files
--- a/cmd/kube-apiserver/app/BUILD
+++ b/cmd/kube-apiserver/app/BUILD
@@ -54,10 +54,12 @@ go_library(
        "//plugin/pkg/admission/securitycontext/scdeny:go_default_library",
        "//plugin/pkg/admission/serviceaccount:go_default_library",
        "//plugin/pkg/admission/storageclass/default:go_default_library",
+        "//vendor:github.com/go-openapi/spec",
        "//vendor:github.com/golang/glog",
        "//vendor:github.com/pborman/uuid",
        "//vendor:github.com/spf13/cobra",
        "//vendor:github.com/spf13/pflag",
+        "//vendor:k8s.io/apimachinery/pkg/openapi",
        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
        "//vendor:k8s.io/apimachinery/pkg/util/errors",
        "//vendor:k8s.io/apimachinery/pkg/util/net",

--- a/cmd/kube-apiserver/app/server.go
+++ b/cmd/kube-apiserver/app/server.go
--- a/federation/apis/openapi-spec/swagger.json
+++ b/federation/apis/openapi-spec/swagger.json
--- a/federation/cmd/federation-apiserver/app/BUILD
+++ b/federation/cmd/federation-apiserver/app/BUILD
@@ -63,10 +63,12 @@ go_library(
        "//plugin/pkg/admission/deny:go_default_library",
        "//plugin/pkg/admission/gc:go_default_library",
        "//plugin/pkg/admission/namespace/lifecycle:go_default_library",
+        "//vendor:github.com/go-openapi/spec",
        "//vendor:github.com/golang/glog",
        "//vendor:github.com/pborman/uuid",
        "//vendor:github.com/spf13/cobra",
        "//vendor:github.com/spf13/pflag",
+        "//vendor:k8s.io/apimachinery/pkg/openapi",
        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
        "//vendor:k8s.io/apimachinery/pkg/util/errors",
        "//vendor:k8s.io/apimachinery/pkg/util/sets",

--- a/federation/cmd/federation-apiserver/app/server.go
+++ b/federation/cmd/federation-apiserver/app/server.go
--- a/pkg/genericapiserver/endpoints/openapi/BUILD
+++ b/pkg/genericapiserver/endpoints/openapi/BUILD
@@ -16,7 +16,6 @@ go_library(
        "//vendor:github.com/emicklei/go-restful",
        "//vendor:github.com/go-openapi/spec",
        "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
-        "//vendor:k8s.io/apimachinery/pkg/openapi",
        "//vendor:k8s.io/apimachinery/pkg/runtime",
        "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
        "//vendor:k8s.io/apiserver/pkg/util/trie",

--- a/pkg/genericapiserver/endpoints/openapi/openapi.go
+++ b/pkg/genericapiserver/endpoints/openapi/openapi.go
--- a/pkg/genericapiserver/server/config.go
+++ b/pkg/genericapiserver/server/config.go
@@ -231,7 +231,6 @@ func DefaultOpenAPIConfig(getDefinitions openapicommon.GetOpenAPIDefinitions) *o
 		GetOperationIDAndTags: apiopenapi.GetOperationIDAndTags,
 		GetDefinitionName:     defNamer.GetDefinitionName,
 		GetDefinitions:        getDefinitions,
-		PostProcessSpec:       apiopenapi.PostProcessSpec,
 	}
 }