Merge pull request #37055 from mbohlool/dev

Automatic merge from submit-queue Add version to OpenAPI spec OpenAPI is missing a version string. It should follow kubernetes version. It is a bugfix that need to be cherrypicked in 1.5 too.

Merge pull request #37055 from mbohlool/dev
5b391ae2 · Kubernetes Submit Queue · GitHub · 5ab741de · 2c23c68e · 5b391ae2
Commit 5b391ae2 authored Jan 25, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 4 deletions

swagger.json api/openapi-spec/swagger.json +1 -1

swagger.json federation/apis/openapi-spec/swagger.json +1 -1

config.go pkg/genericapiserver/server/config.go +14 -2

No files found.
--- a/api/openapi-spec/swagger.json
+++ b/api/openapi-spec/swagger.json
@@ -2,7 +2,7 @@
  "swagger": "2.0",
  "info": {
   "title": "Kubernetes",
-   "version": "unversioned"
+   "version": "v1.6.0"
  },
  "paths": {
   "/api/": {
--- a/federation/apis/openapi-spec/swagger.json
+++ b/federation/apis/openapi-spec/swagger.json
@@ -2,7 +2,7 @@
  "swagger": "2.0",
  "info": {
   "title": "Generic API Server",
-   "version": "unversioned"
+   "version": "v1.6.0"
  },
  "paths": {
   "/api/": {

--- a/pkg/genericapiserver/server/config.go
+++ b/pkg/genericapiserver/server/config.go
@@ -219,8 +219,7 @@ func DefaultOpenAPIConfig(definitions *openapicommon.OpenAPIDefinitions) *openap
 		IgnorePrefixes: []string{"/swaggerapi"},
 		Info: &spec.Info{
 			InfoProps: spec.InfoProps{
-				Title:   "Generic API Server",
-				Version: "unversioned",
+				Title: "Generic API Server",
 			},
 		},
 		DefaultResponse: &spec.Response{
@@ -548,6 +547,19 @@ func (c completedConfig) New() (*GenericAPIServer, error) {

 	s.HandlerContainer = mux.NewAPIContainer(http.NewServeMux(), c.Serializer)

+	if s.openAPIConfig != nil {
+		if s.openAPIConfig.Info == nil {
+			s.openAPIConfig.Info = &spec.Info{}
+		}
+		if s.openAPIConfig.Info.Version == "" {
+			if c.Version != nil {
+				s.openAPIConfig.Info.Version = strings.Split(c.Version.String(), "-")[0]
+			} else {
+				s.openAPIConfig.Info.Version = "unversioned"
+			}
+		}
+	}
+
 	s.installAPI(c.Config)

 	s.Handler, s.InsecureHandler = c.BuildHandlerChainsFunc(s.HandlerContainer.ServeMux, c.Config)