github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Also update CRI to indicate runtimes should not update empty CIDR

Browse Source
This commit is contained in:
Pengfei Ni
2018-04-27 11:14:43 +08:00
parent 335d70a6d1
commit 91c6cfed2f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3052,7 +3052,8 @@ func (*RemoveImageResponse) ProtoMessage() {}
func (*RemoveImageResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{76} } func (*RemoveImageResponse) Descriptor() ([]byte, []int) { return fileDescriptorApi, []int{76} }
type NetworkConfig struct { type NetworkConfig struct {
// CIDR to use for pod IP addresses. // CIDR to use for pod IP addresses. If the CIDR is empty, runtimes
// should omit it.
PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"` PodCidr string `protobuf:"bytes,1,opt,name=pod_cidr,json=podCidr,proto3" json:"pod_cidr,omitempty"`
} }

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

@@ -1047,7 +1047,8 @@ message RemoveImageRequest {
message RemoveImageResponse {} message RemoveImageResponse {}
message NetworkConfig { message NetworkConfig {
// CIDR to use for pod IP addresses. // CIDR to use for pod IP addresses. If the CIDR is empty, runtimes
// should omit it.
string pod_cidr = 1; string pod_cidr = 1;
} }