From 7612bded3e02f0b3548468211d84dda07d1a8b9c Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Mon, 2 Nov 2015 14:18:57 -0800 Subject: [PATCH 1/2] Removing an erroneous / --- pkg/master/master.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/master/master.go b/pkg/master/master.go index a04ca42750d9..5367e4d25304 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -672,7 +672,7 @@ func (m *Master) init(c *Config) { Versions: expAPIVersions, PreferredVersion: unversioned.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)}, } - apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").Group+"/", group) + apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").Group, group) allGroups = append(allGroups, group) apiserver.InstallServiceErrorHandler(m.handlerContainer, m.newRequestInfoResolver(), []string{expVersion.Version}) } From 326d333777c381cd2355df52fc09e1f33409396c Mon Sep 17 00:00:00 2001 From: nikhiljindal Date: Mon, 2 Nov 2015 14:28:39 -0800 Subject: [PATCH 2/2] Fixing and running update-swagger-spec --- api/swagger-spec/apis.json | 28 +++++++++++++++++++++++++ api/swagger-spec/extensions.json | 28 +++++++++++++++++++++++++ api/swagger-spec/resourceListing.json | 2 +- hack/after-build/update-swagger-spec.sh | 2 ++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 api/swagger-spec/apis.json create mode 100644 api/swagger-spec/extensions.json diff --git a/api/swagger-spec/apis.json b/api/swagger-spec/apis.json new file mode 100644 index 000000000000..0602e2207586 --- /dev/null +++ b/api/swagger-spec/apis.json @@ -0,0 +1,28 @@ +{ + "swaggerVersion": "1.2", + "apiVersion": "", + "basePath": "https://10.10.10.10:6443", + "resourcePath": "/apis", + "apis": [ + { + "path": "/apis", + "description": "get available API versions", + "operations": [ + { + "type": "void", + "method": "GET", + "summary": "get available API versions", + "nickname": "getAPIVersions", + "parameters": [], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ] + } + ] + } + ], + "models": {} + } \ No newline at end of file diff --git a/api/swagger-spec/extensions.json b/api/swagger-spec/extensions.json new file mode 100644 index 000000000000..3b4acb17fbf2 --- /dev/null +++ b/api/swagger-spec/extensions.json @@ -0,0 +1,28 @@ +{ + "swaggerVersion": "1.2", + "apiVersion": "", + "basePath": "https://10.10.10.10:6443", + "resourcePath": "/apis/extensions", + "apis": [ + { + "path": "/apis/extensions", + "description": "get information of a group", + "operations": [ + { + "type": "void", + "method": "GET", + "summary": "get information of a group", + "nickname": "getAPIGroup", + "parameters": [], + "produces": [ + "application/json" + ], + "consumes": [ + "application/json" + ] + } + ] + } + ], + "models": {} + } \ No newline at end of file diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json index eb095d2f7f9b..abf8cddff975 100644 --- a/api/swagger-spec/resourceListing.json +++ b/api/swagger-spec/resourceListing.json @@ -14,7 +14,7 @@ "description": "API at /apis/extensions/v1beta1" }, { - "path": "/apis/extensions/", + "path": "/apis/extensions", "description": "get information of a group" }, { diff --git a/hack/after-build/update-swagger-spec.sh b/hack/after-build/update-swagger-spec.sh index 4af77fe00d91..0ead5b4af370 100755 --- a/hack/after-build/update-swagger-spec.sh +++ b/hack/after-build/update-swagger-spec.sh @@ -69,6 +69,8 @@ curl -fs ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json curl -fs ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json curl -fs ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json curl -fs ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json +curl -fs ${SWAGGER_API_PATH}apis > ${SWAGGER_ROOT_DIR}/apis.json +curl -fs ${SWAGGER_API_PATH}apis/extensions > ${SWAGGER_ROOT_DIR}/extensions.json curl -fs ${SWAGGER_API_PATH}apis/extensions/v1beta1 > ${SWAGGER_ROOT_DIR}/v1beta1.json kube::log::status "SUCCESS"