github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114759 from my-git9/chore/k8staint

Browse Source 
chore: add k8s node-role.kubernetes.io/control-plane taint
This commit is contained in:
Kubernetes Prow Robot 2023-01-31 21:01:17 -08:00 committed by GitHub
commit bb7c9739a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/printers/internalversion/printers_test.go
View File

@ -612,11 +612,11 @@ func TestPrintNodeRole(t *testing.T) {
node: api.Node{ node: api.Node{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo10", Name: "foo10",
Labels: map[string]string{"node-role.kubernetes.io/master": "", "node-role.kubernetes.io/proxy": "", "kubernetes.io/role": "node"}, Labels: map[string]string{"node-role.kubernetes.io/master": "", "node-role.kubernetes.io/control-plane": "", "node-role.kubernetes.io/proxy": "", "kubernetes.io/role": "node"},
}, },
}, },
// Columns: Name, Status, Roles, Age, KubeletVersion // Columns: Name, Status, Roles, Age, KubeletVersion
expected: []metav1.TableRow{{Cells: []interface{}{"foo10", "Unknown", "master,node,proxy", "<unknown>", ""}}}, expected: []metav1.TableRow{{Cells: []interface{}{"foo10", "Unknown", "control-plane,master,node,proxy", "<unknown>", ""}}},
}, },
{ {
node: api.Node{ node: api.Node{

3
test/e2e_node/testing-manifests/sriovdp-ds.yaml
View File

@ -25,6 +25,9 @@ spec:
- key: node-role.kubernetes.io/master - key: node-role.kubernetes.io/master
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
operator: Exists
effect: NoSchedule
serviceAccountName: sriov-device-plugin serviceAccountName: sriov-device-plugin
containers: containers:
- name: kube-sriovdp - name: kube-sriovdp