Skip to content

K
k3s
Commit 0babf0ed authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30270 from ZJU-SEL/fix-minor-mistakes

Automatic merge from submit-queue fix minor mistakes <!-- Checklist for submitting a Pull Request Please remove this comment block before submitting. 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 3. If you want this PR to automatically close an issue when it is merged, add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>` to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests). 4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. --> Signed-off-by: 's avatarXianglin Gao <xlgao@zju.edu.cn>
parents 6a1c63fd 3b8f932e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/kubelet/api/v1alpha1/runtime/api.pb.go
View file @ 0babf0ed
...@@ -1575,7 +1575,7 @@ type ContainerFilter struct { ...@@ -1575,7 +1575,7 @@ type ContainerFilter struct {
Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
// ID of the container. // ID of the container.
Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"` Id *string `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
// State of the contianer. // State of the container.
State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"` State *ContainerState `protobuf:"varint,3,opt,name=state,enum=runtime.ContainerState" json:"state,omitempty"`
// The id of the pod sandbox // The id of the pod sandbox
PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"` PodSandboxId *string `protobuf:"bytes,4,opt,name=pod_sandbox_id,json=podSandboxId" json:"pod_sandbox_id,omitempty"`
......
pkg/kubelet/api/v1alpha1/runtime/api.proto
View file @ 0babf0ed
...@@ -464,7 +464,7 @@ message ContainerFilter { ...@@ -464,7 +464,7 @@ message ContainerFilter {
optional string name = 1; optional string name = 1;
// ID of the container. // ID of the container.
optional string id = 2; optional string id = 2;
// State of the contianer. // State of the container.
optional ContainerState state = 3; optional ContainerState state = 3;
// The id of the pod sandbox // The id of the pod sandbox
optional string pod_sandbox_id = 4; optional string pod_sandbox_id = 4;
......
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