Merge pull request #25731 from Pensu/master

api/swagger-spec/version.json

@@ -9,7 +9,7 @@
     "description": "git code version from which this is built",
     "operations": [
      {
-      "type": "void",
+      "type": "version.Info",
       "method": "GET",
       "summary": "get the code version",
       "nickname": "getCodeVersion",
@@ -24,5 +24,49 @@
     ]
    }
   ],
-  "models": {}
+  "models": {
+   "version.Info": {
+    "id": "version.Info",
+    "required": [
+     "major",
+     "minor",
+     "gitVersion",
+     "gitCommit",
+     "gitTreeState",
+     "buildDate",
+     "goVersion",
+     "compiler",
+     "platform"
+    ],
+    "properties": {
+     "major": {
+      "type": "string"
+     },
+     "minor": {
+      "type": "string"
+     },
+     "gitVersion": {
+      "type": "string"
+     },
+     "gitCommit": {
+      "type": "string"
+     },
+     "gitTreeState": {
+      "type": "string"
+     },
+     "buildDate": {
+      "type": "string"
+     },
+     "goVersion": {
+      "type": "string"
+     },
+     "compiler": {
+      "type": "string"
+     },
+     "platform": {
+      "type": "string"
+     }
+    }
+   }
+  }
  }

pkg/apiserver/apiserver.go

@@ -176,7 +176,8 @@ func InstallVersionHandler(mux Mux, container *restful.Container) {
 			Doc("get the code version").
 			Operation("getCodeVersion").
 			Produces(restful.MIME_JSON).
-			Consumes(restful.MIME_JSON))
+			Consumes(restful.MIME_JSON).
+			Writes(version.Info{}))
 
 	container.Add(versionWS)
 }