Skip to content

Commit d41b1a0

Browse files
authored
ref(deployments): update docs to reflect Deployments are the only deploy option (#456)
1 parent 292f4a0 commit d41b1a0

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

src/applications/deploying-apps.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ It is possible to configure a few of the [globally tunable](../applications/mana
6161
Setting | Description
6262
----------------------------------------------- | ---------------------------------
6363
DEIS_DEPLOY_BATCHES | the number of pods to bring up and take down sequentially during a scale (default: number of available nodes)
64-
DEIS_DEPLOY_TIMEOUT | deploy timeout in seconds - there are 2 deploy methods, current (RC) and Deployments (see below) and this setting affects those a bit differently (default: 120)
65-
DEIS_KUBERNETES_DEPLOYMENTS | if enabled, [Deployments][] is used to handle an application deploy instead of [ReplicationControllers][]. Any value is acceptable to enable [Deployments][]. (default: off)
64+
DEIS_DEPLOY_TIMEOUT | deploy timeout in seconds per deploy batch (default: 120)
6665
KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT | how many [revisions][kubernetes-deployment-revision] Kubernetes keeps around of a given Deployment (default: all revisions)
6766

6867
### Deploy Timeout
@@ -88,17 +87,17 @@ Additionally the timeout system accounts for slow image pulls by adding an addit
8887

8988
### Deployments
9089

91-
When `DEIS_KUBERNETES_DEPLOYMENTS=1` is set on an application then Deis Workflow will use [Deployments][] internally instead of [ReplicationControllers][].
90+
Workflow uses [Deployments][] for deploys. In prior versions [ReplicationControllers][] were used with the ability to turn on Deployments via `DEIS_KUBERNETES_DEPLOYMENTS=1`.
9291

93-
The advantage of that is that rolling-updates will happen server-side in Kubernetes instead of in Deis Workflow Controller,
92+
The advantage of [Deployments][] is that rolling-updates will happen server-side in Kubernetes instead of in Deis Workflow Controller,
9493
along with a few other Pod management related functionality. This allows a deploy to continue even when the CLI connection is interrupted.
9594

96-
Deis Workflow will behave the same way with `DEIS_KUBERNETES_DEPLOYMENTS` enabled or disabled. The changes are behind the scenes.
97-
Where you will see differences while using the CLI is `deis ps:list` will output Pod names differently.
98-
9995
Behind the scenes your application deploy will be built up of a Deployment object per process type,
10096
each having multiple ReplicaSets (one per release) which in turn manage the Pods running your application.
10197

98+
Deis Workflow will behave the same way with `DEIS_KUBERNETES_DEPLOYMENTS` enabled or disabled (only applicable to versions prior to 2.4).
99+
The changes are behind the scenes. Where you will see differences while using the CLI is `deis ps:list` will output Pod names differently.
100+
102101
[install client]: ../users/cli.md#installation
103102
[application]: ../reference-guide/terms.md#application
104103
[controller]: ../understanding-workflow/components.md#controller

src/managing-workflow/tuning-component-settings.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,7 @@ KUBERNETES_POD_TERMINATION_GRACE_PERIOD_SECONDS | how many seconds kubernetes wa
6363
Setting | Description
6464
----------------------------------------------- | ---------------------------------
6565
DEIS_DEPLOY_BATCHES | the number of pods to bring up and take down sequentially during a scale (default: number of available nodes)
66-
DEIS_DEPLOY_TIMEOUT | deploy timeout in seconds - there are 2 deploy methods, current (RC) and Deployments (see below) and this setting affects those a bit differently (default: 120)
67-
DEIS_KUBERNETES_DEPLOYMENTS | if enabled [Deployments][] is used to handle an application deploy platform wide instead of [ReplicationControllers][]
68-
| any value is acceptable to turn on [Deployments][], to turn it off either remove or pass an empty string (default: off)
66+
DEIS_DEPLOY_TIMEOUT | deploy timeout in seconds per deploy batch (default: 120)
6967
KUBERNETES_DEPLOYMENTS_REVISION_HISTORY_LIMIT | how many [revisions][[kubernetes-deployment-revision]] Kubernetes keeps around of a given Deployment (default: all revisions)
7068

7169
See the [Deploying Apps][] guide for more detailed information on those.

0 commit comments

Comments
 (0)