Skip to content

Commit 2874f30

Browse files
committed
Enable Deployments by default
1 parent 2172e0d commit 2874f30

File tree

14 files changed

+5714
-2491
lines changed

14 files changed

+5714
-2491
lines changed

api/swagger-spec/extensions_v1beta1.json

Lines changed: 2566 additions & 1489 deletions
Large diffs are not rendered by default.

cluster/aws/config-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
8383
RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
8484

8585
# Enable various v1beta1 features
86-
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-true}"
8786
ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
8887

8988
# Optional: Cluster monitoring to setup as part of the cluster bring up:

cluster/common.sh

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -422,15 +422,6 @@ function yaml-quote {
422422

423423
# Builds the RUNTIME_CONFIG var from other feature enable options
424424
function build-runtime-config() {
425-
if [[ "${ENABLE_DEPLOYMENTS}" == "true" ]]; then
426-
if [[ -z "${RUNTIME_CONFIG}" ]]; then
427-
RUNTIME_CONFIG="extensions/v1beta1/deployments=true"
428-
else
429-
if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1/deployments=true"; then
430-
RUNTIME_CONFIG="${RUNTIME_CONFIG},extensions/v1beta1/deployments=true"
431-
fi
432-
fi
433-
fi
434425
if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then
435426
if [[ -z "${RUNTIME_CONFIG}" ]]; then
436427
RUNTIME_CONFIG="extensions/v1beta1/daemonsets=true"

cluster/gce/config-test.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
5151
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
5252

5353
# Optional: enable v1beta1 related features
54-
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-true}"
5554
ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
5655
ENABLE_REPLICASETS="${KUBE_ENABLE_REPLICASETS:-true}"
5756

cluster/kubemark/config-default.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
4242
TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
4343

4444
# Optional: enable v1beta1 related features
45-
ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-true}"
4645
ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
4746

4847
TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=2}"

docs/api-reference/extensions/v1beta1/definitions.html

Lines changed: 733 additions & 294 deletions
Large diffs are not rendered by default.

docs/api-reference/extensions/v1beta1/operations.html

Lines changed: 2411 additions & 666 deletions
Large diffs are not rendered by default.

docs/api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ create their own API groups](design/extending-api.md), and to avoid naming colli
113113

114114
## Enabling resources in the extensions group
115115

116-
HorizontalPodAutoscalers, Jobs, Ingress and ReplicaSets are enabled by default.
116+
HorizontalPodAutoscalers, Jobs, Ingress, Deployments and ReplicaSets are enabled by default.
117117
Other extensions resources can be enabled by setting runtime-config on
118-
apiserver. runtime-config accepts comma separated values. For ex: to enable deployments and disable jobs, set
119-
`--runtime-config=extensions/v1beta1/deployments=true,extensions/v1beta1/jobs=false`
118+
apiserver. runtime-config accepts comma separated values. For ex: to disable deployments and jobs, set
119+
`--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false`
120120

121121
## v1beta1, v1beta2, and v1beta3 are deprecated; please move to v1 ASAP
122122

docs/user-guide/deployments.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,6 @@ A typical use case is:
7070
* Create a Deployment to bring up a replication controller and pods.
7171
* Later, update that Deployment to recreate the pods (for example, to use a new image).
7272

73-
## Enabling Deployments on a Kubernetes cluster
74-
75-
Deployment objects are part of the [`extensions` API Group](../api.md#api-groups) and this feature
76-
is not enabled by default.
77-
Set `--runtime-config=extensions/v1beta1/deployments=true` on the API server to
78-
enable it.
79-
This can be achieved by exporting `KUBE_ENABLE_DEPLOYMENTS=true` before running the
80-
`kube-up.sh` script on GCE.
81-
82-
Note that Deployment objects effectively have [API version
83-
`v1alpha1`](../api.md#api-versioning).
84-
Alpha objects may change or even be discontinued in future software releases.
85-
However, due to to a known issue, they will appear as API version `v1beta1` if
86-
enabled.
87-
8873
## Creating a Deployment
8974

9075
Here is an example Deployment. It creates a replication controller to

hack/e2e.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ func Up() bool {
178178
}
179179
}
180180

181-
// Enable deployments for e2e tests.
182-
os.Setenv("KUBE_ENABLE_DEPLOYMENTS", "true")
183181
return finishRunning("up", exec.Command(path.Join(*root, "hack/e2e-internal/e2e-up.sh")))
184182
}
185183

0 commit comments

Comments
 (0)