github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42044 from timchenxiaoyu/daemonnotdeamon

Browse Source 
Automatic merge from submit-queue

daemon not deamon
This commit is contained in:
Kubernetes Submit Queue 2017-02-26 22:45:32 -08:00 committed by GitHub
commit 2a6414bc91
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh
View File

@ -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 deamon after installation
# Install salt binaries but do not start daemon after installation
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- "-X"
fi

2
examples/storage/cassandra/README.md
View File

@ -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 deamonset, you will need to use the custom seed provider.
via a replication control or a daemonset, 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

6
federation/pkg/federation-controller/daemonset/daemonset_controller.go
View File

@ -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 deamonset %s/%s", daemonset.Namespace, daemonset.Name)
glog.V(4).Infof("Successfully created daemonset %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 deamonset %s/%s", daemonset.Namespace, daemonset.Name)
glog.V(4).Infof("Successfully updating daemonset %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 deamonset %s/%s", daemonset.Namespace, daemonset.Name)
glog.V(4).Infof("Successfully deleting daemonset %s/%s", daemonset.Namespace, daemonset.Name)
}
return err
})