github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73836 from Random-Liu/clarify-hostname-in-cri 

Clarify hostname emptiness in CRI.
pull/564/head
Kubernetes Prow Robot 2019-02-08 09:06:27 -08:00 committed by GitHub
parent f0b72df47e 5b86ee1c82
commit 5bedff6625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go
View File

@ -736,7 +736,8 @@ type PodSandboxConfig struct {
// operation. The runtime may also use this information to improve UX, such // operation. The runtime may also use this information to improve UX, such
// as by constructing a readable name. // as by constructing a readable name.
Metadata *PodSandboxMetadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"` Metadata *PodSandboxMetadata `protobuf:"bytes,1,opt,name=metadata" json:"metadata,omitempty"`
// Hostname of the sandbox. // Hostname of the sandbox. Hostname could only be empty when the pod
// network namespace is NODE.
Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3" json:"hostname,omitempty"` Hostname string `protobuf:"bytes,2,opt,name=hostname,proto3" json:"hostname,omitempty"`
// Path to the directory on the host in which container log files are // Path to the directory on the host in which container log files are
// stored. // stored.

3
pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto
View File

@ -313,7 +313,8 @@ message PodSandboxConfig {
// operation. The runtime may also use this information to improve UX, such // operation. The runtime may also use this information to improve UX, such
// as by constructing a readable name. // as by constructing a readable name.
PodSandboxMetadata metadata = 1; PodSandboxMetadata metadata = 1;
// Hostname of the sandbox. // Hostname of the sandbox. Hostname could only be empty when the pod
// network namespace is NODE.
string hostname = 2; string hostname = 2;
// Path to the directory on the host in which container log files are // Path to the directory on the host in which container log files are
// stored. // stored.