Skip to content

Commit 856d368

Browse files
author
Kent Rancourt
committed
doc(*): strike references to schedulers that aren't k8s
1 parent fe77190 commit 856d368

5 files changed

Lines changed: 1 addition & 33 deletions

File tree

docs/src/contributing/triaging-issues.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ security | Security-related issues such as TLS encryption, network segregati
4747
- database
4848
- deisctl
4949
- docs
50-
- etcd/fleet
5150
- kubernetes
5251
- logger
5352
- publisher

docs/src/installing-deis/system-requirements.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Deis components consume approximately 2 - 2.5GB of memory across the cluster, an
1111

1212
Note that these estimates are for Deis and CoreOS only, and there should be ample room for deployed applications.
1313

14-
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.
14+
Running smaller machines will likely result in increased system load and has been known to result in component failures and other problems.
1515

1616
## Cluster Size
1717

docs/src/roadmap/release-checklist.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,10 @@ $ ./contrib/bumpver/bumpver -f A.B.C A.B.D \
3939
docs/reference/api-v1.7.rst \
4040
docs/troubleshooting_deis/index.rst \
4141
logger/image/Dockerfile \
42-
mesos/template \
43-
mesos/zookeeper/Dockerfile \
4442
publisher/image/Dockerfile \
4543
registry/Dockerfile \
4644
router/Dockerfile \
4745
store/base/Dockerfile \
48-
swarm/image/Dockerfile \
4946
version/version.go
5047
```
5148

docs/src/roadmap/roadmap.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ of etcd in Deis, with a focus on performance and reliability.
2323

2424
This feature is tracked as GitHub issue [#4404][].
2525

26-
## New Default Scheduler
27-
28-
Deis now has support for Docker Swarm, Apache Mesos, and Google Kubernetes as
29-
application schedulers. With the known limitations of fleet (primarily, not being
30-
a resource-aware scheduler), we should investigate using a different scheduler
31-
as our default.
32-
33-
This feature is tracked as GitHub issue [#4222][].
34-
3526
## Permissions and Teams
3627

3728
Deis deployments in larger organizations require more fine-grained control

docs/src/using-deis/managing-an-application.md

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -118,24 +118,6 @@ CPU shares are on a scale of 0 to 1024, with 1024 being all CPU resources on the
118118
the `limits:set` command will hang. If this happens, use CTRL-C
119119
to break out of `limits:set` and use `limits:unset` to revert.
120120

121-
122-
## Isolate the Application
123-
124-
Deis supports isolating applications onto a set of hosts using `tags`.
125-
126-
!!! note
127-
In order to use tags, you must first launch your hosts with
128-
the proper key/value tag information. If you do not, tag commands will fail.
129-
Learn more by reading the [machine metadata][] section of Fleet documentation.
130-
131-
Once your hosts are configured with appropriate key/value metadata, use
132-
`deis tags:set` to restrict the application to those hosts:
133-
134-
$ deis tags:set environ=prod
135-
Applying tags... done, v4
136-
137-
environ prod
138-
139121
[application]: ../reference-guide/terms.md#application
140122
[container]: ../reference-guide/terms.md#container
141123
[store config in environment variables]: http://12factor.net/config
@@ -144,4 +126,3 @@ Once your hosts are configured with appropriate key/value metadata, use
144126
[treat logs as event streams]: http://12factor.net/logs
145127
[use one-off processes for admin tasks]: http://12factor.net/admin-processes
146128
[Procfile]: http://ddollar.github.io/foreman/#PROCFILE
147-
[machine metadata]: https://coreos.com/docs/launching-containers/launching/fleet-unit-files/#user-defined-requirements

0 commit comments

Comments
 (0)