remove the left bits of salt (#10248)
parent
d73e26c75b
commit
7b33ce4825
|
@ -32,8 +32,6 @@ Before choosing a guide, here are some considerations:
|
||||||
|
|
||||||
Note: Not all distros are actively maintained. Choose distros which have been tested with a recent version of Kubernetes.
|
Note: Not all distros are actively maintained. Choose distros which have been tested with a recent version of Kubernetes.
|
||||||
|
|
||||||
-If you are using a guide involving Salt, see [Configuring Kubernetes with Salt](/docs/setup/salt/).
|
|
||||||
|
|
||||||
## Managing a cluster
|
## Managing a cluster
|
||||||
|
|
||||||
* [Managing a cluster](/docs/tasks/administer-cluster/cluster-management/) describes several topics related to the lifecycle of a cluster: creating a new cluster, upgrading your cluster’s master and worker nodes, performing node maintenance (e.g. kernel upgrades), and upgrading the Kubernetes API version of a running cluster.
|
* [Managing a cluster](/docs/tasks/administer-cluster/cluster-management/) describes several topics related to the lifecycle of a cluster: creating a new cluster, upgrading your cluster’s master and worker nodes, performing node maintenance (e.g. kernel upgrades), and upgrading the Kubernetes API version of a running cluster.
|
||||||
|
|
|
@ -465,7 +465,7 @@ traffic to the internet, but have no problem with them inside your GCE Project.
|
||||||
|
|
||||||
The previous steps all involved "conventional" system administration techniques for setting up
|
The previous steps all involved "conventional" system administration techniques for setting up
|
||||||
machines. You may want to use a Configuration Management system to automate the node configuration
|
machines. You may want to use a Configuration Management system to automate the node configuration
|
||||||
process. There are examples of [Saltstack](/docs/setup/salt/), Ansible, Juju, and CoreOS Cloud Config in the
|
process. There are examples of Ansible, Juju, and CoreOS Cloud Config in the
|
||||||
various Getting Started Guides.
|
various Getting Started Guides.
|
||||||
|
|
||||||
## Bootstrapping the Cluster
|
## Bootstrapping the Cluster
|
||||||
|
|
|
@ -96,17 +96,6 @@ data:
|
||||||
</store>
|
</store>
|
||||||
</match>
|
</match>
|
||||||
system.input.conf: |-
|
system.input.conf: |-
|
||||||
# Example:
|
|
||||||
# 2015-12-21 23:17:22,066 [salt.state ][INFO ] Completed state [net.ipv4.ip_forward] at time 23:17:22.066081
|
|
||||||
<source>
|
|
||||||
type tail
|
|
||||||
format /^(?<time>[^ ]* [^ ,]*)[^\[]*\[[^\]]*\]\[(?<severity>[^ \]]*) *\] (?<message>.*)$/
|
|
||||||
time_format %Y-%m-%d %H:%M:%S
|
|
||||||
path /var/log/salt/minion
|
|
||||||
pos_file /var/log/gcp-salt.pos
|
|
||||||
tag salt
|
|
||||||
</source>
|
|
||||||
|
|
||||||
# Example:
|
# Example:
|
||||||
# Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
|
# Dec 21 23:17:22 gke-foo-1-1-4b5cbd14-node-4eoj startupscript: Finished running startup script /var/run/google.startup.script
|
||||||
<source>
|
<source>
|
||||||
|
|
|
@ -127,9 +127,6 @@ toc:
|
||||||
- title: Installing Addons
|
- title: Installing Addons
|
||||||
path: /docs/concepts/cluster-administration/addons/
|
path: /docs/concepts/cluster-administration/addons/
|
||||||
|
|
||||||
- title: Configuring Kubernetes with Salt
|
|
||||||
path: /docs/admin/salt/
|
|
||||||
|
|
||||||
- title: Building Large Clusters
|
- title: Building Large Clusters
|
||||||
path: /docs/admin/cluster-large/
|
path: /docs/admin/cluster-large/
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue