Commit 00005f4d authored by Brian Grant's avatar Brian Grant

Merge pull request #9088 from caesarxuchao/add-v1-swagger

add v1 swagger-spec; update existing swagger-spec
parents 3f07503c 66e4f7b0
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
"description": "API at /api/v1beta3 version v1beta3" "description": "API at /api/v1beta3 version v1beta3"
}, },
{ {
"path": "/api/v1",
"description": "API at /api/v1 version v1"
},
{
"path": "/api", "path": "/api",
"description": "get available API versions" "description": "get available API versions"
}, },
...@@ -19,4 +23,4 @@ ...@@ -19,4 +23,4 @@
"title": "", "title": "",
"description": "" "description": ""
} }
} }
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -11685,10 +11685,6 @@ ...@@ -11685,10 +11685,6 @@
"type": "any", "type": "any",
"description": "label keys and values that must match in order to be controlled by this replication controller, if empty defaulted to labels on Pod template" "description": "label keys and values that must match in order to be controlled by this replication controller, if empty defaulted to labels on Pod template"
}, },
"templateRef": {
"$ref": "v1beta3.ObjectReference",
"description": "reference to an object that describes the pod that will be created if insufficient replicas are detected"
},
"template": { "template": {
"$ref": "v1beta3.PodTemplateSpec", "$ref": "v1beta3.PodTemplateSpec",
"description": "object that describes the pod that will be created if insufficient replicas are detected; takes precendence over templateRef" "description": "object that describes the pod that will be created if insufficient replicas are detected; takes precendence over templateRef"
......
...@@ -53,6 +53,7 @@ kube::log::status "Starting kube-apiserver" ...@@ -53,6 +53,7 @@ kube::log::status "Starting kube-apiserver"
--etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \ --etcd_servers="http://${ETCD_HOST}:${ETCD_PORT}" \
--public_address_override="127.0.0.1" \ --public_address_override="127.0.0.1" \
--kubelet_port=${KUBELET_PORT} \ --kubelet_port=${KUBELET_PORT} \
--runtime_config=api/v1 \
--runtime_config=api/legacy=false \ --runtime_config=api/legacy=false \
--service-cluster-ip-range="10.0.0.0/24" 1>&2 & --service-cluster-ip-range="10.0.0.0/24" 1>&2 &
APISERVER_PID=$! APISERVER_PID=$!
...@@ -65,5 +66,6 @@ curl ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json ...@@ -65,5 +66,6 @@ curl ${SWAGGER_API_PATH} > ${SWAGGER_ROOT_DIR}/resourceListing.json
curl ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json curl ${SWAGGER_API_PATH}version > ${SWAGGER_ROOT_DIR}/version.json
curl ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json curl ${SWAGGER_API_PATH}api > ${SWAGGER_ROOT_DIR}/api.json
curl ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json curl ${SWAGGER_API_PATH}api/v1beta3 > ${SWAGGER_ROOT_DIR}/v1beta3.json
curl ${SWAGGER_API_PATH}api/v1 > ${SWAGGER_ROOT_DIR}/v1.json
kube::log::status "SUCCESS" kube::log::status "SUCCESS"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment