Merge pull request #21130 from madhusudancs/daemonset-enable-default

cluster/aws/config-default.sh

@@ -86,10 +86,6 @@ MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
 # Runtime config
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 
-# Enable various v1beta1 features
-ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-}"
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-}"
-
 # Optional: Cluster monitoring to setup as part of the cluster bring up:
 #   none     - No cluster monitoring setup
 #   influxdb - Heapster, InfluxDB, and Grafana

cluster/aws/config-test.sh

@@ -82,9 +82,6 @@ MASTER_IP_RANGE="${MASTER_IP_RANGE:-10.246.0.0/24}"
 MASTER_RESERVED_IP="${MASTER_RESERVED_IP:-}"
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 
-# Enable various v1beta1 features
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
-
 # Optional: Cluster monitoring to setup as part of the cluster bring up:
 #   none     - No cluster monitoring setup
 #   influxdb - Heapster, InfluxDB, and Grafana

cluster/common.sh

@@ -420,17 +420,11 @@ function yaml-quote {
   echo "'$(echo "${@}" | sed -e "s/'/''/g")'"
 }
 
-# Builds the RUNTIME_CONFIG var from other feature enable options
+# Builds the RUNTIME_CONFIG var from other feature enable options (such as
+# features in alpha)
 function build-runtime-config() {
-  if [[ "${ENABLE_DAEMONSETS}" == "true" ]]; then
-      if [[ -z "${RUNTIME_CONFIG}" ]]; then
-          RUNTIME_CONFIG="extensions/v1beta1/daemonsets=true"
-      else
-          if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1/daemonsets=true"; then
-            RUNTIME_CONFIG="${RUNTIME_CONFIG},extensions/v1beta1/daemonsets=true"
-          fi
-      fi
-  fi
+  # There is nothing to do here for now. Just using this function as a placeholder.
+  :
 }
 
 function write-master-env {

cluster/gce/config-default.sh

@@ -80,10 +80,6 @@ fi
 # Optional: customize runtime config
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 
-# Optional: enable v1beta1 related features
-ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-}"
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-}"
-
 # Optional: Install cluster DNS.
 ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
 DNS_SERVER_IP="10.0.0.10"

cluster/gce/config-test.sh

@@ -50,10 +50,6 @@ NODE_SCOPES="${NODE_SCOPES:-compute-rw,monitoring,logging-write,storage-ro}"
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
 
-# Optional: enable v1beta1 related features
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
-ENABLE_REPLICASETS="${KUBE_ENABLE_REPLICASETS:-true}"
-
 # Increase the sleep interval value if concerned about API rate limits. 3, in seconds, is the default.
 POLL_SLEEP_INTERVAL=3
 SERVICE_CLUSTER_IP_RANGE="10.0.0.0/16"  # formerly PORTAL_NET

cluster/kubemark/config-default.sh

@@ -41,9 +41,6 @@ CLUSTER_IP_RANGE="${CLUSTER_IP_RANGE:-10.244.0.0/16}"
 RUNTIME_CONFIG="${KUBE_RUNTIME_CONFIG:-}"
 TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
 
-# Optional: enable v1beta1 related features
-ENABLE_DAEMONSETS="${KUBE_ENABLE_DAEMONSETS:-true}"
-
 TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=2}"
 TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=12h}"
 

docs/admin/daemons.md

@@ -52,7 +52,6 @@ Documentation for other releases can be found at
     - [Bare Pods](#bare-pods)
     - [Static Pods](#static-pods)
     - [Replication Controller](#replication-controller)
-  - [Caveats](#caveats)
 
 <!-- END MUNGE: GENERATED_TOC -->
 
@@ -208,18 +207,6 @@ number of replicas and rolling out updates are more important than controlling e
 the pod runs on.  Use a Daemon Controller when it is important that a copy of a pod always run on
 all or certain hosts, and when it needs to start before other pods.
 
-## Caveats
-
-DaemonSet objects are in the [`extensions` API Group](../api.md#api-groups).
-DaemonSet is not enabled by default. Enable it by setting
-`--runtime-config=extensions/v1beta1/daemonsets=true` on the api server. This can be
-achieved by exporting KUBE_ENABLE_DAEMONSETS=true before running kube-up.sh script
-on GCE.
-
-DaemonSet objects effectively have [API version `v1alpha1`](../api.md#api-versioning).
- Alpha objects may change or even be discontinued in future software releases.
-However, due to to a known issue, they will appear as API version `v1beta1` if enabled.
-
 
 
 <!-- BEGIN MUNGE: GENERATED_ANALYTICS -->

docs/api.md

@@ -113,7 +113,7 @@ create their own API groups](design/extending-api.md), and to avoid naming colli
 
 ## Enabling resources in the extensions group
 
-HorizontalPodAutoscalers, Jobs, Ingress, Deployments and ReplicaSets are enabled by default.
+DaemonSets, Deployments, HorizontalPodAutoscalers, Ingress, Jobs and ReplicaSets are enabled by default.
 Other extensions resources can be enabled by setting runtime-config on
 apiserver. runtime-config accepts comma separated values. For ex: to disable deployments and jobs, set
 `--runtime-config=extensions/v1beta1/deployments=false,extensions/v1beta1/jobs=false`

pkg/master/master.go

@@ -570,7 +570,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
 // getExperimentalResources returns the resources for extensions api
 func (m *Master) getExtensionResources(c *Config) map[string]rest.Storage {
 	// All resources except these are disabled by default.
-	enabledResources := sets.NewString("horizontalpodautoscalers", "ingresses", "jobs", "replicasets", "deployments")
+	enabledResources := sets.NewString("daemonsets", "deployments", "horizontalpodautoscalers", "ingresses", "jobs", "replicasets")
 	resourceOverrides := m.ApiGroupVersionOverrides["extensions/v1beta1"].ResourceOverrides
 	isEnabled := func(resource string) bool {
 		// Check if the resource has been overriden.

test/e2e/daemon_set.go

@@ -48,7 +48,7 @@ const (
 	daemonsetColorLabel  = daemonsetLabelPrefix + "color"
 )
 
-var _ = Describe("Daemon set [Feature:DaemonSet]", func() {
+var _ = Describe("Daemon set", func() {
 	var f *Framework
 
 	AfterEach(func() {

test/e2e/deployment.go

@@ -35,7 +35,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Deployment [Feature:Deployment]", func() {
+var _ = Describe("Deployment", func() {
 	f := NewFramework("deployment")
 
 	It("deployment should create new pods", func() {

test/e2e/horizontal_pod_autoscaling.go

@@ -42,7 +42,7 @@ var _ = Describe("Horizontal pod autoscaling (scale resource: CPU) [Serial] [Slo
 	titleDown := "Should scale from 5 pods to 3 pods and from 3 to 1"
 
 	// TODO(madhusudancs): Fix this when Scale group issues are resolved (see issue #18528).
-	// Describe("Deployment [Feature:Deployment]", func() {
+	// Describe("Deployment", func() {
 	// 	// CPU tests via deployments
 	// 	It(titleUp, func() {
 	// 		scaleUp("deployment", kindDeployment, rc, f)