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
2a6414bc
Commit
2a6414bc
authored
Feb 26, 2017
by
Kubernetes Submit Queue
Committed by
GitHub
Feb 26, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #42044 from timchenxiaoyu/daemonnotdeamon
Automatic merge from submit-queue daemon not deamon
parents
b18bad15
5ec5e0be
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
run-salt.sh
cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh
+1
-1
README.md
examples/storage/cassandra/README.md
+1
-1
daemonset_controller.go
...g/federation-controller/daemonset/daemonset_controller.go
+3
-3
No files found.
cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh
View file @
2a6414bc
...
...
@@ -37,7 +37,7 @@ tar xzf kubernetes-salt.tar.gz
if
!
which salt-call
>
/dev/null 2>&1
;
then
echo
"+++ Install salt binaries from https://bootstrap.saltstack.com"
# Install salt binaries but do not start d
ea
mon after installation
# Install salt binaries but do not start d
ae
mon after installation
curl
-sS
-L
--connect-timeout
20
--retry
6
--retry-delay
10 https://bootstrap.saltstack.com | sh
-s
--
"-X"
fi
...
...
examples/storage/cassandra/README.md
View file @
2a6414bc
...
...
@@ -811,7 +811,7 @@ $ kubectl delete daemonset cassandra
A custom
[
`SeedProvider`
](
https://svn.apache.org/repos/asf/cassandra/trunk/src/java/org/apache/cassandra/locator/SeedProvider.java
)
is included for running Cassandra on top of Kubernetes. Only when you deploy Cassandra
via a replication control or a d
ea
monset, you will need to use the custom seed provider.
via a replication control or a d
ae
monset, you will need to use the custom seed provider.
In Cassandra, a
`SeedProvider`
bootstraps the gossip protocol that Cassandra uses to find other
Cassandra nodes. Seed addresses are hosts deemed as contact points. Cassandra
instances use the seed list to find each other and learn the topology of the
...
...
federation/pkg/federation-controller/daemonset/daemonset_controller.go
View file @
2a6414bc
...
...
@@ -158,7 +158,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont
if
err
!=
nil
{
glog
.
Errorf
(
"Error creating daemonset %s/%s/: %v"
,
daemonset
.
Namespace
,
daemonset
.
Name
,
err
)
}
else
{
glog
.
V
(
4
)
.
Infof
(
"Successfully created d
ea
monset %s/%s"
,
daemonset
.
Namespace
,
daemonset
.
Name
)
glog
.
V
(
4
)
.
Infof
(
"Successfully created d
ae
monset %s/%s"
,
daemonset
.
Namespace
,
daemonset
.
Name
)
}
return
err
},
...
...
@@ -169,7 +169,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont
if
err
!=
nil
{
glog
.
Errorf
(
"Error updating daemonset %s/%s/: %v"
,
daemonset
.
Namespace
,
daemonset
.
Name
,
err
)
}
else
{
glog
.
V
(
4
)
.
Infof
(
"Successfully updating d
ea
monset %s/%s"
,
daemonset
.
Namespace
,
daemonset
.
Name
)
glog
.
V
(
4
)
.
Infof
(
"Successfully updating d
ae
monset %s/%s"
,
daemonset
.
Namespace
,
daemonset
.
Name
)
}
return
err
},
...
...
@@ -180,7 +180,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont
if
err
!=
nil
{
glog
.
Errorf
(
"Error deleting daemonset %s/%s/: %v"
,
daemonset
.
Namespace
,
daemonset
.
Name
,
err
)
}
else
{
glog
.
V
(
4
)
.
Infof
(
"Successfully deleting d
ea
monset %s/%s"
,
daemonset
.
Namespace
,
daemonset
.
Name
)
glog
.
V
(
4
)
.
Infof
(
"Successfully deleting d
ae
monset %s/%s"
,
daemonset
.
Namespace
,
daemonset
.
Name
)
}
return
err
})
...
...
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