github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72012 from yeya24/patch-1 

fix typos lable -> label
pull/564/head
Kubernetes Prow Robot 2019-02-08 10:36:05 -08:00 committed by GitHub
parent 5bedff6625 16acbc84ce
commit 54a578d3a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/algorithm/predicates/predicates_test.go
View File

@ -3444,7 +3444,7 @@ func TestInterPodAffinityWithMultipleNodes(t *testing.T) {
"nodeA": true, "nodeA": true,
"nodeB": true, "nodeB": true,
}, },
name: "Test incoming pod's anti-affinity: even if lableSelector matches, we still check if topologyKey matches", name: "Test incoming pod's anti-affinity: even if labelSelector matches, we still check if topologyKey matches",
}, },
{ {
pod: &v1.Pod{ pod: &v1.Pod{

2
pkg/scheduler/algorithm/priorities/util/topologies_test.go
View File

@ -220,7 +220,7 @@ func TestNodesHaveSameTopologyKey(t *testing.T) {
topologyKey: "", topologyKey: "",
}, },
{ {
name: "nodeA lable nil vs. nodeB{'a':''} by key('a')", name: "nodeA label nil vs. nodeB{'a':''} by key('a')",
nodeA: &v1.Node{ nodeA: &v1.Node{
ObjectMeta: metav1.ObjectMeta{}, ObjectMeta: metav1.ObjectMeta{},
}, },

4
test/e2e/storage/vsphere/pvc_label_selector.go
View File

@ -34,7 +34,7 @@ import (
Test Steps Test Steps
---------- ----------
1. Create VMDK. 1. Create VMDK.
2. Create pv with lable volume-type:ssd, volume path set to vmdk created in previous step, and PersistentVolumeReclaimPolicy is set to Delete. 2. Create pv with label volume-type:ssd, volume path set to vmdk created in previous step, and PersistentVolumeReclaimPolicy is set to Delete.
3. Create PVC (pvc_vvol) with label selector to match with volume-type:vvol 3. Create PVC (pvc_vvol) with label selector to match with volume-type:vvol
4. Create PVC (pvc_ssd) with label selector to match with volume-type:ssd 4. Create PVC (pvc_ssd) with label selector to match with volume-type:ssd
5. Wait and verify pvc_ssd is bound with PV. 5. Wait and verify pvc_ssd is bound with PV.
@ -112,7 +112,7 @@ func testSetupVSpherePVClabelselector(c clientset.Interface, nodeInfo *NodeInfo,
return return
} }
By("creating the pv with lable volume-type:ssd") By("creating the pv with label volume-type:ssd")
pv_ssd = getVSpherePersistentVolumeSpec(volumePath, v1.PersistentVolumeReclaimDelete, ssdlabels) pv_ssd = getVSpherePersistentVolumeSpec(volumePath, v1.PersistentVolumeReclaimDelete, ssdlabels)
pv_ssd, err = c.CoreV1().PersistentVolumes().Create(pv_ssd) pv_ssd, err = c.CoreV1().PersistentVolumes().Create(pv_ssd)
if err != nil { if err != nil {