Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
54a578d3
Unverified
Commit
54a578d3
authored
Feb 08, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Feb 08, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #72012 from yeya24/patch-1
fix typos lable -> label
parents
5bedff66
16acbc84
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
predicates_test.go
pkg/scheduler/algorithm/predicates/predicates_test.go
+1
-1
topologies_test.go
pkg/scheduler/algorithm/priorities/util/topologies_test.go
+1
-1
pvc_label_selector.go
test/e2e/storage/vsphere/pvc_label_selector.go
+2
-2
No files found.
pkg/scheduler/algorithm/predicates/predicates_test.go
View file @
54a578d3
...
@@ -3444,7 +3444,7 @@ func TestInterPodAffinityWithMultipleNodes(t *testing.T) {
...
@@ -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 lab
le
Selector matches, we still check if topologyKey matches"
,
name
:
"Test incoming pod's anti-affinity: even if lab
el
Selector matches, we still check if topologyKey matches"
,
},
},
{
{
pod
:
&
v1
.
Pod
{
pod
:
&
v1
.
Pod
{
...
...
pkg/scheduler/algorithm/priorities/util/topologies_test.go
View file @
54a578d3
...
@@ -220,7 +220,7 @@ func TestNodesHaveSameTopologyKey(t *testing.T) {
...
@@ -220,7 +220,7 @@ func TestNodesHaveSameTopologyKey(t *testing.T) {
topologyKey
:
""
,
topologyKey
:
""
,
},
},
{
{
name
:
"nodeA lab
le
nil vs. nodeB{'a':''} by key('a')"
,
name
:
"nodeA lab
el
nil vs. nodeB{'a':''} by key('a')"
,
nodeA
:
&
v1
.
Node
{
nodeA
:
&
v1
.
Node
{
ObjectMeta
:
metav1
.
ObjectMeta
{},
ObjectMeta
:
metav1
.
ObjectMeta
{},
},
},
...
...
test/e2e/storage/vsphere/pvc_label_selector.go
View file @
54a578d3
...
@@ -34,7 +34,7 @@ import (
...
@@ -34,7 +34,7 @@ import (
Test Steps
Test Steps
----------
----------
1. Create VMDK.
1. Create VMDK.
2. Create pv with lab
le
volume-type:ssd, volume path set to vmdk created in previous step, and PersistentVolumeReclaimPolicy is set to Delete.
2. Create pv with lab
el
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,
...
@@ -112,7 +112,7 @@ func testSetupVSpherePVClabelselector(c clientset.Interface, nodeInfo *NodeInfo,
return
return
}
}
By
(
"creating the pv with lab
le
volume-type:ssd"
)
By
(
"creating the pv with lab
el
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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment