From 5ec5e0be490c9390f48fa119f2c20969a42db406 Mon Sep 17 00:00:00 2001 From: timchenxiaoyu <837829664@qq.com> Date: Fri, 24 Feb 2017 17:15:51 +0800 Subject: [PATCH] daemon not deamon --- .../openstack-heat/kubernetes-heat/fragments/run-salt.sh | 2 +- examples/storage/cassandra/README.md | 2 +- .../federation-controller/daemonset/daemonset_controller.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh b/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh index f76b1849faa..72ce6d6a48a 100644 --- a/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh +++ b/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh @@ -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 diff --git a/examples/storage/cassandra/README.md b/examples/storage/cassandra/README.md index 5055fd816ea..be6d2908d46 100644 --- a/examples/storage/cassandra/README.md +++ b/examples/storage/cassandra/README.md @@ -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 diff --git a/federation/pkg/federation-controller/daemonset/daemonset_controller.go b/federation/pkg/federation-controller/daemonset/daemonset_controller.go index f27007887ef..c83292f7129 100644 --- a/federation/pkg/federation-controller/daemonset/daemonset_controller.go +++ b/federation/pkg/federation-controller/daemonset/daemonset_controller.go @@ -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 })