Commit 5ec5e0be authored by timchenxiaoyu's avatar timchenxiaoyu

daemon not deamon

parent b3453d0b
...@@ -37,7 +37,7 @@ tar xzf kubernetes-salt.tar.gz ...@@ -37,7 +37,7 @@ tar xzf kubernetes-salt.tar.gz
if ! which salt-call >/dev/null 2>&1; then if ! which salt-call >/dev/null 2>&1; then
echo "+++ Install salt binaries from https://bootstrap.saltstack.com" 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" curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- "-X"
fi fi
......
...@@ -811,7 +811,7 @@ $ kubectl delete daemonset cassandra ...@@ -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) 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 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 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 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 instances use the seed list to find each other and learn the topology of the
......
...@@ -158,7 +158,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont ...@@ -158,7 +158,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont
if err != nil { if err != nil {
glog.Errorf("Error creating daemonset %s/%s/: %v", daemonset.Namespace, daemonset.Name, err) glog.Errorf("Error creating daemonset %s/%s/: %v", daemonset.Namespace, daemonset.Name, err)
} else { } 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 return err
}, },
...@@ -169,7 +169,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont ...@@ -169,7 +169,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont
if err != nil { if err != nil {
glog.Errorf("Error updating daemonset %s/%s/: %v", daemonset.Namespace, daemonset.Name, err) glog.Errorf("Error updating daemonset %s/%s/: %v", daemonset.Namespace, daemonset.Name, err)
} else { } 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 return err
}, },
...@@ -180,7 +180,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont ...@@ -180,7 +180,7 @@ func NewDaemonSetController(client federationclientset.Interface) *DaemonSetCont
if err != nil { if err != nil {
glog.Errorf("Error deleting daemonset %s/%s/: %v", daemonset.Namespace, daemonset.Name, err) glog.Errorf("Error deleting daemonset %s/%s/: %v", daemonset.Namespace, daemonset.Name, err)
} else { } 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 return err
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment