diff --git a/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md b/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md index e46a8025a1894..6b8ca3ec52834 100644 --- a/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md +++ b/content/en/docs/concepts/cluster-administration/cluster-administration-overview.md @@ -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. --If you are using a guide involving Salt, see [Configuring Kubernetes with Salt](/docs/setup/salt/). - ## 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. diff --git a/content/en/docs/setup/scratch.md b/content/en/docs/setup/scratch.md index af97f018ee437..cbf1808e8e7a7 100644 --- a/content/en/docs/setup/scratch.md +++ b/content/en/docs/setup/scratch.md @@ -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 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. ## Bootstrapping the Cluster diff --git a/content/en/examples/debug/fluentd-gcp-configmap.yaml b/content/en/examples/debug/fluentd-gcp-configmap.yaml index 206fef24c6de6..71e0ac5d82cc2 100644 --- a/content/en/examples/debug/fluentd-gcp-configmap.yaml +++ b/content/en/examples/debug/fluentd-gcp-configmap.yaml @@ -96,17 +96,6 @@ data: 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 - - type tail - format /^(?