Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
5bedff66
Unverified
Commit
5bedff66
authored
Feb 08, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 08, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #73836 from Random-Liu/clarify-hostname-in-cri
Clarify hostname emptiness in CRI.
parents
f0b72df4
5b86ee1c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
api.pb.go
pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go
+2
-1
api.proto
pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto
+2
-1
No files found.
pkg/kubelet/apis/cri/runtime/v1alpha2/api.pb.go
View file @
5bedff66
...
@@ -736,7 +736,8 @@ type PodSandboxConfig struct {
...
@@ -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.
...
...
pkg/kubelet/apis/cri/runtime/v1alpha2/api.proto
View file @
5bedff66
...
@@ -313,7 +313,8 @@ message PodSandboxConfig {
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment