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
87c29a08
Commit
87c29a08
authored
Jun 17, 2017
by
supereagle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix typos: remove duplicated word in comments
parent
0f7aa672
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
21 additions
and
21 deletions
+21
-21
load_balancer.py
...ju/layers/kubeapi-load-balancer/reactive/load_balancer.py
+1
-1
util.sh
cluster/photon-controller/util.sh
+1
-1
discovery.go
cmd/kubeadm/app/discovery/discovery.go
+1
-1
golang.sh
hack/lib/golang.sh
+1
-1
defaults.go
pkg/apis/componentconfig/v1alpha1/defaults.go
+1
-1
rollback.go
pkg/controller/deployment/rollback.go
+1
-1
utilization.go
pkg/controller/podautoscaler/metrics/utilization.go
+1
-1
stateful_set.go
pkg/controller/statefulset/stateful_set.go
+1
-1
actual_state_of_world.go
...roller/volume/attachdetach/cache/actual_state_of_world.go
+1
-1
container_manager_linux.go
pkg/kubelet/cm/container_manager_linux.go
+1
-1
helpers.go
pkg/kubelet/container/helpers.go
+1
-1
proxier.go
pkg/proxy/userspace/proxier.go
+1
-1
selector.go
staging/src/k8s.io/apimachinery/pkg/labels/selector.go
+1
-1
config.go
staging/src/k8s.io/apiserver/pkg/server/config.go
+1
-1
handler.go
staging/src/k8s.io/apiserver/pkg/server/handler.go
+1
-1
secretbox.go
...piserver/pkg/storage/value/encrypt/secretbox/secretbox.go
+1
-1
client_pool.go
staging/src/k8s.io/client-go/dynamic/client_pool.go
+1
-1
fifo.go
staging/src/k8s.io/client-go/tools/cache/fifo.go
+1
-1
traverse.go
third_party/forked/gonum/graph/traverse/traverse.go
+2
-2
visit_depth_first.go
third_party/forked/gonum/graph/traverse/visit_depth_first.go
+1
-1
No files found.
cluster/juju/layers/kubeapi-load-balancer/reactive/load_balancer.py
View file @
87c29a08
...
@@ -72,7 +72,7 @@ def install_load_balancer(apiserver, tls):
...
@@ -72,7 +72,7 @@ def install_load_balancer(apiserver, tls):
cert_exists
=
server_cert_path
and
os
.
path
.
isfile
(
server_cert_path
)
cert_exists
=
server_cert_path
and
os
.
path
.
isfile
(
server_cert_path
)
server_key_path
=
layer_options
.
get
(
'server_key_path'
)
server_key_path
=
layer_options
.
get
(
'server_key_path'
)
key_exists
=
server_key_path
and
os
.
path
.
isfile
(
server_key_path
)
key_exists
=
server_key_path
and
os
.
path
.
isfile
(
server_key_path
)
# Do both the
the
key and certificate exist?
# Do both the key and certificate exist?
if
cert_exists
and
key_exists
:
if
cert_exists
and
key_exists
:
# At this point the cert and key exist, and they are owned by root.
# At this point the cert and key exist, and they are owned by root.
chown
=
[
'chown'
,
'www-data:www-data'
,
server_cert_path
]
chown
=
[
'chown'
,
'www-data:www-data'
,
server_cert_path
]
...
...
cluster/photon-controller/util.sh
View file @
87c29a08
...
@@ -636,7 +636,7 @@ function install-kubernetes-on-master {
...
@@ -636,7 +636,7 @@ function install-kubernetes-on-master {
}
}
#
#
# Install Kubernetes on the
the
nodes in parallel
# Install Kubernetes on the nodes in parallel
# This uses the kubernetes-master-salt.sh script created by gen-node-salt
# This uses the kubernetes-master-salt.sh script created by gen-node-salt
# That script uses salt to install Kubernetes
# That script uses salt to install Kubernetes
#
#
...
...
cmd/kubeadm/app/discovery/discovery.go
View file @
87c29a08
...
@@ -33,7 +33,7 @@ const TokenUser = "tls-bootstrap-token-user"
...
@@ -33,7 +33,7 @@ const TokenUser = "tls-bootstrap-token-user"
// For returns a KubeConfig object that can be used for doing the TLS Bootstrap with the right credentials
// For returns a KubeConfig object that can be used for doing the TLS Bootstrap with the right credentials
// Also, before returning anything, it makes sure it can trust the API Server
// Also, before returning anything, it makes sure it can trust the API Server
func
For
(
cfg
*
kubeadmapi
.
NodeConfiguration
)
(
*
clientcmdapi
.
Config
,
error
)
{
func
For
(
cfg
*
kubeadmapi
.
NodeConfiguration
)
(
*
clientcmdapi
.
Config
,
error
)
{
// TODO: Print summary info about the CA certificate, along with the
the
checksum signature
// TODO: Print summary info about the CA certificate, along with the checksum signature
// we also need an ability for the user to configure the client to validate received CA cert against a checksum
// we also need an ability for the user to configure the client to validate received CA cert against a checksum
clusterinfo
,
err
:=
GetValidatedClusterInfoObject
(
cfg
)
clusterinfo
,
err
:=
GetValidatedClusterInfoObject
(
cfg
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
hack/lib/golang.sh
View file @
87c29a08
...
@@ -263,7 +263,7 @@ kube::golang::current_platform() {
...
@@ -263,7 +263,7 @@ kube::golang::current_platform() {
echo
"
$os
/
$arch
"
echo
"
$os
/
$arch
"
}
}
# Takes the
the
platform name ($1) and sets the appropriate golang env variables
# Takes the platform name ($1) and sets the appropriate golang env variables
# for that platform.
# for that platform.
kube::golang::set_platform_envs
()
{
kube::golang::set_platform_envs
()
{
[[
-n
${
1
-
}
]]
||
{
[[
-n
${
1
-
}
]]
||
{
...
...
pkg/apis/componentconfig/v1alpha1/defaults.go
View file @
87c29a08
...
@@ -96,7 +96,7 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) {
...
@@ -96,7 +96,7 @@ func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) {
if
obj
.
Conntrack
.
TCPCloseWaitTimeout
==
zero
{
if
obj
.
Conntrack
.
TCPCloseWaitTimeout
==
zero
{
// See https://github.com/kubernetes/kubernetes/issues/32551.
// See https://github.com/kubernetes/kubernetes/issues/32551.
//
//
// CLOSE_WAIT conntrack state occurs when the
the
Linux kernel
// CLOSE_WAIT conntrack state occurs when the Linux kernel
// sees a FIN from the remote server. Note: this is a half-close
// sees a FIN from the remote server. Note: this is a half-close
// condition that persists as long as the local side keeps the
// condition that persists as long as the local side keeps the
// socket open. The condition is rare as it is typical in most
// socket open. The condition is rare as it is typical in most
...
...
pkg/controller/deployment/rollback.go
View file @
87c29a08
...
@@ -55,7 +55,7 @@ func (dc *DeploymentController) rollback(d *extensions.Deployment, rsList []*ext
...
@@ -55,7 +55,7 @@ func (dc *DeploymentController) rollback(d *extensions.Deployment, rsList []*ext
glog
.
V
(
4
)
.
Infof
(
"Found replica set %q with desired revision %d"
,
rs
.
Name
,
v
)
glog
.
V
(
4
)
.
Infof
(
"Found replica set %q with desired revision %d"
,
rs
.
Name
,
v
)
// rollback by copying podTemplate.Spec from the replica set
// rollback by copying podTemplate.Spec from the replica set
// revision number will be incremented during the next getAllReplicaSetsAndSyncRevision call
// revision number will be incremented during the next getAllReplicaSetsAndSyncRevision call
// no-op if the
the
spec matches current deployment's podTemplate.Spec
// no-op if the spec matches current deployment's podTemplate.Spec
performedRollback
,
err
:=
dc
.
rollbackToTemplate
(
d
,
rs
)
performedRollback
,
err
:=
dc
.
rollbackToTemplate
(
d
,
rs
)
if
performedRollback
&&
err
==
nil
{
if
performedRollback
&&
err
==
nil
{
dc
.
emitRollbackNormalEvent
(
d
,
fmt
.
Sprintf
(
"Rolled back deployment %q to revision %d"
,
d
.
Name
,
*
toRevision
))
dc
.
emitRollbackNormalEvent
(
d
,
fmt
.
Sprintf
(
"Rolled back deployment %q to revision %d"
,
d
.
Name
,
*
toRevision
))
...
...
pkg/controller/podautoscaler/metrics/utilization.go
View file @
87c29a08
...
@@ -21,7 +21,7 @@ import (
...
@@ -21,7 +21,7 @@ import (
)
)
// GetResourceUtilizationRatio takes in a set of metrics, a set of matching requests,
// GetResourceUtilizationRatio takes in a set of metrics, a set of matching requests,
// and a target utilization percentage, and calculates the
the
ratio of
// and a target utilization percentage, and calculates the ratio of
// desired to actual utilization (returning that, the actual utilization, and the raw average value)
// desired to actual utilization (returning that, the actual utilization, and the raw average value)
func
GetResourceUtilizationRatio
(
metrics
PodMetricsInfo
,
requests
map
[
string
]
int64
,
targetUtilization
int32
)
(
utilizationRatio
float64
,
currentUtilization
int32
,
rawAverageValue
int64
,
err
error
)
{
func
GetResourceUtilizationRatio
(
metrics
PodMetricsInfo
,
requests
map
[
string
]
int64
,
targetUtilization
int32
)
(
utilizationRatio
float64
,
currentUtilization
int32
,
rawAverageValue
int64
,
err
error
)
{
metricsTotal
:=
int64
(
0
)
metricsTotal
:=
int64
(
0
)
...
...
pkg/controller/statefulset/stateful_set.go
View file @
87c29a08
...
@@ -400,7 +400,7 @@ func (ssc *StatefulSetController) processNextWorkItem() bool {
...
@@ -400,7 +400,7 @@ func (ssc *StatefulSetController) processNextWorkItem() bool {
return
true
return
true
}
}
// worker runs a worker goroutine that invokes processNextWorkItem until the
the
controller's queue is closed
// worker runs a worker goroutine that invokes processNextWorkItem until the controller's queue is closed
func
(
ssc
*
StatefulSetController
)
worker
()
{
func
(
ssc
*
StatefulSetController
)
worker
()
{
for
ssc
.
processNextWorkItem
()
{
for
ssc
.
processNextWorkItem
()
{
}
}
...
...
pkg/controller/volume/attachdetach/cache/actual_state_of_world.go
View file @
87c29a08
...
@@ -173,7 +173,7 @@ type actualStateOfWorld struct {
...
@@ -173,7 +173,7 @@ type actualStateOfWorld struct {
sync
.
RWMutex
sync
.
RWMutex
}
}
// The volume object represents a volume the
the
attach/detach controller
// The volume object represents a volume the attach/detach controller
// believes to be successfully attached to a node it is managing.
// believes to be successfully attached to a node it is managing.
type
attachedVolume
struct
{
type
attachedVolume
struct
{
// volumeName contains the unique identifier for this volume.
// volumeName contains the unique identifier for this volume.
...
...
pkg/kubelet/cm/container_manager_linux.go
View file @
87c29a08
...
@@ -250,7 +250,7 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
...
@@ -250,7 +250,7 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
return
nil
,
fmt
.
Errorf
(
"invalid configuration: cgroup-root %q doesn't exist: %v"
,
cgroupRoot
,
err
)
return
nil
,
fmt
.
Errorf
(
"invalid configuration: cgroup-root %q doesn't exist: %v"
,
cgroupRoot
,
err
)
}
}
glog
.
Infof
(
"container manager verified user specified cgroup-root exists: %v"
,
cgroupRoot
)
glog
.
Infof
(
"container manager verified user specified cgroup-root exists: %v"
,
cgroupRoot
)
// Include the t
he t
op level cgroup for enforcing node allocatable into cgroup-root.
// Include the top level cgroup for enforcing node allocatable into cgroup-root.
// This way, all sub modules can avoid having to understand the concept of node allocatable.
// This way, all sub modules can avoid having to understand the concept of node allocatable.
cgroupRoot
=
path
.
Join
(
cgroupRoot
,
defaultNodeAllocatableCgroupName
)
cgroupRoot
=
path
.
Join
(
cgroupRoot
,
defaultNodeAllocatableCgroupName
)
}
}
...
...
pkg/kubelet/container/helpers.go
View file @
87c29a08
...
@@ -48,7 +48,7 @@ type HandlerRunner interface {
...
@@ -48,7 +48,7 @@ type HandlerRunner interface {
type
RuntimeHelper
interface
{
type
RuntimeHelper
interface
{
GenerateRunContainerOptions
(
pod
*
v1
.
Pod
,
container
*
v1
.
Container
,
podIP
string
)
(
contOpts
*
RunContainerOptions
,
useClusterFirstPolicy
bool
,
err
error
)
GenerateRunContainerOptions
(
pod
*
v1
.
Pod
,
container
*
v1
.
Container
,
podIP
string
)
(
contOpts
*
RunContainerOptions
,
useClusterFirstPolicy
bool
,
err
error
)
GetClusterDNS
(
pod
*
v1
.
Pod
)
(
dnsServers
[]
string
,
dnsSearches
[]
string
,
useClusterFirstPolicy
bool
,
err
error
)
GetClusterDNS
(
pod
*
v1
.
Pod
)
(
dnsServers
[]
string
,
dnsSearches
[]
string
,
useClusterFirstPolicy
bool
,
err
error
)
// GetPodCgroupParent returns the
the
CgroupName identifer, and its literal cgroupfs form on the host
// GetPodCgroupParent returns the CgroupName identifer, and its literal cgroupfs form on the host
// of a pod.
// of a pod.
GetPodCgroupParent
(
pod
*
v1
.
Pod
)
string
GetPodCgroupParent
(
pod
*
v1
.
Pod
)
string
GetPodDir
(
podUID
types
.
UID
)
string
GetPodDir
(
podUID
types
.
UID
)
string
...
...
pkg/proxy/userspace/proxier.go
View file @
87c29a08
...
@@ -48,7 +48,7 @@ type portal struct {
...
@@ -48,7 +48,7 @@ type portal struct {
// ServiceInfo contains information and state for a particular proxied service
// ServiceInfo contains information and state for a particular proxied service
type
ServiceInfo
struct
{
type
ServiceInfo
struct
{
// Timeout is the
the
read/write timeout (used for UDP connections)
// Timeout is the read/write timeout (used for UDP connections)
Timeout
time
.
Duration
Timeout
time
.
Duration
// ActiveClients is the cache of active UDP clients being proxied by this proxy for this service
// ActiveClients is the cache of active UDP clients being proxied by this proxy for this service
ActiveClients
*
ClientCache
ActiveClients
*
ClientCache
...
...
staging/src/k8s.io/apimachinery/pkg/labels/selector.go
View file @
87c29a08
...
@@ -550,7 +550,7 @@ func (p *Parser) lookahead(context ParserContext) (Token, string) {
...
@@ -550,7 +550,7 @@ func (p *Parser) lookahead(context ParserContext) (Token, string) {
return
tok
,
lit
return
tok
,
lit
}
}
// consume returns current token and string. Increments the
the
position
// consume returns current token and string. Increments the position
func
(
p
*
Parser
)
consume
(
context
ParserContext
)
(
Token
,
string
)
{
func
(
p
*
Parser
)
consume
(
context
ParserContext
)
(
Token
,
string
)
{
p
.
position
++
p
.
position
++
tok
,
lit
:=
p
.
scannedItems
[
p
.
position
-
1
]
.
tok
,
p
.
scannedItems
[
p
.
position
-
1
]
.
literal
tok
,
lit
:=
p
.
scannedItems
[
p
.
position
-
1
]
.
tok
,
p
.
scannedItems
[
p
.
position
-
1
]
.
literal
...
...
staging/src/k8s.io/apiserver/pkg/server/config.go
View file @
87c29a08
...
@@ -67,7 +67,7 @@ import (
...
@@ -67,7 +67,7 @@ import (
)
)
const
(
const
(
// DefaultLegacyAPIPrefix is where the
the
legacy APIs will be located.
// DefaultLegacyAPIPrefix is where the legacy APIs will be located.
DefaultLegacyAPIPrefix
=
"/api"
DefaultLegacyAPIPrefix
=
"/api"
// APIGroupPrefix is where non-legacy API group will be located.
// APIGroupPrefix is where non-legacy API group will be located.
...
...
staging/src/k8s.io/apiserver/pkg/server/handler.go
View file @
87c29a08
...
@@ -62,7 +62,7 @@ type APIServerHandler struct {
...
@@ -62,7 +62,7 @@ type APIServerHandler struct {
// which we don't fit into and it still muddies up swagger. Trying to switch the webservices into a route doesn't work because the
// which we don't fit into and it still muddies up swagger. Trying to switch the webservices into a route doesn't work because the
// containing webservice faces all the same problems listed above.
// containing webservice faces all the same problems listed above.
// This leads to the crazy thing done here. Our mux does what we need, so we'll place it in front of gorestful. It will introspect to
// This leads to the crazy thing done here. Our mux does what we need, so we'll place it in front of gorestful. It will introspect to
// decide if the
the
route is likely to be handled by goresful and route there if needed. Otherwise, it goes to PostGoRestful mux in
// decide if the route is likely to be handled by goresful and route there if needed. Otherwise, it goes to PostGoRestful mux in
// order to handle "normal" paths and delegation. Hopefully no API consumers will ever have to deal with this level of detail. I think
// order to handle "normal" paths and delegation. Hopefully no API consumers will ever have to deal with this level of detail. I think
// we should consider completely removing gorestful.
// we should consider completely removing gorestful.
// Other servers should only use this opaquely to delegate to an API server.
// Other servers should only use this opaquely to delegate to an API server.
...
...
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/secretbox/secretbox.go
View file @
87c29a08
...
@@ -27,7 +27,7 @@ import (
...
@@ -27,7 +27,7 @@ import (
)
)
// secretbox implements at rest encryption of the provided values given a 32 byte secret key.
// secretbox implements at rest encryption of the provided values given a 32 byte secret key.
// Uses a standard 24 byte nonce (placed at the
the
beginning of the cipher text) generated
// Uses a standard 24 byte nonce (placed at the beginning of the cipher text) generated
// from crypto/rand. Does not perform authentication of the data at rest.
// from crypto/rand. Does not perform authentication of the data at rest.
type
secretboxTransformer
struct
{
type
secretboxTransformer
struct
{
key
[
32
]
byte
key
[
32
]
byte
...
...
staging/src/k8s.io/client-go/dynamic/client_pool.go
View file @
87c29a08
...
@@ -56,7 +56,7 @@ type clientPoolImpl struct {
...
@@ -56,7 +56,7 @@ type clientPoolImpl struct {
mapper
meta
.
RESTMapper
mapper
meta
.
RESTMapper
}
}
// NewClientPool returns a ClientPool from the specified config. It reuses clients for the
the
same
// NewClientPool returns a ClientPool from the specified config. It reuses clients for the same
// group version. It is expected this type may be wrapped by specific logic that special cases certain
// group version. It is expected this type may be wrapped by specific logic that special cases certain
// resources or groups.
// resources or groups.
func
NewClientPool
(
config
*
restclient
.
Config
,
mapper
meta
.
RESTMapper
,
apiPathResolverFunc
APIPathResolverFunc
)
ClientPool
{
func
NewClientPool
(
config
*
restclient
.
Config
,
mapper
meta
.
RESTMapper
,
apiPathResolverFunc
APIPathResolverFunc
)
ClientPool
{
...
...
staging/src/k8s.io/client-go/tools/cache/fifo.go
View file @
87c29a08
...
@@ -169,7 +169,7 @@ func (f *FIFO) AddIfNotPresent(obj interface{}) error {
...
@@ -169,7 +169,7 @@ func (f *FIFO) AddIfNotPresent(obj interface{}) error {
return
nil
return
nil
}
}
// addIfNotPresent assumes the fifo lock is already held and adds the
the
provided
// addIfNotPresent assumes the fifo lock is already held and adds the provided
// item to the queue under id if it does not already exist.
// item to the queue under id if it does not already exist.
func
(
f
*
FIFO
)
addIfNotPresent
(
id
string
,
obj
interface
{})
{
func
(
f
*
FIFO
)
addIfNotPresent
(
id
string
,
obj
interface
{})
{
f
.
populated
=
true
f
.
populated
=
true
...
...
third_party/forked/gonum/graph/traverse/traverse.go
View file @
87c29a08
...
@@ -21,7 +21,7 @@ type BreadthFirst struct {
...
@@ -21,7 +21,7 @@ type BreadthFirst struct {
}
}
// Walk performs a breadth-first traversal of the graph g starting from the given node,
// Walk performs a breadth-first traversal of the graph g starting from the given node,
// depending on the
the
EdgeFilter field and the until parameter if they are non-nil. The
// depending on the EdgeFilter field and the until parameter if they are non-nil. The
// traversal follows edges for which EdgeFilter(edge) is true and returns the first node
// traversal follows edges for which EdgeFilter(edge) is true and returns the first node
// for which until(node, depth) is true. During the traversal, if the Visit field is
// for which until(node, depth) is true. During the traversal, if the Visit field is
// non-nil, it is called with the nodes joined by each followed edge.
// non-nil, it is called with the nodes joined by each followed edge.
...
@@ -113,7 +113,7 @@ type DepthFirst struct {
...
@@ -113,7 +113,7 @@ type DepthFirst struct {
}
}
// Walk performs a depth-first traversal of the graph g starting from the given node,
// Walk performs a depth-first traversal of the graph g starting from the given node,
// depending on the
the
EdgeFilter field and the until parameter if they are non-nil. The
// depending on the EdgeFilter field and the until parameter if they are non-nil. The
// traversal follows edges for which EdgeFilter(edge) is true and returns the first node
// traversal follows edges for which EdgeFilter(edge) is true and returns the first node
// for which until(node) is true. During the traversal, if the Visit field is non-nil, it
// for which until(node) is true. During the traversal, if the Visit field is non-nil, it
// is called with the nodes joined by each followed edge.
// is called with the nodes joined by each followed edge.
...
...
third_party/forked/gonum/graph/traverse/visit_depth_first.go
View file @
87c29a08
...
@@ -30,7 +30,7 @@ type VisitingDepthFirst struct {
...
@@ -30,7 +30,7 @@ type VisitingDepthFirst struct {
}
}
// Walk performs a depth-first traversal of the graph g starting from the given node,
// Walk performs a depth-first traversal of the graph g starting from the given node,
// depending on the
the
EdgeFilter field and the until parameter if they are non-nil. The
// depending on the EdgeFilter field and the until parameter if they are non-nil. The
// traversal follows edges for which EdgeFilter(edge) is true and returns the first node
// traversal follows edges for which EdgeFilter(edge) is true and returns the first node
// for which until(node) is true. During the traversal, if the Visit field is non-nil, it
// for which until(node) is true. During the traversal, if the Visit field is non-nil, it
// is called with the nodes joined by each followed edge.
// is called with the nodes joined by each followed edge.
...
...
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