Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kubelet Volume Attach/Detach/Mount/Unmount Redesign #26801

Merged
merged 3 commits into from
Jun 15, 2016
Merged

Kubelet Volume Attach/Detach/Mount/Unmount Redesign #26801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b6a505
Rename UniqueDeviceName to UniqueVolumeName
saad-ali May 30, 2016
542f2dc
Introduce new kubelet volume manager
saad-ali May 30, 2016
cfab536
Remove spam log messages from gce pd
saad-ali Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api/swagger-spec/v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16765,9 +16765,9 @@
"volumesInUse": {
"type": "array",
"items": {
"$ref": "v1.UniqueDeviceName"
"$ref": "v1.UniqueVolumeName"
},
"description": "List of volumes in use (mounted) by the node."
"description": "List of attachable volumes in use (mounted) by the node."
}
}
},
Expand Down Expand Up @@ -16926,8 +16926,8 @@
}
}
},
"v1.UniqueDeviceName": {
"id": "v1.UniqueDeviceName",
"v1.UniqueVolumeName": {
"id": "v1.UniqueVolumeName",
"properties": {}
},
"v1.PersistentVolumeClaimList": {
Expand Down
14 changes: 7 additions & 7 deletions docs/api-reference/v1/definitions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,10 +594,6 @@ <h3 id="_v1_persistentvolumeclaimlist">v1.PersistentVolumeClaimList</h3>
</tbody>
</table>

</div>
<div class="sect2">
<h3 id="_v1_uniquedevicename">v1.UniqueDeviceName</h3>

</div>
<div class="sect2">
<h3 id="_v1_preconditions">v1.Preconditions</h3>
Expand Down Expand Up @@ -2770,6 +2766,10 @@ <h3 id="_v1_persistentvolumeclaimstatus">v1.PersistentVolumeClaimStatus</h3>
</tbody>
</table>

</div>
<div class="sect2">
<h3 id="_v1_uniquevolumename">v1.UniqueVolumeName</h3>

</div>
<div class="sect2">
<h3 id="_unversioned_labelselector">unversioned.LabelSelector</h3>
Expand Down Expand Up @@ -4757,9 +4757,9 @@ <h3 id="_v1_nodestatus">v1.NodeStatus</h3>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">volumesInUse</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">List of volumes in use (mounted) by the node.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">List of attachable volumes in use (mounted) by the node.</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"><a href="#_v1_uniquedevicename">v1.UniqueDeviceName</a> array</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_uniquevolumename">v1.UniqueVolumeName</a> array</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
</tbody>
Expand Down Expand Up @@ -8105,7 +8105,7 @@ <h3 id="_any">any</h3>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-06-06 17:05:06 UTC
Last updated 2016-06-08 04:10:38 UTC
</div>
</div>
</body>
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/deep_copy_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,7 +1603,7 @@ func DeepCopy_api_NodeStatus(in NodeStatus, out *NodeStatus, c *conversion.Clone
}
if in.VolumesInUse != nil {
in, out := in.VolumesInUse, &out.VolumesInUse
*out = make([]UniqueDeviceName, len(in))
*out = make([]UniqueVolumeName, len(in))
for i := range in {
(*out)[i] = in[i]
}
Expand Down
32 changes: 16 additions & 16 deletions pkg/api/types.generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36754,7 +36754,7 @@ func (x *NodeStatus) CodecEncodeSelf(e *codec1978.Encoder) {
_ = yym32
if false {
} else {
h.encSliceUniqueDeviceName(([]UniqueDeviceName)(x.VolumesInUse), e)
h.encSliceUniqueVolumeName(([]UniqueVolumeName)(x.VolumesInUse), e)
}
}
} else {
Expand All @@ -36772,7 +36772,7 @@ func (x *NodeStatus) CodecEncodeSelf(e *codec1978.Encoder) {
_ = yym33
if false {
} else {
h.encSliceUniqueDeviceName(([]UniqueDeviceName)(x.VolumesInUse), e)
h.encSliceUniqueVolumeName(([]UniqueVolumeName)(x.VolumesInUse), e)
}
}
}
Expand Down Expand Up @@ -36917,7 +36917,7 @@ func (x *NodeStatus) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
_ = yym16
if false {
} else {
h.decSliceUniqueDeviceName((*[]UniqueDeviceName)(yyv15), d)
h.decSliceUniqueVolumeName((*[]UniqueVolumeName)(yyv15), d)
}
}
default:
Expand Down Expand Up @@ -37103,7 +37103,7 @@ func (x *NodeStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
_ = yym30
if false {
} else {
h.decSliceUniqueDeviceName((*[]UniqueDeviceName)(yyv29), d)
h.decSliceUniqueVolumeName((*[]UniqueVolumeName)(yyv29), d)
}
}
for {
Expand All @@ -37122,7 +37122,7 @@ func (x *NodeStatus) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}

func (x UniqueDeviceName) CodecEncodeSelf(e *codec1978.Encoder) {
func (x UniqueVolumeName) CodecEncodeSelf(e *codec1978.Encoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperEncoder(e)
_, _, _ = h, z, r
Expand All @@ -37135,7 +37135,7 @@ func (x UniqueDeviceName) CodecEncodeSelf(e *codec1978.Encoder) {
}
}

func (x *UniqueDeviceName) CodecDecodeSelf(d *codec1978.Decoder) {
func (x *UniqueVolumeName) CodecDecodeSelf(d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
Expand Down Expand Up @@ -57367,7 +57367,7 @@ func (x codecSelfer1234) decSliceContainerImage(v *[]ContainerImage, d *codec197
}
}

func (x codecSelfer1234) encSliceUniqueDeviceName(v []UniqueDeviceName, e *codec1978.Encoder) {
func (x codecSelfer1234) encSliceUniqueVolumeName(v []UniqueVolumeName, e *codec1978.Encoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperEncoder(e)
_, _, _ = h, z, r
Expand All @@ -57379,7 +57379,7 @@ func (x codecSelfer1234) encSliceUniqueDeviceName(v []UniqueDeviceName, e *codec
z.EncSendContainerState(codecSelfer_containerArrayEnd1234)
}

func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *codec1978.Decoder) {
func (x codecSelfer1234) decSliceUniqueVolumeName(v *[]UniqueVolumeName, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
Expand All @@ -57390,7 +57390,7 @@ func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *code
_ = yyc1
if yyl1 == 0 {
if yyv1 == nil {
yyv1 = []UniqueDeviceName{}
yyv1 = []UniqueVolumeName{}
yyc1 = true
} else if len(yyv1) != 0 {
yyv1 = yyv1[:0]
Expand All @@ -57408,10 +57408,10 @@ func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *code
if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1]
} else {
yyv1 = make([]UniqueDeviceName, yyrl1)
yyv1 = make([]UniqueVolumeName, yyrl1)
}
} else {
yyv1 = make([]UniqueDeviceName, yyrl1)
yyv1 = make([]UniqueVolumeName, yyrl1)
}
yyc1 = true
yyrr1 = len(yyv1)
Expand All @@ -57425,7 +57425,7 @@ func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *code
if r.TryDecodeAsNil() {
yyv1[yyj1] = ""
} else {
yyv1[yyj1] = UniqueDeviceName(r.DecodeString())
yyv1[yyj1] = UniqueVolumeName(r.DecodeString())
}

}
Expand All @@ -57436,7 +57436,7 @@ func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *code
if r.TryDecodeAsNil() {
yyv1[yyj1] = ""
} else {
yyv1[yyj1] = UniqueDeviceName(r.DecodeString())
yyv1[yyj1] = UniqueVolumeName(r.DecodeString())
}

}
Expand All @@ -57447,15 +57447,15 @@ func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *code
for ; !r.CheckBreak(); yyj1++ {

if yyj1 >= len(yyv1) {
yyv1 = append(yyv1, "") // var yyz1 UniqueDeviceName
yyv1 = append(yyv1, "") // var yyz1 UniqueVolumeName
yyc1 = true
}
yyh1.ElemContainerState(yyj1)
if yyj1 < len(yyv1) {
if r.TryDecodeAsNil() {
yyv1[yyj1] = ""
} else {
yyv1[yyj1] = UniqueDeviceName(r.DecodeString())
yyv1[yyj1] = UniqueVolumeName(r.DecodeString())
}

} else {
Expand All @@ -57467,7 +57467,7 @@ func (x codecSelfer1234) decSliceUniqueDeviceName(v *[]UniqueDeviceName, d *code
yyv1 = yyv1[:yyj1]
yyc1 = true
} else if yyj1 == 0 && yyv1 == nil {
yyv1 = []UniqueDeviceName{}
yyv1 = []UniqueVolumeName{}
yyc1 = true
}
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1987,11 +1987,11 @@ type NodeStatus struct {
NodeInfo NodeSystemInfo `json:"nodeInfo,omitempty"`
// List of container images on this node
Images []ContainerImage `json:"images,omitempty"`
// List of attachable volume devices in use (mounted) by the node.
VolumesInUse []UniqueDeviceName `json:"volumesInUse,omitempty"`
// List of attachable volumes in use (mounted) by the node.
VolumesInUse []UniqueVolumeName `json:"volumesInUse,omitempty"`
}

type UniqueDeviceName string
type UniqueVolumeName string

// Describe a container image
type ContainerImage struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/v1/conversion_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3390,9 +3390,9 @@ func autoConvert_v1_NodeStatus_To_api_NodeStatus(in *NodeStatus, out *api.NodeSt
}
if in.VolumesInUse != nil {
in, out := &in.VolumesInUse, &out.VolumesInUse
*out = make([]api.UniqueDeviceName, len(*in))
*out = make([]api.UniqueVolumeName, len(*in))
for i := range *in {
(*out)[i] = api.UniqueDeviceName((*in)[i])
(*out)[i] = api.UniqueVolumeName((*in)[i])
}
} else {
out.VolumesInUse = nil
Expand Down Expand Up @@ -3473,9 +3473,9 @@ func autoConvert_api_NodeStatus_To_v1_NodeStatus(in *api.NodeStatus, out *NodeSt
}
if in.VolumesInUse != nil {
in, out := &in.VolumesInUse, &out.VolumesInUse
*out = make([]UniqueDeviceName, len(*in))
*out = make([]UniqueVolumeName, len(*in))
for i := range *in {
(*out)[i] = UniqueDeviceName((*in)[i])
(*out)[i] = UniqueVolumeName((*in)[i])
}
} else {
out.VolumesInUse = nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/deep_copy_generated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1550,7 +1550,7 @@ func DeepCopy_v1_NodeStatus(in NodeStatus, out *NodeStatus, c *conversion.Cloner
}
if in.VolumesInUse != nil {
in, out := in.VolumesInUse, &out.VolumesInUse
*out = make([]UniqueDeviceName, len(in))
*out = make([]UniqueVolumeName, len(in))
for i := range in {
(*out)[i] = in[i]
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/generated.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/api/v1/generated.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading