github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

api changes

Browse Source
This commit is contained in:
Yecheng Fu 2020-07-07 12:58:44 +08:00 committed by Yecheng Fu
parent 125a5f10a6
commit 33a39e5333
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kube-scheduler/extender/v1/types.go
View File

@ -92,6 +92,10 @@ type ExtenderFilterResult struct {
NodeNames *[]string NodeNames *[]string
// Filtered out nodes where the pod can't be scheduled and the failure messages // Filtered out nodes where the pod can't be scheduled and the failure messages
FailedNodes FailedNodesMap FailedNodes FailedNodesMap
// Filtered out nodes where the pod can't be scheduled and preemption would
// not change anything. The value is the failure message same as FailedNodes.
// Nodes specified here takes precedence over FailedNodes.
FailedAndUnresolvableNodes FailedNodesMap
// Error message indicating failure // Error message indicating failure
Error string Error string
} }

3
staging/src/k8s.io/kube-scheduler/extender/v1/types_test.go
View File

@ -70,9 +70,10 @@ func TestCompatibility(t *testing.T) {
Nodes: &corev1.NodeList{Items: []corev1.Node{{ObjectMeta: metav1.ObjectMeta{Name: "nodename"}}}}, Nodes: &corev1.NodeList{Items: []corev1.Node{{ObjectMeta: metav1.ObjectMeta{Name: "nodename"}}}},
NodeNames: &[]string{"node1"}, NodeNames: &[]string{"node1"},
FailedNodes: FailedNodesMap{"foo": "bar"}, FailedNodes: FailedNodesMap{"foo": "bar"},
FailedAndUnresolvableNodes: FailedNodesMap{"baz": "qux"},
Error: "myerror", Error: "myerror",
}, },
expectJSON: `{"Nodes":{"metadata":{},"items":[{"metadata":{"name":"nodename","creationTimestamp":null},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}]},"NodeNames":["node1"],"FailedNodes":{"foo":"bar"},"Error":"myerror"}`, expectJSON: `{"Nodes":{"metadata":{},"items":[{"metadata":{"name":"nodename","creationTimestamp":null},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}]},"NodeNames":["node1"],"FailedNodes":{"foo":"bar"},"FailedAndUnresolvableNodes":{"baz":"qux"},"Error":"myerror"}`,
}, },
{ {
emptyObj: &ExtenderBindingArgs{}, emptyObj: &ExtenderBindingArgs{},

7
staging/src/k8s.io/kube-scheduler/extender/v1/zz_generated.deepcopy.go generated
View File

@ -115,6 +115,13 @@ func (in *ExtenderFilterResult) DeepCopyInto(out *ExtenderFilterResult) {
(*out)[key] = val (*out)[key] = val
} }
} }
if in.FailedAndUnresolvableNodes != nil {
in, out := &in.FailedAndUnresolvableNodes, &out.FailedAndUnresolvableNodes
*out = make(FailedNodesMap, len(*in))
for key, val := range *in {
(*out)[key] = val
}
}
return return
} }