github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18498 from feihujiang/fixDocOfNetworkPluginVersion

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-10 09:44:32 -08:00
commit 34c32a5615
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/network/exec/exec.go
View File

@ -33,7 +33,7 @@ limitations under the License.
// formatted output indicating the pod's IPAddress(v4/v6). An empty string value or an erroneous output // formatted output indicating the pod's IPAddress(v4/v6). An empty string value or an erroneous output
// will mean the container runtime (docker) will be asked for the PodIP // will mean the container runtime (docker) will be asked for the PodIP
// e.g. { // e.g. {
// "apiVersion" : "v1", // "apiVersion" : "v1beta1",
// "kind" : "PodNetworkStatus", // "kind" : "PodNetworkStatus",
// "ip" : "10.20.30.40" // "ip" : "10.20.30.40"
// } // }

2
pkg/kubelet/network/plugins.go
View File

@ -56,7 +56,7 @@ type NetworkPlugin interface {
} }
// PodNetworkStatus stores the network status of a pod (currently just the primary IP address) // PodNetworkStatus stores the network status of a pod (currently just the primary IP address)
// This struct represents version "v1" // This struct represents version "v1beta1"
type PodNetworkStatus struct { type PodNetworkStatus struct {
unversioned.TypeMeta `json:",inline"` unversioned.TypeMeta `json:",inline"`