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
f1258dca
Commit
f1258dca
authored
Oct 14, 2016
by
Ivan Shvedunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos
parent
9b3ca2fb
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
5 deletions
+5
-5
controller_utils.go
pkg/controller/controller_utils.go
+1
-1
apply.go
pkg/kubectl/apply.go
+1
-1
builder.go
pkg/kubectl/resource/builder.go
+1
-1
docker_container_test.go
pkg/kubelet/dockershim/docker_container_test.go
+1
-1
factory_test.go
plugin/pkg/scheduler/factory/factory_test.go
+1
-1
No files found.
pkg/controller/controller_utils.go
View file @
f1258dca
...
...
@@ -348,7 +348,7 @@ func NewUIDTrackingControllerExpectations(ce ControllerExpectationsInterface) *U
type
PodControlInterface
interface
{
// CreatePods creates new pods according to the spec.
CreatePods
(
namespace
string
,
template
*
api
.
PodTemplateSpec
,
object
runtime
.
Object
)
error
// CreatePodsOnNode creates a new pod accor
t
ing to the spec on the specified node.
// CreatePodsOnNode creates a new pod accor
d
ing to the spec on the specified node.
CreatePodsOnNode
(
nodeName
,
namespace
string
,
template
*
api
.
PodTemplateSpec
,
object
runtime
.
Object
)
error
// CreatePodsWithControllerRef creates new pods according to the spec, and sets object as the pod's controller.
CreatePodsWithControllerRef
(
namespace
string
,
template
*
api
.
PodTemplateSpec
,
object
runtime
.
Object
,
controllerRef
*
api
.
OwnerReference
)
error
...
...
pkg/kubectl/apply.go
View file @
f1258dca
...
...
@@ -71,7 +71,7 @@ func SetOriginalConfiguration(info *resource.Info, original []byte) error {
}
// GetModifiedConfiguration retrieves the modified configuration of the object.
// If annotate is true, it embeds the result as an anotation in the modified
// If annotate is true, it embeds the result as an an
n
otation in the modified
// configuration. If an object was read from the command input, it will use that
// version of the object. Otherwise, it will use the version from the server.
func
GetModifiedConfiguration
(
info
*
resource
.
Info
,
annotate
bool
,
codec
runtime
.
Encoder
)
([]
byte
,
error
)
{
...
...
pkg/kubectl/resource/builder.go
View file @
f1258dca
...
...
@@ -291,7 +291,7 @@ func (b *Builder) DefaultNamespace() *Builder {
}
// AllNamespaces instructs the builder to use NamespaceAll as a namespace to request resources
// acro
ll all
namespace. This overrides the namespace set by NamespaceParam().
// acro
ss all of the
namespace. This overrides the namespace set by NamespaceParam().
func
(
b
*
Builder
)
AllNamespaces
(
allNamespace
bool
)
*
Builder
{
if
allNamespace
{
b
.
namespace
=
api
.
NamespaceAll
...
...
pkg/kubelet/dockershim/docker_container_test.go
View file @
f1258dca
...
...
@@ -52,7 +52,7 @@ func TestListContainers(t *testing.T) {
s
:=
makeSandboxConfig
(
fmt
.
Sprintf
(
"%s%d"
,
podName
,
i
),
fmt
.
Sprintf
(
"%s%d"
,
namespace
,
i
),
fmt
.
Sprintf
(
"%d"
,
i
),
0
)
labels
:=
map
[
string
]
string
{
"abc.xyz"
:
fmt
.
Sprintf
(
"label%d"
,
i
)}
annotations
:=
map
[
string
]
string
{
"foo.bar.baz"
:
fmt
.
Sprintf
(
"annotaion%d"
,
i
)}
annotations
:=
map
[
string
]
string
{
"foo.bar.baz"
:
fmt
.
Sprintf
(
"annota
t
ion%d"
,
i
)}
c
:=
makeContainerConfig
(
s
,
fmt
.
Sprintf
(
"%s%d"
,
containerName
,
i
),
fmt
.
Sprintf
(
"%s:v%d"
,
image
,
i
),
uint32
(
i
),
labels
,
annotations
)
sConfigs
=
append
(
sConfigs
,
s
)
...
...
plugin/pkg/scheduler/factory/factory_test.go
View file @
f1258dca
...
...
@@ -322,7 +322,7 @@ func TestResponsibleForPod(t *testing.T) {
factoryDefaultScheduler
:=
NewConfigFactory
(
client
,
api
.
DefaultSchedulerName
,
api
.
DefaultHardPodAffinitySymmetricWeight
,
api
.
DefaultFailureDomains
)
// factory of "foo-scheduler"
factoryFooScheduler
:=
NewConfigFactory
(
client
,
"foo-scheduler"
,
api
.
DefaultHardPodAffinitySymmetricWeight
,
api
.
DefaultFailureDomains
)
// scheduler annotaions to be tested
// scheduler annota
t
ions to be tested
schedulerAnnotationFitsDefault
:=
map
[
string
]
string
{
"scheduler.alpha.kubernetes.io/name"
:
"default-scheduler"
}
schedulerAnnotationFitsFoo
:=
map
[
string
]
string
{
"scheduler.alpha.kubernetes.io/name"
:
"foo-scheduler"
}
schedulerAnnotationFitsNone
:=
map
[
string
]
string
{
"scheduler.alpha.kubernetes.io/name"
:
"bar-scheduler"
}
...
...
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