github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

fix groups exposes at apis/

Browse Source
This commit is contained in:
Chao Xu 2015-09-28 11:08:47 -07:00
parent f8a9943d90
commit 4927cec3be
6 changed files with 170 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/swagger-spec/resourceListing.json
View File

@ -3,7 +3,7 @@
"apis": [ "apis": [
{ {
"path": "/api/v1", "path": "/api/v1",
"description": "API at /api/v1 version v1" "description": "API at /api/v1"
}, },
{ {
"path": "/api", "path": "/api",

206
api/swagger-spec/v1.json
View File

@ -6,7 +6,7 @@
"apis": [ "apis": [
{ {
"path": "/api/v1/namespaces/{namespace}/bindings", "path": "/api/v1/namespaces/{namespace}/bindings",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Binding", "type": "v1.Binding",
@ -57,7 +57,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/componentstatuses", "path": "/api/v1/namespaces/{namespace}/componentstatuses",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ComponentStatusList", "type": "v1.ComponentStatusList",
@ -132,7 +132,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/componentstatuses/{name}", "path": "/api/v1/namespaces/{namespace}/componentstatuses/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ComponentStatus", "type": "v1.ComponentStatus",
@ -183,7 +183,7 @@
}, },
{ {
"path": "/api/v1/componentstatuses", "path": "/api/v1/componentstatuses",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ComponentStatusList", "type": "v1.ComponentStatusList",
@ -250,7 +250,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/endpoints", "path": "/api/v1/namespaces/{namespace}/endpoints",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.EndpointsList", "type": "v1.EndpointsList",
@ -370,7 +370,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/endpoints", "path": "/api/v1/watch/namespaces/{namespace}/endpoints",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -445,7 +445,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/endpoints/{name}", "path": "/api/v1/namespaces/{namespace}/endpoints/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Endpoints", "type": "v1.Endpoints",
@ -657,7 +657,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/endpoints/{name}", "path": "/api/v1/watch/namespaces/{namespace}/endpoints/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -740,7 +740,7 @@
}, },
{ {
"path": "/api/v1/endpoints", "path": "/api/v1/endpoints",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.EndpointsList", "type": "v1.EndpointsList",
@ -807,7 +807,7 @@
}, },
{ {
"path": "/api/v1/watch/endpoints", "path": "/api/v1/watch/endpoints",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -874,7 +874,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/events", "path": "/api/v1/namespaces/{namespace}/events",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.EventList", "type": "v1.EventList",
@ -994,7 +994,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/events", "path": "/api/v1/watch/namespaces/{namespace}/events",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -1069,7 +1069,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/events/{name}", "path": "/api/v1/namespaces/{namespace}/events/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Event", "type": "v1.Event",
@ -1281,7 +1281,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/events/{name}", "path": "/api/v1/watch/namespaces/{namespace}/events/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -1364,7 +1364,7 @@
}, },
{ {
"path": "/api/v1/events", "path": "/api/v1/events",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.EventList", "type": "v1.EventList",
@ -1431,7 +1431,7 @@
}, },
{ {
"path": "/api/v1/watch/events", "path": "/api/v1/watch/events",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -1498,7 +1498,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/limitranges", "path": "/api/v1/namespaces/{namespace}/limitranges",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.LimitRangeList", "type": "v1.LimitRangeList",
@ -1618,7 +1618,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/limitranges", "path": "/api/v1/watch/namespaces/{namespace}/limitranges",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -1693,7 +1693,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/limitranges/{name}", "path": "/api/v1/namespaces/{namespace}/limitranges/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.LimitRange", "type": "v1.LimitRange",
@ -1905,7 +1905,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/limitranges/{name}", "path": "/api/v1/watch/namespaces/{namespace}/limitranges/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -1988,7 +1988,7 @@
}, },
{ {
"path": "/api/v1/limitranges", "path": "/api/v1/limitranges",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.LimitRangeList", "type": "v1.LimitRangeList",
@ -2055,7 +2055,7 @@
}, },
{ {
"path": "/api/v1/watch/limitranges", "path": "/api/v1/watch/limitranges",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -2122,7 +2122,7 @@
}, },
{ {
"path": "/api/v1/namespaces", "path": "/api/v1/namespaces",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.NamespaceList", "type": "v1.NamespaceList",
@ -2226,7 +2226,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces", "path": "/api/v1/watch/namespaces",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -2293,7 +2293,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{name}", "path": "/api/v1/namespaces/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Namespace", "type": "v1.Namespace",
@ -2473,7 +2473,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{name}", "path": "/api/v1/watch/namespaces/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -2548,7 +2548,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{name}/finalize", "path": "/api/v1/namespaces/{name}/finalize",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Namespace", "type": "v1.Namespace",
@ -2599,7 +2599,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{name}/status", "path": "/api/v1/namespaces/{name}/status",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Namespace", "type": "v1.Namespace",
@ -2650,7 +2650,7 @@
}, },
{ {
"path": "/api/v1/nodes", "path": "/api/v1/nodes",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.NodeList", "type": "v1.NodeList",
@ -2754,7 +2754,7 @@
}, },
{ {
"path": "/api/v1/watch/nodes", "path": "/api/v1/watch/nodes",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -2821,7 +2821,7 @@
}, },
{ {
"path": "/api/v1/nodes/{name}", "path": "/api/v1/nodes/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Node", "type": "v1.Node",
@ -3001,7 +3001,7 @@
}, },
{ {
"path": "/api/v1/watch/nodes/{name}", "path": "/api/v1/watch/nodes/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -3076,7 +3076,7 @@
}, },
{ {
"path": "/api/v1/proxy/nodes/{name}/{path:*}", "path": "/api/v1/proxy/nodes/{name}/{path:*}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -3262,7 +3262,7 @@
}, },
{ {
"path": "/api/v1/proxy/nodes/{name}", "path": "/api/v1/proxy/nodes/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -3400,7 +3400,7 @@
}, },
{ {
"path": "/api/v1/nodes/{name}/status", "path": "/api/v1/nodes/{name}/status",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Node", "type": "v1.Node",
@ -3451,7 +3451,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims", "path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolumeClaimList", "type": "v1.PersistentVolumeClaimList",
@ -3571,7 +3571,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/persistentvolumeclaims", "path": "/api/v1/watch/namespaces/{namespace}/persistentvolumeclaims",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -3646,7 +3646,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}", "path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolumeClaim", "type": "v1.PersistentVolumeClaim",
@ -3858,7 +3858,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/persistentvolumeclaims/{name}", "path": "/api/v1/watch/namespaces/{namespace}/persistentvolumeclaims/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -3941,7 +3941,7 @@
}, },
{ {
"path": "/api/v1/persistentvolumeclaims", "path": "/api/v1/persistentvolumeclaims",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolumeClaimList", "type": "v1.PersistentVolumeClaimList",
@ -4008,7 +4008,7 @@
}, },
{ {
"path": "/api/v1/watch/persistentvolumeclaims", "path": "/api/v1/watch/persistentvolumeclaims",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -4075,7 +4075,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}/status", "path": "/api/v1/namespaces/{namespace}/persistentvolumeclaims/{name}/status",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolumeClaim", "type": "v1.PersistentVolumeClaim",
@ -4134,7 +4134,7 @@
}, },
{ {
"path": "/api/v1/persistentvolumes", "path": "/api/v1/persistentvolumes",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolumeList", "type": "v1.PersistentVolumeList",
@ -4238,7 +4238,7 @@
}, },
{ {
"path": "/api/v1/watch/persistentvolumes", "path": "/api/v1/watch/persistentvolumes",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -4305,7 +4305,7 @@
}, },
{ {
"path": "/api/v1/persistentvolumes/{name}", "path": "/api/v1/persistentvolumes/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolume", "type": "v1.PersistentVolume",
@ -4485,7 +4485,7 @@
}, },
{ {
"path": "/api/v1/watch/persistentvolumes/{name}", "path": "/api/v1/watch/persistentvolumes/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -4560,7 +4560,7 @@
}, },
{ {
"path": "/api/v1/persistentvolumes/{name}/status", "path": "/api/v1/persistentvolumes/{name}/status",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PersistentVolume", "type": "v1.PersistentVolume",
@ -4611,7 +4611,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods", "path": "/api/v1/namespaces/{namespace}/pods",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PodList", "type": "v1.PodList",
@ -4731,7 +4731,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/pods", "path": "/api/v1/watch/namespaces/{namespace}/pods",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -4806,7 +4806,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}", "path": "/api/v1/namespaces/{namespace}/pods/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Pod", "type": "v1.Pod",
@ -5018,7 +5018,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/pods/{name}", "path": "/api/v1/watch/namespaces/{namespace}/pods/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -5101,7 +5101,7 @@
}, },
{ {
"path": "/api/v1/proxy/namespaces/{namespace}/pods/{name}/{path:*}", "path": "/api/v1/proxy/namespaces/{namespace}/pods/{name}/{path:*}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -5335,7 +5335,7 @@
}, },
{ {
"path": "/api/v1/proxy/namespaces/{namespace}/pods/{name}", "path": "/api/v1/proxy/namespaces/{namespace}/pods/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -5521,7 +5521,7 @@
}, },
{ {
"path": "/api/v1/pods", "path": "/api/v1/pods",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PodList", "type": "v1.PodList",
@ -5588,7 +5588,7 @@
}, },
{ {
"path": "/api/v1/watch/pods", "path": "/api/v1/watch/pods",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -5655,7 +5655,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/attach", "path": "/api/v1/namespaces/{namespace}/pods/{name}/attach",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -5801,7 +5801,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/binding", "path": "/api/v1/namespaces/{namespace}/pods/{name}/binding",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Binding", "type": "v1.Binding",
@ -5860,7 +5860,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/exec", "path": "/api/v1/namespaces/{namespace}/pods/{name}/exec",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -6022,7 +6022,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/log", "path": "/api/v1/namespaces/{namespace}/pods/{name}/log",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Pod", "type": "v1.Pod",
@ -6137,7 +6137,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/portforward", "path": "/api/v1/namespaces/{namespace}/pods/{name}/portforward",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -6203,7 +6203,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/proxy", "path": "/api/v1/namespaces/{namespace}/pods/{name}/proxy",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -6437,7 +6437,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/proxy/{path:*}", "path": "/api/v1/namespaces/{namespace}/pods/{name}/proxy/{path:*}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -6719,7 +6719,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/pods/{name}/status", "path": "/api/v1/namespaces/{namespace}/pods/{name}/status",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Pod", "type": "v1.Pod",
@ -6778,7 +6778,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/podtemplates", "path": "/api/v1/namespaces/{namespace}/podtemplates",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PodTemplateList", "type": "v1.PodTemplateList",
@ -6898,7 +6898,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/podtemplates", "path": "/api/v1/watch/namespaces/{namespace}/podtemplates",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -6973,7 +6973,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/podtemplates/{name}", "path": "/api/v1/namespaces/{namespace}/podtemplates/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PodTemplate", "type": "v1.PodTemplate",
@ -7185,7 +7185,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/podtemplates/{name}", "path": "/api/v1/watch/namespaces/{namespace}/podtemplates/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -7268,7 +7268,7 @@
}, },
{ {
"path": "/api/v1/podtemplates", "path": "/api/v1/podtemplates",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.PodTemplateList", "type": "v1.PodTemplateList",
@ -7335,7 +7335,7 @@
}, },
{ {
"path": "/api/v1/watch/podtemplates", "path": "/api/v1/watch/podtemplates",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -7402,7 +7402,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/replicationcontrollers", "path": "/api/v1/namespaces/{namespace}/replicationcontrollers",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ReplicationControllerList", "type": "v1.ReplicationControllerList",
@ -7522,7 +7522,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/replicationcontrollers", "path": "/api/v1/watch/namespaces/{namespace}/replicationcontrollers",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -7597,7 +7597,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/replicationcontrollers/{name}", "path": "/api/v1/namespaces/{namespace}/replicationcontrollers/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ReplicationController", "type": "v1.ReplicationController",
@ -7809,7 +7809,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/replicationcontrollers/{name}", "path": "/api/v1/watch/namespaces/{namespace}/replicationcontrollers/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -7892,7 +7892,7 @@
}, },
{ {
"path": "/api/v1/replicationcontrollers", "path": "/api/v1/replicationcontrollers",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ReplicationControllerList", "type": "v1.ReplicationControllerList",
@ -7959,7 +7959,7 @@
}, },
{ {
"path": "/api/v1/watch/replicationcontrollers", "path": "/api/v1/watch/replicationcontrollers",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -8026,7 +8026,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/resourcequotas", "path": "/api/v1/namespaces/{namespace}/resourcequotas",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ResourceQuotaList", "type": "v1.ResourceQuotaList",
@ -8146,7 +8146,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/resourcequotas", "path": "/api/v1/watch/namespaces/{namespace}/resourcequotas",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -8221,7 +8221,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/resourcequotas/{name}", "path": "/api/v1/namespaces/{namespace}/resourcequotas/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ResourceQuota", "type": "v1.ResourceQuota",
@ -8433,7 +8433,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/resourcequotas/{name}", "path": "/api/v1/watch/namespaces/{namespace}/resourcequotas/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -8516,7 +8516,7 @@
}, },
{ {
"path": "/api/v1/resourcequotas", "path": "/api/v1/resourcequotas",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ResourceQuotaList", "type": "v1.ResourceQuotaList",
@ -8583,7 +8583,7 @@
}, },
{ {
"path": "/api/v1/watch/resourcequotas", "path": "/api/v1/watch/resourcequotas",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -8650,7 +8650,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/resourcequotas/{name}/status", "path": "/api/v1/namespaces/{namespace}/resourcequotas/{name}/status",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ResourceQuota", "type": "v1.ResourceQuota",
@ -8709,7 +8709,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/secrets", "path": "/api/v1/namespaces/{namespace}/secrets",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.SecretList", "type": "v1.SecretList",
@ -8829,7 +8829,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/secrets", "path": "/api/v1/watch/namespaces/{namespace}/secrets",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -8904,7 +8904,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/secrets/{name}", "path": "/api/v1/namespaces/{namespace}/secrets/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Secret", "type": "v1.Secret",
@ -9116,7 +9116,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/secrets/{name}", "path": "/api/v1/watch/namespaces/{namespace}/secrets/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -9199,7 +9199,7 @@
}, },
{ {
"path": "/api/v1/secrets", "path": "/api/v1/secrets",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.SecretList", "type": "v1.SecretList",
@ -9266,7 +9266,7 @@
}, },
{ {
"path": "/api/v1/watch/secrets", "path": "/api/v1/watch/secrets",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -9333,7 +9333,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/serviceaccounts", "path": "/api/v1/namespaces/{namespace}/serviceaccounts",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ServiceAccountList", "type": "v1.ServiceAccountList",
@ -9453,7 +9453,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/serviceaccounts", "path": "/api/v1/watch/namespaces/{namespace}/serviceaccounts",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -9528,7 +9528,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/serviceaccounts/{name}", "path": "/api/v1/namespaces/{namespace}/serviceaccounts/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ServiceAccount", "type": "v1.ServiceAccount",
@ -9740,7 +9740,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/serviceaccounts/{name}", "path": "/api/v1/watch/namespaces/{namespace}/serviceaccounts/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -9823,7 +9823,7 @@
}, },
{ {
"path": "/api/v1/serviceaccounts", "path": "/api/v1/serviceaccounts",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ServiceAccountList", "type": "v1.ServiceAccountList",
@ -9890,7 +9890,7 @@
}, },
{ {
"path": "/api/v1/watch/serviceaccounts", "path": "/api/v1/watch/serviceaccounts",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -9957,7 +9957,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/services", "path": "/api/v1/namespaces/{namespace}/services",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ServiceList", "type": "v1.ServiceList",
@ -10077,7 +10077,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/services", "path": "/api/v1/watch/namespaces/{namespace}/services",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -10152,7 +10152,7 @@
}, },
{ {
"path": "/api/v1/namespaces/{namespace}/services/{name}", "path": "/api/v1/namespaces/{namespace}/services/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.Service", "type": "v1.Service",
@ -10356,7 +10356,7 @@
}, },
{ {
"path": "/api/v1/watch/namespaces/{namespace}/services/{name}", "path": "/api/v1/watch/namespaces/{namespace}/services/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -10439,7 +10439,7 @@
}, },
{ {
"path": "/api/v1/proxy/namespaces/{namespace}/services/{name}/{path:*}", "path": "/api/v1/proxy/namespaces/{namespace}/services/{name}/{path:*}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -10673,7 +10673,7 @@
}, },
{ {
"path": "/api/v1/proxy/namespaces/{namespace}/services/{name}", "path": "/api/v1/proxy/namespaces/{namespace}/services/{name}",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "string", "type": "string",
@ -10859,7 +10859,7 @@
}, },
{ {
"path": "/api/v1/services", "path": "/api/v1/services",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "v1.ServiceList", "type": "v1.ServiceList",
@ -10926,7 +10926,7 @@
}, },
{ {
"path": "/api/v1/watch/services", "path": "/api/v1/watch/services",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "json.WatchEvent", "type": "json.WatchEvent",
@ -10993,7 +10993,7 @@
}, },
{ {
"path": "/api/v1", "path": "/api/v1",
"description": "API at /api/v1 version v1", "description": "API at /api/v1",
"operations": [ "operations": [
{ {
"type": "void", "type": "void",

3
pkg/apiserver/api_installer.go
View File

@ -90,7 +90,8 @@ func (a *APIInstaller) Install(ws *restful.WebService) (apiResources []api.APIRe
func (a *APIInstaller) NewWebService() *restful.WebService { func (a *APIInstaller) NewWebService() *restful.WebService {
ws := new(restful.WebService) ws := new(restful.WebService)
ws.Path(a.prefix) ws.Path(a.prefix)
ws.Doc("API at " + a.prefix + " version " + a.group.Version) // a.prefix contains "prefix/group/version"
ws.Doc("API at " + a.prefix)
// TODO: change to restful.MIME_JSON when we set content type in client // TODO: change to restful.MIME_JSON when we set content type in client
ws.Consumes("*/*") ws.Consumes("*/*")
ws.Produces(restful.MIME_JSON) ws.Produces(restful.MIME_JSON)

5
pkg/apiserver/apiserver.go
View File

@ -78,13 +78,16 @@ type Mux interface {
type APIGroupVersion struct { type APIGroupVersion struct {
Storage map[string]rest.Storage Storage map[string]rest.Storage
Root string Root string
// TODO: caesarxuchao: Version actually contains "group/version", refactor it to avoid confusion.
Version string Version string
// ServerVersion controls the Kubernetes APIVersion used for common objects in the apiserver // ServerVersion controls the Kubernetes APIVersion used for common objects in the apiserver
// schema like api.Status, api.DeleteOptions, and api.ListOptions. Other implementors may // schema like api.Status, api.DeleteOptions, and api.ListOptions. Other implementors may
// define a version "v1beta1" but want to use the Kubernetes "v1" internal objects. If // define a version "v1beta1" but want to use the Kubernetes "v1" internal objects. If
// empty, defaults to Version. // empty, defaults to Version.
// TODO: caesarxuchao: ServerVersion actually contains "group/version",
// refactor it to avoid confusion.
ServerVersion string ServerVersion string
Mapper meta.RESTMapper Mapper meta.RESTMapper

7
pkg/master/master.go
View File

@ -36,6 +36,7 @@ import (
"k8s.io/kubernetes/pkg/api/latest" "k8s.io/kubernetes/pkg/api/latest"
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/rest" "k8s.io/kubernetes/pkg/api/rest"
apiutil "k8s.io/kubernetes/pkg/api/util"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
expapi "k8s.io/kubernetes/pkg/apis/experimental" expapi "k8s.io/kubernetes/pkg/apis/experimental"
"k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/apiserver"
@ -593,8 +594,8 @@ func (m *Master) init(c *Config) {
} }
expAPIVersions := []api.GroupVersion{ expAPIVersions := []api.GroupVersion{
{ {
GroupVersion: g.Group + "/" + expVersion.Version, GroupVersion: expVersion.Version,
Version: expVersion.Version, Version: apiutil.GetVersion(expVersion.Version),
}, },
} }
storageVersion, found := c.StorageVersions[g.Group] storageVersion, found := c.StorageVersions[g.Group]
@ -604,7 +605,7 @@ func (m *Master) init(c *Config) {
group := api.APIGroup{ group := api.APIGroup{
Name: g.Group, Name: g.Group,
Versions: expAPIVersions, Versions: expAPIVersions,
PreferredVersion: api.GroupVersion{GroupVersion: g.Group + "/" + storageVersion, Version: storageVersion}, PreferredVersion: api.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
} }
apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("experimental").Group+"/", group) apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("experimental").Group+"/", group)
allGroups = append(allGroups, group) allGroups = append(allGroups, group)

57
pkg/master/master_test.go
View File

@ -37,6 +37,7 @@ import (
"k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/meta"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
apiutil "k8s.io/kubernetes/pkg/api/util"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/experimental" "k8s.io/kubernetes/pkg/apis/experimental"
"k8s.io/kubernetes/pkg/apiserver" "k8s.io/kubernetes/pkg/apiserver"
@ -67,7 +68,7 @@ func setUp(t *testing.T) (Master, Config, *assert.Assertions) {
config.DatabaseStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Default.Codec(), etcdtest.PathPrefix()) config.DatabaseStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Default.Codec(), etcdtest.PathPrefix())
storageVersions[""] = testapi.Default.Version() storageVersions[""] = testapi.Default.Version()
config.ExpDatabaseStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix()) config.ExpDatabaseStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix())
storageVersions["experimental"] = testapi.Experimental.Version() storageVersions["experimental"] = testapi.Experimental.GroupAndVersion()
config.StorageVersions = storageVersions config.StorageVersions = storageVersions
master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{}) master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{})
@ -430,6 +431,60 @@ func TestGenerateSSHKey(t *testing.T) {
// TODO: testing error cases where the file can not be removed? // TODO: testing error cases where the file can not be removed?
} }
func TestDiscoveryAtAPIS(t *testing.T) {
master, config, assert := setUp(t)
master.exp = true
// ================= preparation for master.init() ======================
portRange := util.PortRange{Base: 10, Size: 10}
master.serviceNodePortRange = portRange
_, ipnet, err := net.ParseCIDR("192.168.1.1/24")
if !assert.NoError(err) {
t.Errorf("unexpected error: %v", err)
}
master.serviceClusterIPRange = ipnet
mh := apiserver.MuxHelper{Mux: http.NewServeMux()}
master.muxHelper = &mh
master.rootWebService = new(restful.WebService)
master.handlerContainer = restful.NewContainer()
master.mux = http.NewServeMux()
master.requestContextMapper = api.NewRequestContextMapper()
// ======================= end of preparation ===========================
master.init(&config)
server := httptest.NewServer(master.handlerContainer.ServeMux)
resp, err := http.Get(server.URL + "/apis")
if !assert.NoError(err) {
t.Errorf("unexpected error: %v", err)
}
assert.Equal(http.StatusOK, resp.StatusCode)
groupList := api.APIGroupList{}
assert.NoError(decodeResponse(resp, &groupList))
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
expectGroupName := "experimental"
expectVersions := []api.GroupVersion{
{
GroupVersion: testapi.Experimental.GroupAndVersion(),
Version: testapi.Experimental.Version(),
},
}
expectPreferredVersion := api.GroupVersion{
GroupVersion: config.StorageVersions["experimental"],
Version: apiutil.GetVersion(config.StorageVersions["experimental"]),
}
assert.Equal(expectGroupName, groupList.Groups[0].Name)
assert.Equal(expectVersions, groupList.Groups[0].Versions)
assert.Equal(expectPreferredVersion, groupList.Groups[0].PreferredVersion)
}
var versionsToTest = []string{"v1", "v3"} var versionsToTest = []string{"v1", "v3"}
type Foo struct { type Foo struct {