diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 51a5b24767..d56c46dfd8 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -419,7 +419,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", - "nickname": "watchEndpointslist", + "nickname": "watchEndpointsList", "parameters": [ { "type": "string", @@ -893,7 +893,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", - "nickname": "watchEndpointslist", + "nickname": "watchEndpointsList", "parameters": [ { "type": "string", @@ -1080,7 +1080,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", - "nickname": "watchEventlist", + "nickname": "watchEventList", "parameters": [ { "type": "string", @@ -1546,7 +1546,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", - "nickname": "watchEventlist", + "nickname": "watchEventList", "parameters": [ { "type": "string", @@ -1733,7 +1733,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", - "nickname": "watchLimitRangelist", + "nickname": "watchLimitRangeList", "parameters": [ { "type": "string", @@ -2199,7 +2199,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", - "nickname": "watchLimitRangelist", + "nickname": "watchLimitRangeList", "parameters": [ { "type": "string", @@ -2370,7 +2370,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Namespace", - "nickname": "watchNamespacelist", + "nickname": "watchNamespaceList", "parameters": [ { "type": "string", @@ -2691,8 +2691,8 @@ { "type": "v1.Namespace", "method": "PUT", - "summary": "replace the specified Namespace", - "nickname": "replaceNamespace", + "summary": "replace finalize of the specified Namespace", + "nickname": "replaceNamespaceFinalize", "parameters": [ { "type": "string", @@ -2742,8 +2742,8 @@ { "type": "v1.Namespace", "method": "PUT", - "summary": "replace the specified Namespace", - "nickname": "replaceNamespace", + "summary": "replace status of the specified Namespace", + "nickname": "replaceNamespaceStatus", "parameters": [ { "type": "string", @@ -2898,7 +2898,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", - "nickname": "watchNodelist", + "nickname": "watchNodeList", "parameters": [ { "type": "string", @@ -3571,8 +3571,8 @@ { "type": "v1.Node", "method": "PUT", - "summary": "replace the specified Node", - "nickname": "replaceNode", + "summary": "replace status of the specified Node", + "nickname": "replaceNodeStatus", "parameters": [ { "type": "string", @@ -3743,7 +3743,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", - "nickname": "watchPersistentVolumeClaimlist", + "nickname": "watchPersistentVolumeClaimList", "parameters": [ { "type": "string", @@ -4217,7 +4217,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", - "nickname": "watchPersistentVolumeClaimlist", + "nickname": "watchPersistentVolumeClaimList", "parameters": [ { "type": "string", @@ -4283,8 +4283,8 @@ { "type": "v1.PersistentVolumeClaim", "method": "PUT", - "summary": "replace the specified PersistentVolumeClaim", - "nickname": "replacePersistentVolumeClaim", + "summary": "replace status of the specified PersistentVolumeClaim", + "nickname": "replacePersistentVolumeClaimStatus", "parameters": [ { "type": "string", @@ -4447,7 +4447,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolume", - "nickname": "watchPersistentVolumelist", + "nickname": "watchPersistentVolumeList", "parameters": [ { "type": "string", @@ -4768,8 +4768,8 @@ { "type": "v1.PersistentVolume", "method": "PUT", - "summary": "replace the specified PersistentVolume", - "nickname": "replacePersistentVolume", + "summary": "replace status of the specified PersistentVolume", + "nickname": "replacePersistentVolumeStatus", "parameters": [ { "type": "string", @@ -4940,7 +4940,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", - "nickname": "watchPodlist", + "nickname": "watchPodList", "parameters": [ { "type": "string", @@ -5863,8 +5863,8 @@ { "type": "v1.Binding", "method": "POST", - "summary": "create a Binding", - "nickname": "createBinding", + "summary": "create binding of a Binding", + "nickname": "createBindingBinding", "parameters": [ { "type": "string", @@ -5907,7 +5907,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", - "nickname": "watchPodlist", + "nickname": "watchPodList", "parameters": [ { "type": "string", @@ -5973,8 +5973,8 @@ { "type": "v1.Binding", "method": "POST", - "summary": "create a Binding", - "nickname": "createBinding", + "summary": "create binding of a Binding", + "nickname": "createBindingBinding", "parameters": [ { "type": "string", @@ -6032,8 +6032,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to exec of Pod", + "nickname": "connectGetPodExec", "parameters": [], "produces": [ "*/*" @@ -6051,8 +6051,8 @@ { "type": "v1.Pod", "method": "GET", - "summary": "read the specified Pod", - "nickname": "readPod", + "summary": "read log of the specified Pod", + "nickname": "readPodLog", "parameters": [ { "type": "string", @@ -6102,8 +6102,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to portforward of Pod", + "nickname": "connectGetPodPortforward", "parameters": [], "produces": [ "*/*" @@ -6121,8 +6121,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to proxy of Pod", + "nickname": "connectGetPodProxy", "parameters": [], "produces": [ "*/*" @@ -6134,8 +6134,8 @@ { "type": "string", "method": "POST", - "summary": "connect POST requests to Pod", - "nickname": "connectPOSTPod", + "summary": "connect POST requests to proxy of Pod", + "nickname": "connectPostPodProxy", "parameters": [], "produces": [ "*/*" @@ -6147,8 +6147,8 @@ { "type": "string", "method": "PUT", - "summary": "connect PUT requests to Pod", - "nickname": "connectPUTPod", + "summary": "connect PUT requests to proxy of Pod", + "nickname": "connectPutPodProxy", "parameters": [], "produces": [ "*/*" @@ -6160,8 +6160,8 @@ { "type": "string", "method": "DELETE", - "summary": "connect DELETE requests to Pod", - "nickname": "connectDELETEPod", + "summary": "connect DELETE requests to proxy of Pod", + "nickname": "connectDeletePodProxy", "parameters": [], "produces": [ "*/*" @@ -6173,8 +6173,8 @@ { "type": "string", "method": "HEAD", - "summary": "connect HEAD requests to Pod", - "nickname": "connectHEADPod", + "summary": "connect HEAD requests to proxy of Pod", + "nickname": "connectHeadPodProxy", "parameters": [], "produces": [ "*/*" @@ -6186,8 +6186,8 @@ { "type": "string", "method": "OPTIONS", - "summary": "connect OPTIONS requests to Pod", - "nickname": "connectOPTIONSPod", + "summary": "connect OPTIONS requests to proxy of Pod", + "nickname": "connectOptionsPodProxy", "parameters": [], "produces": [ "*/*" @@ -6205,8 +6205,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to proxy of Pod", + "nickname": "connectGetPodProxy", "parameters": [], "produces": [ "*/*" @@ -6218,8 +6218,8 @@ { "type": "string", "method": "POST", - "summary": "connect POST requests to Pod", - "nickname": "connectPOSTPod", + "summary": "connect POST requests to proxy of Pod", + "nickname": "connectPostPodProxy", "parameters": [], "produces": [ "*/*" @@ -6231,8 +6231,8 @@ { "type": "string", "method": "PUT", - "summary": "connect PUT requests to Pod", - "nickname": "connectPUTPod", + "summary": "connect PUT requests to proxy of Pod", + "nickname": "connectPutPodProxy", "parameters": [], "produces": [ "*/*" @@ -6244,8 +6244,8 @@ { "type": "string", "method": "DELETE", - "summary": "connect DELETE requests to Pod", - "nickname": "connectDELETEPod", + "summary": "connect DELETE requests to proxy of Pod", + "nickname": "connectDeletePodProxy", "parameters": [], "produces": [ "*/*" @@ -6257,8 +6257,8 @@ { "type": "string", "method": "HEAD", - "summary": "connect HEAD requests to Pod", - "nickname": "connectHEADPod", + "summary": "connect HEAD requests to proxy of Pod", + "nickname": "connectHeadPodProxy", "parameters": [], "produces": [ "*/*" @@ -6270,8 +6270,8 @@ { "type": "string", "method": "OPTIONS", - "summary": "connect OPTIONS requests to Pod", - "nickname": "connectOPTIONSPod", + "summary": "connect OPTIONS requests to proxy of Pod", + "nickname": "connectOptionsPodProxy", "parameters": [], "produces": [ "*/*" @@ -6289,8 +6289,8 @@ { "type": "v1.Pod", "method": "PUT", - "summary": "replace the specified Pod", - "nickname": "replacePod", + "summary": "replace status of the specified Pod", + "nickname": "replacePodStatus", "parameters": [ { "type": "string", @@ -6469,7 +6469,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PodTemplate", - "nickname": "watchPodTemplatelist", + "nickname": "watchPodTemplateList", "parameters": [ { "type": "string", @@ -6943,7 +6943,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PodTemplate", - "nickname": "watchPodTemplatelist", + "nickname": "watchPodTemplateList", "parameters": [ { "type": "string", @@ -7130,7 +7130,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", - "nickname": "watchReplicationControllerlist", + "nickname": "watchReplicationControllerList", "parameters": [ { "type": "string", @@ -7604,7 +7604,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", - "nickname": "watchReplicationControllerlist", + "nickname": "watchReplicationControllerList", "parameters": [ { "type": "string", @@ -7791,7 +7791,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", - "nickname": "watchResourceQuotalist", + "nickname": "watchResourceQuotaList", "parameters": [ { "type": "string", @@ -8265,7 +8265,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", - "nickname": "watchResourceQuotalist", + "nickname": "watchResourceQuotaList", "parameters": [ { "type": "string", @@ -8331,8 +8331,8 @@ { "type": "v1.ResourceQuota", "method": "PUT", - "summary": "replace the specified ResourceQuota", - "nickname": "replaceResourceQuota", + "summary": "replace status of the specified ResourceQuota", + "nickname": "replaceResourceQuotaStatus", "parameters": [ { "type": "string", @@ -8511,7 +8511,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", - "nickname": "watchSecretlist", + "nickname": "watchSecretList", "parameters": [ { "type": "string", @@ -8985,7 +8985,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", - "nickname": "watchSecretlist", + "nickname": "watchSecretList", "parameters": [ { "type": "string", @@ -9172,7 +9172,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ServiceAccount", - "nickname": "watchServiceAccountlist", + "nickname": "watchServiceAccountList", "parameters": [ { "type": "string", @@ -9646,7 +9646,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ServiceAccount", - "nickname": "watchServiceAccountlist", + "nickname": "watchServiceAccountList", "parameters": [ { "type": "string", @@ -9833,7 +9833,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", - "nickname": "watchServicelist", + "nickname": "watchServiceList", "parameters": [ { "type": "string", @@ -10755,7 +10755,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", - "nickname": "watchServicelist", + "nickname": "watchServiceList", "parameters": [ { "type": "string", diff --git a/api/swagger-spec/v1beta3.json b/api/swagger-spec/v1beta3.json index 56740723b6..bf0824e543 100644 --- a/api/swagger-spec/v1beta3.json +++ b/api/swagger-spec/v1beta3.json @@ -419,7 +419,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", - "nickname": "watchEndpointslist", + "nickname": "watchEndpointsList", "parameters": [ { "type": "string", @@ -893,7 +893,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Endpoints", - "nickname": "watchEndpointslist", + "nickname": "watchEndpointsList", "parameters": [ { "type": "string", @@ -1080,7 +1080,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", - "nickname": "watchEventlist", + "nickname": "watchEventList", "parameters": [ { "type": "string", @@ -1546,7 +1546,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Event", - "nickname": "watchEventlist", + "nickname": "watchEventList", "parameters": [ { "type": "string", @@ -1733,7 +1733,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", - "nickname": "watchLimitRangelist", + "nickname": "watchLimitRangeList", "parameters": [ { "type": "string", @@ -2199,7 +2199,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of LimitRange", - "nickname": "watchLimitRangelist", + "nickname": "watchLimitRangeList", "parameters": [ { "type": "string", @@ -2370,7 +2370,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Namespace", - "nickname": "watchNamespacelist", + "nickname": "watchNamespaceList", "parameters": [ { "type": "string", @@ -2691,8 +2691,8 @@ { "type": "v1beta3.Namespace", "method": "PUT", - "summary": "replace the specified Namespace", - "nickname": "replaceNamespace", + "summary": "replace finalize of the specified Namespace", + "nickname": "replaceNamespaceFinalize", "parameters": [ { "type": "string", @@ -2742,8 +2742,8 @@ { "type": "v1beta3.Namespace", "method": "PUT", - "summary": "replace the specified Namespace", - "nickname": "replaceNamespace", + "summary": "replace status of the specified Namespace", + "nickname": "replaceNamespaceStatus", "parameters": [ { "type": "string", @@ -2898,7 +2898,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Node", - "nickname": "watchNodelist", + "nickname": "watchNodeList", "parameters": [ { "type": "string", @@ -3571,8 +3571,8 @@ { "type": "v1beta3.Node", "method": "PUT", - "summary": "replace the specified Node", - "nickname": "replaceNode", + "summary": "replace status of the specified Node", + "nickname": "replaceNodeStatus", "parameters": [ { "type": "string", @@ -3743,7 +3743,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", - "nickname": "watchPersistentVolumeClaimlist", + "nickname": "watchPersistentVolumeClaimList", "parameters": [ { "type": "string", @@ -4217,7 +4217,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolumeClaim", - "nickname": "watchPersistentVolumeClaimlist", + "nickname": "watchPersistentVolumeClaimList", "parameters": [ { "type": "string", @@ -4283,8 +4283,8 @@ { "type": "v1beta3.PersistentVolumeClaim", "method": "PUT", - "summary": "replace the specified PersistentVolumeClaim", - "nickname": "replacePersistentVolumeClaim", + "summary": "replace status of the specified PersistentVolumeClaim", + "nickname": "replacePersistentVolumeClaimStatus", "parameters": [ { "type": "string", @@ -4447,7 +4447,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PersistentVolume", - "nickname": "watchPersistentVolumelist", + "nickname": "watchPersistentVolumeList", "parameters": [ { "type": "string", @@ -4768,8 +4768,8 @@ { "type": "v1beta3.PersistentVolume", "method": "PUT", - "summary": "replace the specified PersistentVolume", - "nickname": "replacePersistentVolume", + "summary": "replace status of the specified PersistentVolume", + "nickname": "replacePersistentVolumeStatus", "parameters": [ { "type": "string", @@ -4940,7 +4940,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", - "nickname": "watchPodlist", + "nickname": "watchPodList", "parameters": [ { "type": "string", @@ -5863,8 +5863,8 @@ { "type": "v1beta3.Binding", "method": "POST", - "summary": "create a Binding", - "nickname": "createBinding", + "summary": "create binding of a Binding", + "nickname": "createBindingBinding", "parameters": [ { "type": "string", @@ -5907,7 +5907,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Pod", - "nickname": "watchPodlist", + "nickname": "watchPodList", "parameters": [ { "type": "string", @@ -5973,8 +5973,8 @@ { "type": "v1beta3.Binding", "method": "POST", - "summary": "create a Binding", - "nickname": "createBinding", + "summary": "create binding of a Binding", + "nickname": "createBindingBinding", "parameters": [ { "type": "string", @@ -6032,8 +6032,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to exec of Pod", + "nickname": "connectGetPodExec", "parameters": [], "produces": [ "*/*" @@ -6051,8 +6051,8 @@ { "type": "v1beta3.Pod", "method": "GET", - "summary": "read the specified Pod", - "nickname": "readPod", + "summary": "read log of the specified Pod", + "nickname": "readPodLog", "parameters": [ { "type": "string", @@ -6102,8 +6102,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to portforward of Pod", + "nickname": "connectGetPodPortforward", "parameters": [], "produces": [ "*/*" @@ -6121,8 +6121,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to proxy of Pod", + "nickname": "connectGetPodProxy", "parameters": [], "produces": [ "*/*" @@ -6134,8 +6134,8 @@ { "type": "string", "method": "POST", - "summary": "connect POST requests to Pod", - "nickname": "connectPOSTPod", + "summary": "connect POST requests to proxy of Pod", + "nickname": "connectPostPodProxy", "parameters": [], "produces": [ "*/*" @@ -6147,8 +6147,8 @@ { "type": "string", "method": "PUT", - "summary": "connect PUT requests to Pod", - "nickname": "connectPUTPod", + "summary": "connect PUT requests to proxy of Pod", + "nickname": "connectPutPodProxy", "parameters": [], "produces": [ "*/*" @@ -6160,8 +6160,8 @@ { "type": "string", "method": "DELETE", - "summary": "connect DELETE requests to Pod", - "nickname": "connectDELETEPod", + "summary": "connect DELETE requests to proxy of Pod", + "nickname": "connectDeletePodProxy", "parameters": [], "produces": [ "*/*" @@ -6173,8 +6173,8 @@ { "type": "string", "method": "HEAD", - "summary": "connect HEAD requests to Pod", - "nickname": "connectHEADPod", + "summary": "connect HEAD requests to proxy of Pod", + "nickname": "connectHeadPodProxy", "parameters": [], "produces": [ "*/*" @@ -6186,8 +6186,8 @@ { "type": "string", "method": "OPTIONS", - "summary": "connect OPTIONS requests to Pod", - "nickname": "connectOPTIONSPod", + "summary": "connect OPTIONS requests to proxy of Pod", + "nickname": "connectOptionsPodProxy", "parameters": [], "produces": [ "*/*" @@ -6205,8 +6205,8 @@ { "type": "string", "method": "GET", - "summary": "connect GET requests to Pod", - "nickname": "connectGETPod", + "summary": "connect GET requests to proxy of Pod", + "nickname": "connectGetPodProxy", "parameters": [], "produces": [ "*/*" @@ -6218,8 +6218,8 @@ { "type": "string", "method": "POST", - "summary": "connect POST requests to Pod", - "nickname": "connectPOSTPod", + "summary": "connect POST requests to proxy of Pod", + "nickname": "connectPostPodProxy", "parameters": [], "produces": [ "*/*" @@ -6231,8 +6231,8 @@ { "type": "string", "method": "PUT", - "summary": "connect PUT requests to Pod", - "nickname": "connectPUTPod", + "summary": "connect PUT requests to proxy of Pod", + "nickname": "connectPutPodProxy", "parameters": [], "produces": [ "*/*" @@ -6244,8 +6244,8 @@ { "type": "string", "method": "DELETE", - "summary": "connect DELETE requests to Pod", - "nickname": "connectDELETEPod", + "summary": "connect DELETE requests to proxy of Pod", + "nickname": "connectDeletePodProxy", "parameters": [], "produces": [ "*/*" @@ -6257,8 +6257,8 @@ { "type": "string", "method": "HEAD", - "summary": "connect HEAD requests to Pod", - "nickname": "connectHEADPod", + "summary": "connect HEAD requests to proxy of Pod", + "nickname": "connectHeadPodProxy", "parameters": [], "produces": [ "*/*" @@ -6270,8 +6270,8 @@ { "type": "string", "method": "OPTIONS", - "summary": "connect OPTIONS requests to Pod", - "nickname": "connectOPTIONSPod", + "summary": "connect OPTIONS requests to proxy of Pod", + "nickname": "connectOptionsPodProxy", "parameters": [], "produces": [ "*/*" @@ -6289,8 +6289,8 @@ { "type": "v1beta3.Pod", "method": "PUT", - "summary": "replace the specified Pod", - "nickname": "replacePod", + "summary": "replace status of the specified Pod", + "nickname": "replacePodStatus", "parameters": [ { "type": "string", @@ -6469,7 +6469,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PodTemplate", - "nickname": "watchPodTemplatelist", + "nickname": "watchPodTemplateList", "parameters": [ { "type": "string", @@ -6943,7 +6943,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of PodTemplate", - "nickname": "watchPodTemplatelist", + "nickname": "watchPodTemplateList", "parameters": [ { "type": "string", @@ -7130,7 +7130,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", - "nickname": "watchReplicationControllerlist", + "nickname": "watchReplicationControllerList", "parameters": [ { "type": "string", @@ -7604,7 +7604,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ReplicationController", - "nickname": "watchReplicationControllerlist", + "nickname": "watchReplicationControllerList", "parameters": [ { "type": "string", @@ -7791,7 +7791,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", - "nickname": "watchResourceQuotalist", + "nickname": "watchResourceQuotaList", "parameters": [ { "type": "string", @@ -8265,7 +8265,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ResourceQuota", - "nickname": "watchResourceQuotalist", + "nickname": "watchResourceQuotaList", "parameters": [ { "type": "string", @@ -8331,8 +8331,8 @@ { "type": "v1beta3.ResourceQuota", "method": "PUT", - "summary": "replace the specified ResourceQuota", - "nickname": "replaceResourceQuota", + "summary": "replace status of the specified ResourceQuota", + "nickname": "replaceResourceQuotaStatus", "parameters": [ { "type": "string", @@ -8511,7 +8511,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", - "nickname": "watchSecretlist", + "nickname": "watchSecretList", "parameters": [ { "type": "string", @@ -8985,7 +8985,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Secret", - "nickname": "watchSecretlist", + "nickname": "watchSecretList", "parameters": [ { "type": "string", @@ -9172,7 +9172,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ServiceAccount", - "nickname": "watchServiceAccountlist", + "nickname": "watchServiceAccountList", "parameters": [ { "type": "string", @@ -9646,7 +9646,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of ServiceAccount", - "nickname": "watchServiceAccountlist", + "nickname": "watchServiceAccountList", "parameters": [ { "type": "string", @@ -9833,7 +9833,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", - "nickname": "watchServicelist", + "nickname": "watchServiceList", "parameters": [ { "type": "string", @@ -10755,7 +10755,7 @@ "type": "json.WatchEvent", "method": "GET", "summary": "watch individual changes to a list of Service", - "nickname": "watchServicelist", + "nickname": "watchServiceList", "parameters": [ { "type": "string", diff --git a/pkg/apiserver/api_installer.go b/pkg/apiserver/api_installer.go index 2a1b485b8f..0d94e0900c 100644 --- a/pkg/apiserver/api_installer.go +++ b/pkg/apiserver/api_installer.go @@ -406,11 +406,15 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag } else { handler = GetResource(getter, reqScope) } + doc := "read the specified " + kind + if hasSubresource { + doc = "read " + subresource + " of the specified " + kind + } route := ws.GET(action.Path).To(handler). Filter(m). - Doc("read the specified "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("read"+kind). + Operation("read"+kind+strings.Title(subresource)). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), "application/json")...). Returns(http.StatusOK, "OK", versionedObject). Writes(versionedObject) @@ -422,11 +426,15 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag addParams(route, action.Params) ws.Route(route) case "LIST": // List all resources of a kind. + doc := "list objects of kind " + kind + if hasSubresource { + doc = "list " + subresource + " of objects of kind " + kind + } route := ws.GET(action.Path).To(ListResource(lister, watcher, reqScope, false, a.minRequestTimeout)). Filter(m). - Doc("list objects of kind "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("list"+kind). + Operation("list"+kind+strings.Title(subresource)). Produces("application/json"). Returns(http.StatusOK, "OK", versionedList). Writes(versionedList) @@ -435,18 +443,30 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag } switch { case isLister && isWatcher: - route.Doc("list or watch objects of kind " + kind) + doc := "list or watch objects of kind " + kind + if hasSubresource { + doc = "list or watch " + subresource + " of objects of kind " + kind + } + route.Doc(doc) case isWatcher: - route.Doc("watch objects of kind " + kind) + doc := "watch objects of kind " + kind + if hasSubresource { + doc = "watch " + subresource + "of objects of kind " + kind + } + route.Doc(doc) } addParams(route, action.Params) ws.Route(route) case "PUT": // Update a resource. + doc := "replace the specified " + kind + if hasSubresource { + doc = "replace " + subresource + " of the specified " + kind + } route := ws.PUT(action.Path).To(UpdateResource(updater, reqScope, a.group.Typer, admit)). Filter(m). - Doc("replace the specified "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("replace"+kind). + Operation("replace"+kind+strings.Title(subresource)). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), "application/json")...). Returns(http.StatusOK, "OK", versionedObject). Reads(versionedObject). @@ -454,12 +474,16 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag addParams(route, action.Params) ws.Route(route) case "PATCH": // Partially update a resource + doc := "partially update the specified " + kind + if hasSubresource { + doc = "partially update " + subresource + " of the specified " + kind + } route := ws.PATCH(action.Path).To(PatchResource(patcher, reqScope, a.group.Typer, admit, mapping.ObjectConvertor)). Filter(m). - Doc("partially update the specified "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). Consumes(string(api.JSONPatchType), string(api.MergePatchType), string(api.StrategicMergePatchType)). - Operation("patch"+kind). + Operation("patch"+kind+strings.Title(subresource)). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), "application/json")...). Returns(http.StatusOK, "OK", "string"). Reads("string"). @@ -473,11 +497,15 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag } else { handler = CreateResource(creater, reqScope, a.group.Typer, admit) } + doc := "create a " + kind + if hasSubresource { + doc = "create " + subresource + " of a " + kind + } route := ws.POST(action.Path).To(handler). Filter(m). - Doc("create a "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("create"+kind). + Operation("create"+kind+strings.Title(subresource)). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), "application/json")...). Returns(http.StatusOK, "OK", versionedObject). Reads(versionedObject). @@ -485,11 +513,15 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag addParams(route, action.Params) ws.Route(route) case "DELETE": // Delete a resource. + doc := "delete a " + kind + if hasSubresource { + doc = "delete " + subresource + " of a " + kind + } route := ws.DELETE(action.Path).To(DeleteResource(gracefulDeleter, isGracefulDeleter, reqScope, admit)). Filter(m). - Doc("delete a "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("delete"+kind). + Operation("delete"+kind+strings.Title(subresource)). Produces(append(storageMeta.ProducesMIMETypes(action.Verb), "application/json")...). Writes(versionedStatus). Returns(http.StatusOK, "OK", versionedStatus) @@ -500,11 +532,15 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag ws.Route(route) // TODO: deprecated case "WATCH": // Watch a resource. + doc := "watch changes to an object of kind " + kind + if hasSubresource { + doc = "watch changes to " + subresource + " of an object of kind " + kind + } route := ws.GET(action.Path).To(ListResource(lister, watcher, reqScope, true, a.minRequestTimeout)). Filter(m). - Doc("watch changes to an object of kind "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("watch"+kind). + Operation("watch"+kind+strings.Title(subresource)). Produces("application/json"). Returns(http.StatusOK, "OK", watchjson.WatchEvent{}). Writes(watchjson.WatchEvent{}) @@ -515,11 +551,15 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag ws.Route(route) // TODO: deprecated case "WATCHLIST": // Watch all resources of a kind. + doc := "watch individual changes to a list of " + kind + if hasSubresource { + doc = "watch individual changes to a list of " + subresource + " of " + kind + } route := ws.GET(action.Path).To(ListResource(lister, watcher, reqScope, true, a.minRequestTimeout)). Filter(m). - Doc("watch individual changes to a list of "+kind). + Doc(doc). Param(ws.QueryParameter("pretty", "If 'true', then the output is pretty printed.")). - Operation("watch"+kind+"list"). + Operation("watch"+kind+strings.Title(subresource)+"List"). Produces("application/json"). Returns(http.StatusOK, "OK", watchjson.WatchEvent{}). Writes(watchjson.WatchEvent{}) @@ -529,10 +569,14 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag addParams(route, action.Params) ws.Route(route) case "REDIRECT": // Get the redirect URL for a resource. + doc := "redirect GET request to " + kind + if hasSubresource { + doc = "redirect GET request to " + subresource + " of " + kind + } route := ws.GET(action.Path).To(routeFunction(redirectHandler)). Filter(m). - Doc("redirect GET request to " + kind). - Operation("redirect" + kind). + Doc(doc). + Operation("redirect" + kind + strings.Title(subresource)). Produces("*/*"). Consumes("*/*"). Writes("string") @@ -540,19 +584,23 @@ func (a *APIInstaller) registerResourceHandlers(path string, storage rest.Storag ws.Route(route) case "PROXY": // Proxy requests to a resource. // Accept all methods as per https://github.com/GoogleCloudPlatform/kubernetes/issues/3996 - addProxyRoute(ws, "GET", a.prefix, action.Path, proxyHandler, kind, resource, action.Params) - addProxyRoute(ws, "PUT", a.prefix, action.Path, proxyHandler, kind, resource, action.Params) - addProxyRoute(ws, "POST", a.prefix, action.Path, proxyHandler, kind, resource, action.Params) - addProxyRoute(ws, "DELETE", a.prefix, action.Path, proxyHandler, kind, resource, action.Params) - addProxyRoute(ws, "HEAD", a.prefix, action.Path, proxyHandler, kind, resource, action.Params) - addProxyRoute(ws, "TRACE", a.prefix, action.Path, proxyHandler, kind, resource, action.Params) + addProxyRoute(ws, "GET", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) + addProxyRoute(ws, "PUT", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) + addProxyRoute(ws, "POST", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) + addProxyRoute(ws, "DELETE", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) + addProxyRoute(ws, "HEAD", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) + addProxyRoute(ws, "TRACE", a.prefix, action.Path, proxyHandler, kind, resource, subresource, hasSubresource, action.Params) case "CONNECT": for _, method := range connecter.ConnectMethods() { + doc := "connect " + method + " requests to " + kind + if hasSubresource { + doc = "connect " + method + " requests to " + subresource + " of " + kind + } route := ws.Method(method).Path(action.Path). To(ConnectResource(connecter, reqScope, admit, connectOptionsKind, path, connectSubpath, connectSubpathKey)). Filter(m). - Doc("connect " + method + " requests to " + kind). - Operation("connect" + method + kind). + Doc(doc). + Operation("connect" + strings.Title(strings.ToLower(method)) + kind + strings.Title(subresource)). Produces("*/*"). Consumes("*/*"). Writes("string") @@ -809,11 +857,15 @@ func routeFunction(handler http.Handler) restful.RouteFunction { } } -func addProxyRoute(ws *restful.WebService, method string, prefix string, path string, proxyHandler http.Handler, kind, resource string, params []*restful.Parameter) { +func addProxyRoute(ws *restful.WebService, method string, prefix string, path string, proxyHandler http.Handler, kind, resource, subresource string, hasSubresource bool, params []*restful.Parameter) { + doc := "proxy " + method + " requests to " + kind + if hasSubresource { + doc = "proxy " + method + " requests to " + subresource + " of " + kind + } proxyRoute := ws.Method(method).Path(path).To(routeFunction(proxyHandler)). Filter(monitorFilter("PROXY", resource)). - Doc("proxy " + method + " requests to " + kind). - Operation("proxy" + method + kind). + Doc(doc). + Operation("proxy" + strings.Title(method) + kind + strings.Title(subresource)). Produces("*/*"). Consumes("*/*"). Writes("string")