Merge pull request #169 from krancour/strike-coreos-refs

krancour · krancour · commit b07be0d1e4ce · 2015-12-21T19:47:11.000-05:00
doc(*): strike references to CoreOS
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -24,9 +24,6 @@ Our official support channels are:
 - GitHub issues: https://github.com/deis/deis/issues/new
 - IRC: #[deis](irc://irc.freenode.org:6667/#deis) IRC channel on freenode.org
 
-When opening an issue or asking for help on IRC, it's helpful to provide debug output from your cluster.
-Run `/opt/bin/deis-debug-logs` on one of your CoreOS machines and provide the output to us in a [gist](https://gist.github.com/).
-
 ## Getting Started
 
 - Fork the repository on GitHub
diff --git a/docs/src/contributing/development-environment.md b/docs/src/contributing/development-environment.md
@@ -205,7 +205,7 @@ If you are developing elsewhere, you must set up a registry yourself. Make sure
 2. Hosts in the cluster can pull images with the same URL
 
 !!! note
-    If the development registry is insecure and has an IP address in a range other than `10.0.0.0/8`, `172.16.0.0/12`, or `192.168.0.0/16`, you'll have to modify `contrib/coreos/user-data.example` and whitelist your development registry so the daemons can pull your custom components.
+    If the development registry is insecure, then the Docker deamon on each of your nodes must be configured to allow communication with insecure registries in the applicable IP range.
 
 ## Initial Platform Build
 
diff --git a/docs/src/contributing/testing.md b/docs/src/contributing/testing.md
@@ -47,7 +47,7 @@ The `test-setup.sh` script also prepares the testing environment, as well as tea
 - runs documentation tests
 - builds Docker images tagged with `$BUILD_TAG`
 - runs unit and functional tests
-- creates a 3-node Vagrant CoreOS cluster
+- creates a 3-node Vagrant cluster
 - pushes the Docker images to a registry
 - provisions the cluster for Deis with the registry images
 - runs all integration tests
@@ -73,7 +73,7 @@ make -C tests/ test-full
 - runs documentation tests
 - builds Docker images tagged with `$BUILD_TAG`
 - runs unit and functional tests
-- creates a 3-node Vagrant CoreOS cluster
+- creates a 3-node Vagrant cluster
 - pushes the Docker images to a registry
 - provisions the cluster for Deis with the registry images
 - runs a "smoke test" that pushes and scales an app
@@ -82,7 +82,7 @@ make -C tests/ test-full
 ### test-latest.sh
 
 - installs the latest `deis` and `deisctl` client releases
-- creates a 3-node Vagrant CoreOS cluster
+- creates a 3-node Vagrant cluster
 - provisions the cluster for Deis with latest release images
 - runs a "smoke test" that pushes and scales an app
 - takes roughly 30 minutes
diff --git a/docs/src/index.md b/docs/src/index.md
@@ -1,6 +1,6 @@
 # Welcome
 
-Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage applications on your own servers. Deis builds upon Docker and CoreOS to provide a lightweight PaaS with a Heroku-inspired workflow.
+Deis (pronounced DAY-iss) is an open source PaaS that makes it easy to deploy and manage applications on your own servers. Deis builds upon Kubernetes to provide a lightweight PaaS with a Heroku-inspired workflow.
 
 To get started with Deis, first read the [Architecture][arch] and [Concepts][concepts] of Deis, then use [the QuickStart documentation][quickstart] to start provisioning your cluster.
 
diff --git a/docs/src/installing-deis/system-requirements.md b/docs/src/installing-deis/system-requirements.md
@@ -9,9 +9,9 @@ Deis components consume approximately 2 - 2.5GB of memory across the cluster, an
 * At least 4GB of RAM (more is better)
 * At least 40GB of hard disk space
 
-Note that these estimates are for Deis and CoreOS only, and there should be ample room for deployed applications.
+Note that these estimates are for Deis and Kubernetes only, and there should be ample room for deployed applications.
 
-Running smaller machines will likely result in increased system load and has been known to result in component failures, issues with etcd/fleet, and other problems.
+Running smaller machines will likely result in increased system load and has been known to result in component failures and other problems.
 
 ## Cluster Size
 
diff --git a/docs/src/roadmap/release-checklist.md b/docs/src/roadmap/release-checklist.md
@@ -26,7 +26,6 @@ $ ./contrib/bumpver/bumpver -f A.B.C A.B.D \
     builder/rootfs/usr/local/src/slugrunner/Dockerfile \
     client/deis-version \
     contrib/utils.sh \
-    contrib/coreos/user-data.example \
     controller/deis/__init__.py \
     controller/Dockerfile \
     database/Dockerfile \
@@ -82,7 +81,6 @@ $ ./contrib/bumpver/bumpver -f A.B.D-dev A.B.D \
 $ ./contrib/bumpver/bumpver -f A.B.C A.B.D \
     README.md \
     contrib/utils.sh \
-    contrib/coreos/user-data.example \
     docs/_includes/_get-the-source.rst \
     docs/installing_deis/install-deisctl.rst \
     docs/installing_deis/install-platform.rst \
@@ -146,7 +144,6 @@ $ ./contrib/bumpver/bumpver -f A.B.C A.B.D \
 ./contrib/bumpver/bumpver -f A.B.C A.B.D \
   README.md \
   contrib/utils.sh \
-  contrib/coreos/user-data.example \
   docs/_includes/_get-the-source.rst \
   docs/installing_deis/install-deisctl.rst \
   docs/installing_deis/install-platform.rst \
diff --git a/docs/src/roadmap/roadmap.md b/docs/src/roadmap/roadmap.md
@@ -63,12 +63,11 @@ This feature is tracked as GitHub issue [#3072][].
 ## Update Service
 
 Deis must support 100% automated, zero-downtime updates of the control plane.
-Like CoreOS, Deis clusters should be attached to an alpha, beta or stable channel and rely on an automatic update mechanism.
+Deis clusters should be attached to an alpha, beta or stable channel and rely on an automatic update mechanism.
 To accomplish this, Deis plans to use the `Google Omaha Protocol`_ as implemented by `CoreUpdate`_.
 
  - [x]  [Update client/agent][]
  - [ ]  Update server
- - [ ]  [Automatic CoreOS upgrades][]
  - [ ]  CI Integration
 
 This feature is tracked as GitHub issue [#2106][].
diff --git a/docs/src/roadmap/test-plan.md b/docs/src/roadmap/test-plan.md
@@ -29,7 +29,7 @@ Within the scope of this master test plan are these items:
 
 - The Deis project codebase at <https://github.com/deis/deis>
 - The Docker containers that constitute Deis
-- The assembled Deis platform on a CoreOS cluster
+- The assembled Deis platform on a Kubernetes cluster
 - The HTML documentation set for Deis
 - Binary installers for the `deis` CLI hosted at AWS S3
 - Binary installers for the `deisctl` CLI hosted at AWS S3
@@ -40,7 +40,7 @@ Within the scope of this master test plan are these items:
 
 At a high level, the overall features of the platform that are tested are:
 
-- The Deis platform can be installed on a new CoreOS vagrant cluster
+- The Deis platform can be installed on a new Kubernetes cluster
 - The Deis platform can be upgraded from a recent release to the current one
 - Users can register with Deis and create and deploy applications
 - Deis can build and scale a variety of Heroku-style and Dockerfile-based apps
@@ -52,7 +52,7 @@ At a high level, the overall features of the platform that are tested are:
 While these features are effectively covered in ad-hoc testing and by existing
 customer usage, they are not specifically tested as part of the test plan yet.
 
-- The Deis platform can be installed on an existing CoreOS cluster
+- The Deis platform can be installed on an existing Kubernetes cluster
 - The Deis platform survives the loss of one or more nodes
 - The Deis platform can run for several weeks without interruption
 - The Deis platform handles stressful multi-user workloads
diff --git a/docs/src/understanding-deis/components.md b/docs/src/understanding-deis/components.md
@@ -63,7 +63,6 @@ and [Logger][].
 [Ceph]: http://ceph.com
 [database]: #database
 [Docker]: http://docker.io/
-[etcd]: https://github.com/coreos/etcd
 [Git]: http://git-scm.com/
 [logger]: #logger
 [Nginx]: http://nginx.org/
diff --git a/docs/src/understanding-deis/concepts.md b/docs/src/understanding-deis/concepts.md
@@ -24,17 +24,6 @@ distributed across your cluster as Docker containers.
 
 (Deis itself is also a set of coordinated Docker containers.)
 
-## CoreOS
-
-[CoreOS][] is a new, minimal Linux distribution, rearchitected for
-running modern, containerized infrastructure stacks.
-
-Deis runs on CoreOS machines that can be hosted anywhere -- public cloud,
-private cloud, bare metal or even your workstation.
-
-CoreOS allows Deis to host applications and services at scale with
-high resilience, in a way that is simple to operate.
-
 ## Applications
 
 Deis is designed around the concept of an [application][], or app.
@@ -89,7 +78,6 @@ to swap services provided by other apps, or to switch to external or third-party
 [config]: ../reference-guide/terms.md#config
 [containers]: ../reference-guide/terms.md#container
 [Docker]: http://docker.io/
-[CoreOS]: https://coreos.com/
 [Build and Run]: http://12factor.net/build-release-run
 [backing services]: http://12factor.net/backing-services
 [environment variables]: http://12factor.net/config
diff --git a/docs/src/using-deis/managing-an-application.md b/docs/src/using-deis/managing-an-application.md
@@ -118,24 +118,6 @@ CPU shares are on a scale of 0 to 1024, with 1024 being all CPU resources on the
     the `limits:set` command will hang.  If this happens, use CTRL-C
     to break out of `limits:set` and use `limits:unset` to revert.
 
-
-## Isolate the Application
-
-Deis supports isolating applications onto a set of hosts using `tags`.
-
-!!! note
-    In order to use tags, you must first launch your hosts with
-    the proper key/value tag information.  If you do not, tag commands will fail.
-    Learn more by reading the [machine metadata][] section of Fleet documentation.
-
-Once your hosts are configured with appropriate key/value metadata, use
-`deis tags:set` to restrict the application to those hosts:
-
-    $ deis tags:set environ=prod
-    Applying tags...  done, v4
-
-    environ  prod
-
 [application]: ../reference-guide/terms.md#application
 [container]: ../reference-guide/terms.md#container
 [store config in environment variables]: http://12factor.net/config
@@ -144,4 +126,3 @@ Once your hosts are configured with appropriate key/value metadata, use
 [treat logs as event streams]: http://12factor.net/logs
 [use one-off processes for admin tasks]: http://12factor.net/admin-processes
 [Procfile]: http://ddollar.github.io/foreman/#PROCFILE
-[machine metadata]: https://coreos.com/docs/launching-containers/launching/fleet-unit-files/#user-defined-requirements
