Merge pull request #19839 from madhusudancs/replicaset-e2e-enable

cluster/gce/config-test.sh

@@ -51,6 +51,7 @@ TERMINATED_POD_GC_THRESHOLD=${TERMINATED_POD_GC_THRESHOLD:-100}
 # Optional: enable v1beta1 related features
 ENABLE_DEPLOYMENTS="${KUBE_ENABLE_DEPLOYMENTS:-true}"
 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

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
 
-Jobs, Ingress and HorizontalPodAutoscalers are enabled by default.
+HorizontalPodAutoscalers, Jobs, Ingress 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 enable deployments and disable jobs, set
 `--runtime-config=extensions/v1beta1/deployments=true,extensions/v1beta1/jobs=false`

pkg/master/master.go

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