Skip to content

K
k3s
Commit 3a9de6ee authored by harry's avatar harry
Browse files
Options

Updated generated code and docs

parent 27ca7dc7
Hide whitespace changes
Inline Side-by-side
Showing with 201 additions and 1 deletion
api/swagger-spec/v1.json
View file @ 3a9de6ee
......@@ -13503,6 +13503,9 @@
"v1.NodeStatus": {
"id": "v1.NodeStatus",
"description": "NodeStatus is information about the current status of a node.",
"required": [
"images"
],
"properties": {
"capacity": {
"type": "any",
......@@ -13537,6 +13540,13 @@
"nodeInfo": {
"$ref": "v1.NodeSystemInfo",
"description": "Set of ids/uuids to uniquely identify the node. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-info"
},
"images": {
"type": "array",
"items": {
"$ref": "v1.ContainerImage"
},
"description": "List of container images on this node"
}
}
},
......@@ -13664,6 +13674,27 @@
}
}
},
"v1.ContainerImage": {
"id": "v1.ContainerImage",
"description": "Describe a container image",
"required": [
"repoTags"
],
"properties": {
"repoTags": {
"type": "array",
"items": {
"type": "string"
},
"description": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]"
},
"size": {
"type": "integer",
"format": "int64",
"description": "The size of the image in bytes."
}
}
},
"v1.PersistentVolumeClaimList": {
"id": "v1.PersistentVolumeClaimList",
"description": "PersistentVolumeClaimList is a list of PersistentVolumeClaim items.",
......
docs/api-reference/v1/definitions.html
View file @ 3a9de6ee
......@@ -3906,6 +3906,13 @@ The resulting set of endpoints can be viewed as:<br>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_nodesysteminfo">v1.NodeSystemInfo</a></p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">images</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">List of container images on this node</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_containerimage">v1.ContainerImage</a> array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
......@@ -5755,6 +5762,47 @@ The resulting set of endpoints can be viewed as:<br>
</div>
<div class="sect2">
<h3 id="_v1_containerimage">v1.ContainerImage</h3>
<div class="paragraph">
<p>Describe a container image</p>
</div>
<table class="tableblock frame-all grid-all" style="width:100%; ">
<colgroup>
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
<col style="width:20%;">
</colgroup>
<thead>
<tr>
<th class="tableblock halign-left valign-top">Name</th>
<th class="tableblock halign-left valign-top">Description</th>
<th class="tableblock halign-left valign-top">Required</th>
<th class="tableblock halign-left valign-top">Schema</th>
<th class="tableblock halign-left valign-top">Default</th>
</tr>
</thead>
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">repoTags</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Names by which this image is known. e.g. ["gcr.io/google_containers/hyperkube:v1.0.7", "dockerhub.io/google_containers/hyperkube:v1.0.7"]</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">size</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The size of the image in bytes.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">integer (int64)</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
</table>
</div>
<div class="sect2">
<h3 id="_v1_replicationcontrollerlist">v1.ReplicationControllerList</h3>
<div class="paragraph">
<p>ReplicationControllerList is a collection of replication controllers.</p>
......@@ -7001,7 +7049,7 @@ The resulting set of endpoints can be viewed as:<br>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2015-12-29 09:07:07 UTC
Last updated 2016-01-08 09:05:37 UTC
</div>
</div>
</body>
......
pkg/api/deep_copy_generated.go
View file @ 3a9de6ee
......@@ -40,6 +40,7 @@ func init() {
deepCopy_api_ComponentStatus,
deepCopy_api_ComponentStatusList,
deepCopy_api_Container,
deepCopy_api_ContainerImage,
deepCopy_api_ContainerPort,
deepCopy_api_ContainerState,
deepCopy_api_ContainerStateRunning,
......@@ -392,6 +393,18 @@ func deepCopy_api_Container(in Container, out *Container, c *conversion.Cloner)
return nil
}
func deepCopy_api_ContainerImage(in ContainerImage, out *ContainerImage, c *conversion.Cloner) error {
if in.RepoTags != nil {
in, out := in.RepoTags, &out.RepoTags
*out = make([]string, len(in))
copy(*out, in)
} else {
out.RepoTags = nil
}
out.Size = in.Size
return nil
}
func deepCopy_api_ContainerPort(in ContainerPort, out *ContainerPort, c *conversion.Cloner) error {
out.Name = in.Name
out.HostPort = in.HostPort
......@@ -1304,6 +1317,17 @@ func deepCopy_api_NodeStatus(in NodeStatus, out *NodeStatus, c *conversion.Clone
if err := deepCopy_api_NodeSystemInfo(in.NodeInfo, &out.NodeInfo, c); err != nil {
return err
}
if in.Images != nil {
in, out := in.Images, &out.Images
*out = make([]ContainerImage, len(in))
for i := range in {
if err := deepCopy_api_ContainerImage(in[i], &(*out)[i], c); err != nil {
return err
}
}
} else {
out.Images = nil
}
return nil
}
......
pkg/api/types.generated.go
View file @ 3a9de6ee
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/v1/conversion_generated.go
View file @ 3a9de6ee
......@@ -307,6 +307,26 @@ func Convert_api_Container_To_v1_Container(in *api.Container, out *Container, s
return autoConvert_api_Container_To_v1_Container(in, out, s)
}
func autoConvert_api_ContainerImage_To_v1_ContainerImage(in *api.ContainerImage, out *ContainerImage, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*api.ContainerImage))(in)
}
if in.RepoTags != nil {
out.RepoTags = make([]string, len(in.RepoTags))
for i := range in.RepoTags {
out.RepoTags[i] = in.RepoTags[i]
}
} else {
out.RepoTags = nil
}
out.Size = in.Size
return nil
}
func Convert_api_ContainerImage_To_v1_ContainerImage(in *api.ContainerImage, out *ContainerImage, s conversion.Scope) error {
return autoConvert_api_ContainerImage_To_v1_ContainerImage(in, out, s)
}
func autoConvert_api_ContainerPort_To_v1_ContainerPort(in *api.ContainerPort, out *ContainerPort, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*api.ContainerPort))(in)
......@@ -1500,6 +1520,16 @@ func autoConvert_api_NodeStatus_To_v1_NodeStatus(in *api.NodeStatus, out *NodeSt
if err := Convert_api_NodeSystemInfo_To_v1_NodeSystemInfo(&in.NodeInfo, &out.NodeInfo, s); err != nil {
return err
}
if in.Images != nil {
out.Images = make([]ContainerImage, len(in.Images))
for i := range in.Images {
if err := Convert_api_ContainerImage_To_v1_ContainerImage(&in.Images[i], &out.Images[i], s); err != nil {
return err
}
}
} else {
out.Images = nil
}
return nil
}
......@@ -3466,6 +3496,26 @@ func Convert_v1_Container_To_api_Container(in *Container, out *api.Container, s
return autoConvert_v1_Container_To_api_Container(in, out, s)
}
func autoConvert_v1_ContainerImage_To_api_ContainerImage(in *ContainerImage, out *api.ContainerImage, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*ContainerImage))(in)
}
if in.RepoTags != nil {
out.RepoTags = make([]string, len(in.RepoTags))
for i := range in.RepoTags {
out.RepoTags[i] = in.RepoTags[i]
}
} else {
out.RepoTags = nil
}
out.Size = in.Size
return nil
}
func Convert_v1_ContainerImage_To_api_ContainerImage(in *ContainerImage, out *api.ContainerImage, s conversion.Scope) error {
return autoConvert_v1_ContainerImage_To_api_ContainerImage(in, out, s)
}
func autoConvert_v1_ContainerPort_To_api_ContainerPort(in *ContainerPort, out *api.ContainerPort, s conversion.Scope) error {
if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
defaulting.(func(*ContainerPort))(in)
......@@ -4675,6 +4725,16 @@ func autoConvert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *api.NodeSt
if err := Convert_v1_NodeSystemInfo_To_api_NodeSystemInfo(&in.NodeInfo, &out.NodeInfo, s); err != nil {
return err
}
if in.Images != nil {
out.Images = make([]api.ContainerImage, len(in.Images))
for i := range in.Images {
if err := Convert_v1_ContainerImage_To_api_ContainerImage(&in.Images[i], &out.Images[i], s); err != nil {
return err
}
}
} else {
out.Images = nil
}
return nil
}
......@@ -6358,6 +6418,7 @@ func init() {
autoConvert_api_ComponentCondition_To_v1_ComponentCondition,
autoConvert_api_ComponentStatusList_To_v1_ComponentStatusList,
autoConvert_api_ComponentStatus_To_v1_ComponentStatus,
autoConvert_api_ContainerImage_To_v1_ContainerImage,
autoConvert_api_ContainerPort_To_v1_ContainerPort,
autoConvert_api_ContainerStateRunning_To_v1_ContainerStateRunning,
autoConvert_api_ContainerStateTerminated_To_v1_ContainerStateTerminated,
......@@ -6478,6 +6539,7 @@ func init() {
autoConvert_v1_ComponentCondition_To_api_ComponentCondition,
autoConvert_v1_ComponentStatusList_To_api_ComponentStatusList,
autoConvert_v1_ComponentStatus_To_api_ComponentStatus,
autoConvert_v1_ContainerImage_To_api_ContainerImage,
autoConvert_v1_ContainerPort_To_api_ContainerPort,
autoConvert_v1_ContainerStateRunning_To_api_ContainerStateRunning,
autoConvert_v1_ContainerStateTerminated_To_api_ContainerStateTerminated,
......
pkg/api/v1/deep_copy_generated.go
View file @ 3a9de6ee
......@@ -277,6 +277,19 @@ func deepCopy_v1_Container(in Container, out *Container, c *conversion.Cloner) e
return nil
}
func deepCopy_v1_ContainerImage(in ContainerImage, out *ContainerImage, c *conversion.Cloner) error {
if in.RepoTags != nil {
out.RepoTags = make([]string, len(in.RepoTags))
for i := range in.RepoTags {
out.RepoTags[i] = in.RepoTags[i]
}
} else {
out.RepoTags = nil
}
out.Size = in.Size
return nil
}
func deepCopy_v1_ContainerPort(in ContainerPort, out *ContainerPort, c *conversion.Cloner) error {
out.Name = in.Name
out.HostPort = in.HostPort
......@@ -1096,6 +1109,16 @@ func deepCopy_v1_NodeStatus(in NodeStatus, out *NodeStatus, c *conversion.Cloner
if err := deepCopy_v1_NodeSystemInfo(in.NodeInfo, &out.NodeInfo, c); err != nil {
return err
}
if in.Images != nil {
out.Images = make([]ContainerImage, len(in.Images))
for i := range in.Images {
if err := deepCopy_v1_ContainerImage(in.Images[i], &out.Images[i], c); err != nil {
return err
}
}
} else {
out.Images = nil
}
return nil
}
......@@ -2441,6 +2464,7 @@ func init() {
deepCopy_v1_ComponentStatus,
deepCopy_v1_ComponentStatusList,
deepCopy_v1_Container,
deepCopy_v1_ContainerImage,
deepCopy_v1_ContainerPort,
deepCopy_v1_ContainerState,
deepCopy_v1_ContainerStateRunning,
......
pkg/api/v1/types.generated.go
View file @ 3a9de6ee
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/v1/types_swagger_doc_generated.go
View file @ 3a9de6ee
......@@ -141,6 +141,16 @@ func (Container) SwaggerDoc() map[string]string {
return map_Container
}
var map_ContainerImage = map[string]string{
"": "Describe a container image",
"repoTags": "Names by which this image is known. e.g. [\"gcr.io/google_containers/hyperkube:v1.0.7\", \"dockerhub.io/google_containers/hyperkube:v1.0.7\"]",
"size": "The size of the image in bytes.",
}
func (ContainerImage) SwaggerDoc() map[string]string {
return map_ContainerImage
}
var map_ContainerPort = map[string]string{
"": "ContainerPort represents a network port in a single container.",
"name": "If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.",
......@@ -732,6 +742,7 @@ var map_NodeStatus = map[string]string{
"addresses": "List of addresses reachable to the node. Queried from cloud provider, if available. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-addresses",
"daemonEndpoints": "Endpoints of daemons running on the Node.",
"nodeInfo": "Set of ids/uuids to uniquely identify the node. More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-info",
"images": "List of container images on this node",
}
func (NodeStatus) SwaggerDoc() map[string]string {
......
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