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
31aad753
Commit
31aad753
authored
Feb 11, 2018
by
Wang Guoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more concise to merge the array
parent
317853c9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
18 deletions
+10
-18
service_controller_test.go
pkg/controller/service/service_controller_test.go
+2
-3
generic_scheduler_test.go
pkg/scheduler/core/generic_scheduler_test.go
+2
-3
rbd.go
pkg/volume/rbd/rbd.go
+1
-3
gc_admission_test.go
plugin/pkg/admission/gc/gc_admission_test.go
+2
-3
namedcertkey_flag_test.go
.../k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go
+2
-3
resource_collector.go
test/e2e_node/resource_collector.go
+1
-3
No files found.
pkg/controller/service/service_controller_test.go
View file @
31aad753
...
...
@@ -247,9 +247,8 @@ func TestUpdateNodesInExternalLoadBalancer(t *testing.T) {
controller
,
cloud
,
_
:=
newController
()
var
services
[]
*
v1
.
Service
for
_
,
service
:=
range
item
.
services
{
services
=
append
(
services
,
service
)
}
services
=
append
(
services
,
item
.
services
...
)
if
err
:=
controller
.
updateLoadBalancerHosts
(
services
,
nodes
);
err
!=
nil
{
t
.
Errorf
(
"unexpected error: %v"
,
err
)
}
...
...
pkg/scheduler/core/generic_scheduler_test.go
View file @
31aad753
...
...
@@ -403,9 +403,8 @@ func TestGenericScheduler(t *testing.T) {
cache
.
AddNode
(
&
v1
.
Node
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
name
}})
}
pvcs
:=
[]
*
v1
.
PersistentVolumeClaim
{}
for
_
,
pvc
:=
range
test
.
pvcs
{
pvcs
=
append
(
pvcs
,
pvc
)
}
pvcs
=
append
(
pvcs
,
test
.
pvcs
...
)
pvcLister
:=
schedulertesting
.
FakePersistentVolumeClaimLister
(
pvcs
)
scheduler
:=
NewGenericScheduler
(
...
...
pkg/volume/rbd/rbd.go
View file @
31aad753
...
...
@@ -590,9 +590,7 @@ func (r *rbdVolumeProvisioner) Provision() (*v1.PersistentVolume, error) {
switch
dstrings
.
ToLower
(
k
)
{
case
"monitors"
:
arr
:=
dstrings
.
Split
(
v
,
","
)
for
_
,
m
:=
range
arr
{
r
.
Mon
=
append
(
r
.
Mon
,
m
)
}
r
.
Mon
=
append
(
r
.
Mon
,
arr
...
)
case
"adminid"
:
r
.
adminId
=
v
case
"adminsecretname"
:
...
...
plugin/pkg/admission/gc/gc_admission_test.go
View file @
31aad753
...
...
@@ -276,9 +276,8 @@ func TestGCAdmission(t *testing.T) {
func
TestBlockOwnerDeletionAdmission
(
t
*
testing
.
T
)
{
podWithOwnerRefs
:=
func
(
refs
...
metav1
.
OwnerReference
)
*
api
.
Pod
{
var
refSlice
[]
metav1
.
OwnerReference
for
_
,
ref
:=
range
refs
{
refSlice
=
append
(
refSlice
,
ref
)
}
refSlice
=
append
(
refSlice
,
refs
...
)
return
&
api
.
Pod
{
ObjectMeta
:
metav1
.
ObjectMeta
{
OwnerReferences
:
refSlice
,
...
...
staging/src/k8s.io/apiserver/pkg/util/flag/namedcertkey_flag_test.go
View file @
31aad753
...
...
@@ -112,9 +112,8 @@ func TestNamedCertKeyArrayFlag(t *testing.T) {
for
i
,
test
:=
range
tests
{
fs
:=
pflag
.
NewFlagSet
(
"testNamedCertKeyArray"
,
pflag
.
ContinueOnError
)
var
nkcs
[]
NamedCertKey
for
_
,
d
:=
range
test
.
def
{
nkcs
=
append
(
nkcs
,
d
)
}
nkcs
=
append
(
nkcs
,
test
.
def
...
)
fs
.
Var
(
NewNamedCertKeyArray
(
&
nkcs
),
"tls-sni-cert-key"
,
"usage"
)
args
:=
[]
string
{}
...
...
test/e2e_node/resource_collector.go
View file @
31aad753
...
...
@@ -220,9 +220,7 @@ func (r *ResourceCollector) GetBasicCPUStats(containerName string) map[float64]f
// We must make a copy of array, otherwise the timeseries order is changed.
usages
:=
make
([]
*
framework
.
ContainerResourceUsage
,
0
)
for
_
,
usage
:=
range
r
.
buffers
[
containerName
]
{
usages
=
append
(
usages
,
usage
)
}
usages
=
append
(
usages
,
r
.
buffers
[
containerName
]
...
)
sort
.
Sort
(
resourceUsageByCPU
(
usages
))
for
_
,
q
:=
range
percentiles
{
...
...
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