vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Vendor: Update k8s version

Browse source 
Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
This commit is contained in:
Michał Żyłowski 2017-02-03 14:41:32 +01:00
parent dfa93414c5
commit 52baf68d50
3756 changed files with 113013 additions and 92675 deletions
Download patch file Download diff file Expand all files Collapse all files

2
vendor/k8s.io/kubernetes/pkg/util/node/node.go generated vendored
View file

@ -177,7 +177,7 @@ func PatchNodeStatus(c clientset.Interface, nodeName types.NodeName, oldNode *v1
return nil, fmt.Errorf("failed to create patch for node %q: %v", nodeName, err)
}
updatedNode, err := c.Core().Nodes().Patch(string(nodeName), api.StrategicMergePatchType, patchBytes, "status")
updatedNode, err := c.Core().Nodes().Patch(string(nodeName), types.StrategicMergePatchType, patchBytes, "status")
if err != nil {
return nil, fmt.Errorf("failed to patch status %q for node %q: %v", patchBytes, nodeName, err)
}

2
vendor/k8s.io/kubernetes/pkg/util/node/node_test.go generated vendored
View file

@ -72,7 +72,7 @@ func TestGetPreferredAddress(t *testing.T) {
for k, tc := range testcases {
node := &v1.Node{
ObjectMeta: v1.ObjectMeta{Labels: tc.Labels},
ObjectMeta: metav1.ObjectMeta{Labels: tc.Labels},
Status: v1.NodeStatus{Addresses: tc.Addresses},
}
address, err := GetPreferredNodeAddress(node, tc.Preferences)