Skip to content

Commit

Permalink
Merge pull request kubernetes#18498 from feihujiang/fixDocOfNetworkPl…
Browse files Browse the repository at this point in the history
…uginVersion

Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Dec 10, 2015
2 parents 06c8b34 + 5cfdcfd commit 34c32a5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/kubelet/network/exec/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
// will mean the container runtime (docker) will be asked for the PodIP
// e.g. {
// "apiVersion" : "v1",
// "apiVersion" : "v1beta1",
// "kind" : "PodNetworkStatus",
// "ip" : "10.20.30.40"
// }
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/network/plugins.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ type NetworkPlugin interface {
}

// 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 {
unversioned.TypeMeta `json:",inline"`

Expand Down

0 comments on commit 34c32a5

Please sign in to comment.