github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

CRI: Remove the mount name and port name.

Browse Source 
Per discussion on https://github.com/kubernetes/kubernetes/issues/33873.

Currently the mount name is not being used and also involves some
incorrect usage (sometimes it's referencing a mount name, sometimes
it's referecing a volume name), so we decide to remove it from CRI.

The port name is also not used, so remove it as well.
This commit is contained in:
Yifan Gu
2016-10-03 13:40:18 -07:00
parent d26b4ca285
commit be4e825ac3
5 changed files with 197 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/kubelet/api/v1alpha1/runtime/api.proto
View File

@@ -91,30 +91,26 @@ enum Protocol {
// PortMapping specifies the port mapping configurations of a sandbox.
message PortMapping {
// The name of the port mapping
optional string name = 1;
// The protocol of the port mapping.
optional Protocol protocol = 2;
optional Protocol protocol = 1;
// The port number within the container.
optional int32 container_port = 3;
optional int32 container_port = 2;
// The port number on the host.
optional int32 host_port = 4;
optional int32 host_port = 3;
// The host IP.
optional string host_ip = 5;
optional string host_ip = 4;
}
// Mount specifies a host volume to mount into a container.
message Mount {
// The name of the volume mount.
optional string name = 1;
// The path of the mount within the container.
optional string container_path = 2;
optional string container_path = 1;
// The path of the mount on the host.
optional string host_path = 3;
optional string host_path = 2;
// If set, the mount is read-only.
optional bool readonly = 4;
optional bool readonly = 3;
// If set, the mount needs SELinux relabeling
optional bool selinux_relabel = 5;
optional bool selinux_relabel = 4;
}
// NamespaceOption provides options for Linux namespaces.