Merge pull request #15409 from caesarxuchao/extension/v1beta1

cluster/gce/config-test.sh

@@ -64,7 +64,7 @@ TEST_CLUSTER_LOG_LEVEL="${TEST_CLUSTER_LOG_LEVEL:---v=4}"
 TEST_CLUSTER_RESYNC_PERIOD="${TEST_CLUSTER_RESYNC_PERIOD:---min-resync-period=3m}"
 
 KUBELET_TEST_ARGS="--max-pods=100 $TEST_CLUSTER_LOG_LEVEL"
-APISERVER_TEST_ARGS="--runtime-config=experimental/v1alpha1 ${TEST_CLUSTER_LOG_LEVEL}"
+APISERVER_TEST_ARGS="--runtime-config=extensions/v1beta1 ${TEST_CLUSTER_LOG_LEVEL}"
 CONTROLLER_MANAGER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL} ${TEST_CLUSTER_RESYNC_PERIOD}"
 SCHEDULER_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}"
 KUBEPROXY_TEST_ARGS="${TEST_CLUSTER_LOG_LEVEL}"

cluster/gce/util.sh

@@ -57,10 +57,10 @@ function join_csv {
 function verify-prereqs {
   if [[ "${ENABLE_EXPERIMENTAL_API}" == "true" ]]; then
     if [[ -z "${RUNTIME_CONFIG}" ]]; then
-      RUNTIME_CONFIG="experimental/v1alpha1=true"
+      RUNTIME_CONFIG="extensions/v1beta1=true"
     else
-      # TODO: add checking if RUNTIME_CONFIG contains "experimental/v1alpha1=false" and appending "experimental/v1alpha1=true" if not.
-      if echo "${RUNTIME_CONFIG}" | grep -q -v "experimental/v1alpha1=true"; then
+      # TODO: add checking if RUNTIME_CONFIG contains "extensions/v1beta1=false" and appending "extensions/v1beta1=true" if not.
+      if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1=true"; then
         echo "Experimental API should be turned on, but is not turned on in RUNTIME_CONFIG!" >&2
         exit 1
       fi

cluster/vagrant/util.sh

@@ -36,10 +36,10 @@ function detect-minions {
 function verify-prereqs {
   if [[ "${ENABLE_EXPERIMENTAL_API}" == "true" ]]; then
     if [[ -z "${RUNTIME_CONFIG}" ]]; then
-      RUNTIME_CONFIG="experimental/v1alpha1"
+      RUNTIME_CONFIG="extensions/v1beta1"
     else
       # TODO: add checking if RUNTIME_CONFIG contains "experimental/v1=false" and appending "experimental/v1=true" if not.
-      if echo "${RUNTIME_CONFIG}" | grep -q -v "experimental/v1alpha1=true"; then
+      if echo "${RUNTIME_CONFIG}" | grep -q -v "extensions/v1beta1=true"; then
         echo "Experimental API should be turned on, but is not turned on in RUNTIME_CONFIG!"
         exit 1
       fi

cmd/genconversion/conversion.go

@@ -27,8 +27,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/v1"
-	_ "k8s.io/kubernetes/pkg/apis/experimental"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
+	_ "k8s.io/kubernetes/pkg/apis/extensions"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	pkg_runtime "k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/sets"
 

cmd/gendeepcopy/deep_copy.go

@@ -27,8 +27,8 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/v1"
-	_ "k8s.io/kubernetes/pkg/apis/experimental"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
+	_ "k8s.io/kubernetes/pkg/apis/extensions"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	pkg_runtime "k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/sets"
 

cmd/integration/integration.go

@@ -135,7 +135,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
 
 	// TODO: caesarxuchao: hacky way to specify version of Experimental client.
 	// We will fix this by supporting multiple group versions in Config
-	cl.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Experimental.GroupAndVersion()})
+	cl.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServer.URL, Version: testapi.Extensions.GroupAndVersion()})
 
 	storageVersions := make(map[string]string)
 	etcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("").InterfacesFor, testapi.Default.GroupAndVersion(), etcdtest.PathPrefix())
@@ -143,14 +143,14 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
 	if err != nil {
 		glog.Fatalf("Unable to get etcd storage: %v", err)
 	}
-	expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("experimental").InterfacesFor, testapi.Experimental.GroupAndVersion(), etcdtest.PathPrefix())
-	storageVersions["experimental"] = testapi.Experimental.GroupAndVersion()
+	expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("extensions").InterfacesFor, testapi.Extensions.GroupAndVersion(), etcdtest.PathPrefix())
+	storageVersions["extensions"] = testapi.Extensions.GroupAndVersion()
 	if err != nil {
 		glog.Fatalf("Unable to get etcd storage for experimental: %v", err)
 	}
 	storageDestinations := master.NewStorageDestinations()
 	storageDestinations.AddAPIGroup("", etcdStorage)
-	storageDestinations.AddAPIGroup("experimental", expEtcdStorage)
+	storageDestinations.AddAPIGroup("extensions", expEtcdStorage)
 
 	// Master
 	host, port, err := net.SplitHostPort(strings.TrimLeft(apiServer.URL, "http://"))
@@ -985,7 +985,7 @@ func main() {
 	kubeClient := client.NewOrDie(&client.Config{Host: apiServerURL, Version: testapi.Default.GroupAndVersion()})
 	// TODO: caesarxuchao: hacky way to specify version of Experimental client.
 	// We will fix this by supporting multiple group versions in Config
-	kubeClient.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Experimental.GroupAndVersion()})
+	kubeClient.ExperimentalClient = client.NewExperimentalOrDie(&client.Config{Host: apiServerURL, Version: testapi.Extensions.GroupAndVersion()})
 
 	// Run tests in parallel
 	testFuncs := []testFunc{

cmd/kube-apiserver/app/server.go

@@ -401,9 +401,9 @@ func (s *APIServer) Run(_ []string) error {
 	disableV1 := disableAllAPIs
 	disableV1 = !s.getRuntimeConfigValue("api/v1", !disableV1)
 
-	// "experimental/v1alpha1={true|false} allows users to enable/disable the experimental API.
+	// "extensions/v1beta1={true|false} allows users to enable/disable the experimental API.
 	// This takes preference over api/all, if specified.
-	enableExp := s.getRuntimeConfigValue("experimental/v1alpha1", false)
+	enableExp := s.getRuntimeConfigValue("extensions/v1beta1", false)
 
 	clientConfig := &client.Config{
 		Host:    net.JoinHostPort(s.InsecureBindAddress.String(), strconv.Itoa(s.InsecurePort)),
@@ -432,7 +432,7 @@ func (s *APIServer) Run(_ []string) error {
 	storageDestinations.AddAPIGroup("", etcdStorage)
 
 	if enableExp {
-		expGroup, err := latest.Group("experimental")
+		expGroup, err := latest.Group("extensions")
 		if err != nil {
 			glog.Fatalf("experimental API is enabled in runtime config, but not enabled in the environment variable KUBE_API_VERSIONS. Error: %v", err)
 		}
@@ -443,7 +443,7 @@ func (s *APIServer) Run(_ []string) error {
 		if err != nil {
 			glog.Fatalf("Invalid experimental storage version or misconfigured etcd: %v", err)
 		}
-		storageDestinations.AddAPIGroup("experimental", expEtcdStorage)
+		storageDestinations.AddAPIGroup("extensions", expEtcdStorage)
 	}
 
 	updateEtcdOverrides(s.EtcdServersOverrides, storageVersions, s.EtcdPathPrefix, &storageDestinations, newEtcd)

cmd/kube-apiserver/app/server_test.go

@@ -76,18 +76,18 @@ func TestGenerateStorageVersionMap(t *testing.T) {
 	}{
 		{
 			legacyVersion:   "v1",
-			storageVersions: "v1,experimental/v1alpha1",
+			storageVersions: "v1,extensions/v1beta1",
 			expectedMap: map[string]string{
-				"":             "v1",
-				"experimental": "experimental/v1alpha1",
+				"":           "v1",
+				"extensions": "extensions/v1beta1",
 			},
 		},
 		{
 			legacyVersion:   "",
-			storageVersions: "experimental/v1alpha1,v1",
+			storageVersions: "extensions/v1beta1,v1",
 			expectedMap: map[string]string{
-				"":             "v1",
-				"experimental": "experimental/v1alpha1",
+				"":           "v1",
+				"extensions": "extensions/v1beta1",
 			},
 		},
 		{
@@ -105,7 +105,7 @@ func TestGenerateStorageVersionMap(t *testing.T) {
 }
 
 func TestUpdateEtcdOverrides(t *testing.T) {
-	storageVersions := generateStorageVersionMap("", "v1,experimental/v1alpha1")
+	storageVersions := generateStorageVersionMap("", "v1,extensions/v1beta1")
 
 	testCases := []struct {
 		apigroup string
@@ -123,7 +123,7 @@ func TestUpdateEtcdOverrides(t *testing.T) {
 			servers:  []string{"http://127.0.0.1:10000", "http://127.0.0.1:20000"},
 		},
 		{
-			apigroup: "experimental",
+			apigroup: "extensions",
 			resource: "resource",
 			servers:  []string{"http://127.0.0.1:10000"},
 		},

cmd/kube-version-change/import_known_versions.go

@@ -19,5 +19,5 @@ package main
 // These imports are the API groups the kube-version-change tool will support.
 import (
 	_ "k8s.io/kubernetes/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )

docs/admin/daemon.yaml

-apiVersion: experimental/v1alpha1
+apiVersion: extensions/v1beta1 
 kind: DaemonSet
 metadata:
   name: prometheus-node-exporter

docs/user-guide/job.yaml

-apiVersion: experimental/v1alpha1
+apiVersion: extensions/v1beta1 
 kind: Job
 metadata:
   name: pi

docs/user-guide/jobs.md

@@ -70,7 +70,7 @@ It takes around 10s to complete.
 <!-- BEGIN MUNGE: EXAMPLE job.yaml -->
 
 ```yaml
-apiVersion: experimental/v1alpha1
+apiVersion: extensions/v1beta1 
 kind: Job
 metadata:
   name: pi

examples/examples_test.go

@@ -29,8 +29,8 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/validation"
-	"k8s.io/kubernetes/pkg/apis/experimental"
-	expValidation "k8s.io/kubernetes/pkg/apis/experimental/validation"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	expValidation "k8s.io/kubernetes/pkg/apis/extensions/validation"
 	"k8s.io/kubernetes/pkg/capabilities"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/yaml"
@@ -101,17 +101,17 @@ func validateObject(obj runtime.Object) (errors []error) {
 			t.Namespace = api.NamespaceDefault
 		}
 		errors = validation.ValidateResourceQuota(t)
-	case *experimental.Deployment:
+	case *extensions.Deployment:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
 		}
 		errors = expValidation.ValidateDeployment(t)
-	case *experimental.Job:
+	case *extensions.Job:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
 		}
 		errors = expValidation.ValidateJob(t)
-	case *experimental.DaemonSet:
+	case *extensions.DaemonSet:
 		if t.Namespace == "" {
 			t.Namespace = api.NamespaceDefault
 		}
@@ -221,10 +221,10 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"multi-pod":   nil,
 			"pod":         &api.Pod{},
 			"replication": &api.ReplicationController{},
-			"job":         &experimental.Job{},
+			"job":         &extensions.Job{},
 		},
 		"../docs/admin": {
-			"daemon": &experimental.DaemonSet{},
+			"daemon": &extensions.DaemonSet{},
 		},
 		"../examples": {
 			"scheduler-policy-config": &schedulerapi.Policy{},
@@ -364,7 +364,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 			"fc": &api.Pod{},
 		},
 		"../examples/experimental": {
-			"deployment": &experimental.Deployment{},
+			"deployment": &extensions.Deployment{},
 		},
 		"../examples/javaweb-tomcat-sidecar": {
 			"javaweb":   &api.Pod{},

examples/experimental/deployment.yaml

-apiVersion: experimental/v1alpha1
+apiVersion: extensions/v1beta1 
 kind: Deployment
 metadata:
   name: nginx-deployment

hack/after-build/update-generated-conversions.sh

@@ -43,7 +43,7 @@ EOF
 }
 
 # TODO(lavalamp): get this list by listing the pkg/apis/ directory?
-DEFAULT_GROUP_VERSIONS="v1 experimental/v1alpha1"
+DEFAULT_GROUP_VERSIONS="v1 extensions/v1beta1"
 VERSIONS=${VERSIONS:-$DEFAULT_GROUP_VERSIONS}
 for ver in $VERSIONS; do
   # Ensure that the version being processed is registered by setting

hack/after-build/update-generated-deep-copies.sh

@@ -57,6 +57,6 @@ function generate_deep_copies() {
 }
 
 # v1 is in the group ""
-DEFAULT_VERSIONS="/ v1 experimental/ experimental/v1alpha1"
+DEFAULT_VERSIONS="/ v1 extensions/ extensions/v1beta1"
 VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS}
 generate_deep_copies "$VERSIONS"

hack/after-build/update-swagger-spec.sh

@@ -50,7 +50,7 @@ kube::etcd::start
 
 # Start kube-apiserver
 kube::log::status "Starting kube-apiserver"
-KUBE_API_VERSIONS="v1,experimental/v1alpha1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
+KUBE_API_VERSIONS="v1,extensions/v1beta1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
   --address="127.0.0.1" \
   --public-address-override="127.0.0.1" \
   --port="${API_PORT}" \

hack/after-build/verify-generated-conversions.sh

@@ -23,7 +23,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 
 kube::golang::setup_env
 
-APIROOTS=${APIROOTS:-pkg/api pkg/apis/experimental}
+APIROOTS=${APIROOTS:-pkg/api pkg/apis/extensions}
 _tmp="${KUBE_ROOT}/_tmp"
 
 cleanup() {

hack/after-build/verify-generated-deep-copies.sh

@@ -25,7 +25,7 @@ kube::golang::setup_env
 
 gendeepcopy=$(kube::util::find-binary "gendeepcopy")
 
-APIROOTS=${APIROOTS:-pkg/api pkg/apis/experimental}
+APIROOTS=${APIROOTS:-pkg/api pkg/apis/extensions}
 _tmp="${KUBE_ROOT}/_tmp"
 
 cleanup() {

hack/lib/util.sh

@@ -242,7 +242,7 @@ kube::util::analytics-link() {
 
 # Takes a group/version and returns the path to its location on disk, sans
 # "pkg". E.g.:
-# * default behavior: experimental/v1alpha1 -> apis/experimental/v1alpha1
+# * default behavior: extensions/v1beta1 -> apis/extensions/v1beta1
 # * default behavior for only a group: experimental -> apis/experimental
 # * Special handling for empty group: v1 -> api/v1, unversioned -> api/unversioned
 # * Very special handling for when both group and version are "": / -> api

hack/test-cmd.sh

@@ -127,7 +127,7 @@ kube::util::wait_for_url "http://127.0.0.1:${KUBELET_HEALTHZ_PORT}/healthz" "kub
 
 # Start kube-apiserver
 kube::log::status "Starting kube-apiserver"
-KUBE_API_VERSIONS="v1,experimental/v1alpha1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
+KUBE_API_VERSIONS="v1,extensions/v1beta1" "${KUBE_OUTPUT_HOSTBIN}/kube-apiserver" \
   --address="127.0.0.1" \
   --public-address-override="127.0.0.1" \
   --port="${API_PORT}" \
@@ -905,7 +905,7 @@ kube_api_versions=(
   v1
 )
 for version in "${kube_api_versions[@]}"; do
-  KUBE_API_VERSIONS="v1,experimental/v1alpha1" runTests "${version}"
+  KUBE_API_VERSIONS="v1,extensions/v1beta1" runTests "${version}"
 done
 
 kube::log::status "TEST PASSED"

hack/test-go.sh

@@ -57,8 +57,8 @@ KUBE_GOVERALLS_BIN=${KUBE_GOVERALLS_BIN:-}
 # separated by comma, lists are separated by semicolon. e.g.,
 # "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3"
 # TODO: It's going to be:
-# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"}
-KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"}
+# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"}
+KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"}
 # once we have multiple group supports
 # Run tests with the standard (registry) and a custom etcd prefix
 # (kubernetes.io/registry).
@@ -315,7 +315,7 @@ for (( i=0, j=0; ; )); do
   # KUBE_TEST_API sets the version of each group to be tested. KUBE_API_VERSIONS
   # register the groups/versions as supported by k8s. So KUBE_API_VERSIONS
   # needs to be the superset of KUBE_TEST_API.
-  KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,experimental/v1alpha1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
+  KUBE_TEST_API="${apiVersion}" KUBE_API_VERSIONS="v1,extensions/v1beta1" ETCD_PREFIX=${etcdPrefix} runTests "$@"
   i=${i}+1
   j=${j}+1
   if [[ i -eq ${apiVersionsCount} ]] && [[ j -eq ${etcdPrefixesCount} ]]; then

hack/test-integration.sh

@@ -28,8 +28,8 @@ source "${KUBE_ROOT}/hack/lib/init.sh"
 # separated by comma, lists are separated by semicolon. e.g.,
 # "v1,compute/v1alpha1,experimental/v1alpha2;v1,compute/v2,experimental/v1alpha3"
 # TODO: It's going to be:
-# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"}
-KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,experimental/v1alpha1"}
+# KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"}
+KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1,extensions/v1beta1"}
 
 # Give integration tests longer to run
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 240s}
@@ -52,18 +52,18 @@ runTests() {
     KUBE_RACE="" \
     KUBE_TIMEOUT="${KUBE_TIMEOUT}" \
     KUBE_TEST_API_VERSIONS="$1" \
-    KUBE_API_VERSIONS="v1,experimental/v1alpha1" \
+    KUBE_API_VERSIONS="v1,extensions/v1beta1" \
     "${KUBE_ROOT}/hack/test-go.sh" test/integration
 
   kube::log::status "Running integration test scenario"
 
-  KUBE_API_VERSIONS="v1,experimental/v1alpha1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
+  KUBE_API_VERSIONS="v1,extensions/v1beta1" KUBE_TEST_API_VERSIONS="$1" "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} \
     --max-concurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}"
 
   cleanup
 }
 
-KUBE_API_VERSIONS="v1,experimental/v1alpha1" "${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration
+KUBE_API_VERSIONS="v1,extensions/v1beta1" "${KUBE_ROOT}/hack/build-go.sh" "$@" cmd/integration
 
 # Run cleanup to stop etcd on interrupt or other kill signal.
 trap cleanup EXIT

hack/update-generated-swagger-docs.sh

@@ -56,7 +56,7 @@ EOF
   mv "$TMPFILE" "pkg/$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go"
 }
 
-GROUP_VERSIONS=(unversioned v1 experimental/v1alpha1)
+GROUP_VERSIONS=(unversioned v1 extensions/v1beta1)
 # To avoid compile errors, remove the currently existing files.
 for group_version in "${GROUP_VERSIONS[@]}"; do
   rm -f "pkg/$(kube::util::group-version-to-pkg-path "${group_version}")/types_swagger_doc_generated.go"

pkg/api/mapper.go

@@ -42,7 +42,7 @@ func NewDefaultRESTMapper(group string, versions []string, interfacesFunc meta.V
 	for _, version := range versions {
 		for kind, oType := range Scheme.KnownTypes(version) {
 			// TODO: Remove import path prefix check.
-			// We check the import path prefix because we currently stuff both "api" and "experimental" objects
+			// We check the import path prefix because we currently stuff both "api" and "extensions" objects
 			// into the same group within Scheme since Scheme has no notion of groups yet.
 			if !strings.HasPrefix(oType.PkgPath(), importPathPrefix) || ignoredKinds.Has(kind) {
 				continue

pkg/api/registered/registered.go

@@ -32,12 +32,12 @@ var RegisteredVersions []string
 func init() {
 	// TODO: caesarxuchao: rename this variable to validGroupVersions
 	validAPIVersions := map[string]bool{
-		"v1": true,
-		"experimental/v1alpha1": true,
+		"v1":                 true,
+		"extensions/v1beta1": true,
 	}
 
 	// The default list of supported api versions, in order of most preferred to the least.
-	defaultSupportedVersions := "v1,experimental/v1alpha1"
+	defaultSupportedVersions := "v1,extensions/v1beta1"
 	// Env var KUBE_API_VERSIONS is a comma separated list of API versions that should be registered in the scheme.
 	// The versions should be in the order of most preferred to the least.
 	supportedVersions := os.Getenv("KUBE_API_VERSIONS")

pkg/api/serialization_test.go

@@ -32,8 +32,8 @@ import (
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/sets"
 
-	_ "k8s.io/kubernetes/pkg/apis/experimental"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
+	_ "k8s.io/kubernetes/pkg/apis/extensions"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 
 	flag "github.com/spf13/pflag"
 )

pkg/api/testapi/testapi.go

@@ -24,7 +24,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 
 	"k8s.io/kubernetes/pkg/api/latest"
 	"k8s.io/kubernetes/pkg/api/meta"
@@ -33,9 +33,9 @@ import (
 )
 
 var (
-	Groups       = make(map[string]TestGroup)
-	Default      TestGroup
-	Experimental TestGroup
+	Groups     = make(map[string]TestGroup)
+	Default    TestGroup
+	Extensions TestGroup
 )
 
 type TestGroup struct {
@@ -66,12 +66,12 @@ func init() {
 		// have multiple group support
 		Groups[""] = TestGroup{"", latest.GroupOrDie("").Version, latest.GroupOrDie("").GroupVersion}
 	}
-	if _, ok := Groups["experimental"]; !ok {
-		Groups["experimental"] = TestGroup{"experimental", latest.GroupOrDie("experimental").Version, latest.GroupOrDie("experimental").GroupVersion}
+	if _, ok := Groups["extensions"]; !ok {
+		Groups["extensions"] = TestGroup{"extensions", latest.GroupOrDie("extensions").Version, latest.GroupOrDie("extensions").GroupVersion}
 	}
 
 	Default = Groups[""]
-	Experimental = Groups["experimental"]
+	Extensions = Groups["extensions"]
 }
 
 // Version returns the API version to test against, as set by the KUBE_TEST_API env var.
@@ -97,8 +97,8 @@ func (g TestGroup) Codec() runtime.Codec {
 		}
 		return interfaces.Codec
 	}
-	if g.Group == "experimental" {
-		interfaces, err := latest.GroupOrDie("experimental").InterfacesFor(g.GroupVersionUnderTest)
+	if g.Group == "extensions" {
+		interfaces, err := latest.GroupOrDie("extensions").InterfacesFor(g.GroupVersionUnderTest)
 		if err != nil {
 			panic(err)
 		}
@@ -118,8 +118,8 @@ func (g TestGroup) Converter() runtime.ObjectConvertor {
 		}
 		return interfaces.ObjectConvertor
 	}
-	if g.Group == "experimental" {
-		interfaces, err := latest.GroupOrDie("experimental").InterfacesFor(g.VersionUnderTest)
+	if g.Group == "extensions" {
+		interfaces, err := latest.GroupOrDie("extensions").InterfacesFor(g.VersionUnderTest)
 		if err != nil {
 			panic(err)
 		}
@@ -140,8 +140,8 @@ func (g TestGroup) MetadataAccessor() meta.MetadataAccessor {
 		}
 		return interfaces.MetadataAccessor
 	}
-	if g.Group == "experimental" {
-		interfaces, err := latest.GroupOrDie("experimental").InterfacesFor(g.VersionUnderTest)
+	if g.Group == "extensions" {
+		interfaces, err := latest.GroupOrDie("extensions").InterfacesFor(g.VersionUnderTest)
 		if err != nil {
 			panic(err)
 		}

pkg/api/testing/fuzzer.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/registered"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -126,15 +126,15 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 			c.FuzzNoCustom(j) // fuzz self without calling this function again
 			//j.TemplateRef = nil // this is required for round trip
 		},
-		func(j *experimental.DeploymentStrategy, c fuzz.Continue) {
+		func(j *extensions.DeploymentStrategy, c fuzz.Continue) {
 			c.FuzzNoCustom(j) // fuzz self without calling this function again
 			// Ensure that strategyType is one of valid values.
-			strategyTypes := []experimental.DeploymentStrategyType{experimental.RecreateDeploymentStrategyType, experimental.RollingUpdateDeploymentStrategyType}
+			strategyTypes := []extensions.DeploymentStrategyType{extensions.RecreateDeploymentStrategyType, extensions.RollingUpdateDeploymentStrategyType}
 			j.Type = strategyTypes[c.Rand.Intn(len(strategyTypes))]
-			if j.Type != experimental.RollingUpdateDeploymentStrategyType {
+			if j.Type != extensions.RollingUpdateDeploymentStrategyType {
 				j.RollingUpdate = nil
 			} else {
-				rollingUpdate := experimental.RollingUpdateDeployment{}
+				rollingUpdate := extensions.RollingUpdateDeployment{}
 				if c.RandBool() {
 					rollingUpdate.MaxUnavailable = util.NewIntOrStringFromInt(int(c.RandUint64()))
 					rollingUpdate.MaxSurge = util.NewIntOrStringFromInt(int(c.RandUint64()))
@@ -144,7 +144,7 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 				j.RollingUpdate = &rollingUpdate
 			}
 		},
-		func(j *experimental.JobSpec, c fuzz.Continue) {
+		func(j *extensions.JobSpec, c fuzz.Continue) {
 			c.FuzzNoCustom(j) // fuzz self without calling this function again
 			completions := c.Rand.Int()
 			parallelism := c.Rand.Int()
@@ -363,7 +363,7 @@ func FuzzerFor(t *testing.T, version string, src rand.Source) *fuzz.Fuzzer {
 			c.FuzzNoCustom(n)
 			n.Spec.ExternalID = "external"
 		},
-		func(s *experimental.APIVersion, c fuzz.Continue) {
+		func(s *extensions.APIVersion, c fuzz.Continue) {
 			// We can't use c.RandString() here because it may generate empty
 			// string, which will cause tests failure.
 			s.APIGroup = "something"

pkg/api/util/group_version_test.go

@@ -28,8 +28,8 @@ func TestGetVersion(t *testing.T) {
 			"v1",
 		},
 		{
-			"experimental/v1alpha1",
-			"v1alpha1",
+			"extensions/v1beta1",
+			"v1beta1",
 		},
 	}
 	for _, test := range testCases {
@@ -50,8 +50,8 @@ func TestGetGroup(t *testing.T) {
 			"",
 		},
 		{
-			"experimental/v1alpha1",
-			"experimental",
+			"extensions/v1beta1",
+			"extensions",
 		},
 	}
 	for _, test := range testCases {

pkg/api/validation/schema_test.go

@@ -136,7 +136,7 @@ func TestVersionRegex(t *testing.T) {
 			match:    true,
 		},
 		{
-			typeName: "v1alpha1.Binding",
+			typeName: "v1beta1.Binding",
 			match:    true,
 		},
 		{

pkg/apis/experimental/install/install.go → pkg/apis/extensions/install/install.go

@@ -29,23 +29,23 @@ import (
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/api/registered"
 	apiutil "k8s.io/kubernetes/pkg/api/util"
-	_ "k8s.io/kubernetes/pkg/apis/experimental"
-	"k8s.io/kubernetes/pkg/apis/experimental/v1alpha1"
+	_ "k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util/sets"
 )
 
-const importPrefix = "k8s.io/kubernetes/pkg/apis/experimental"
+const importPrefix = "k8s.io/kubernetes/pkg/apis/extensions"
 
 var accessor = meta.NewAccessor()
 
 func init() {
-	groupMeta, err := latest.RegisterGroup("experimental")
+	groupMeta, err := latest.RegisterGroup("extensions")
 	if err != nil {
 		glog.V(4).Infof("%v", err)
 		return
 	}
-	registeredGroupVersions := registered.GroupVersionsForGroup("experimental")
+	registeredGroupVersions := registered.GroupVersionsForGroup("extensions")
 	groupVersion := registeredGroupVersions[0]
 	*groupMeta = latest.GroupMeta{
 		GroupVersion: groupVersion,
@@ -70,7 +70,7 @@ func init() {
 
 	ignoredKinds := sets.NewString()
 
-	groupMeta.RESTMapper = api.NewDefaultRESTMapper("experimental", groupVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped)
+	groupMeta.RESTMapper = api.NewDefaultRESTMapper("extensions", groupVersions, interfacesFor, importPrefix, ignoredKinds, rootScoped)
 	api.RegisterRESTMapper(groupMeta.RESTMapper)
 	groupMeta.InterfacesFor = interfacesFor
 }
@@ -79,14 +79,14 @@ func init() {
 // string, or an error if the version is not known.
 func interfacesFor(version string) (*meta.VersionInterfaces, error) {
 	switch version {
-	case "experimental/v1alpha1":
+	case "extensions/v1beta1":
 		return &meta.VersionInterfaces{
-			Codec:            v1alpha1.Codec,
+			Codec:            v1beta1.Codec,
 			ObjectConvertor:  api.Scheme,
 			MetadataAccessor: accessor,
 		}, nil
 	default:
-		g, _ := latest.Group("experimental")
+		g, _ := latest.Group("extensions")
 		return nil, fmt.Errorf("unsupported storage version: %s (valid: %s)", version, strings.Join(g.Versions, ", "))
 	}
 }

pkg/apis/experimental/install/install_test.go → pkg/apis/extensions/install/install_test.go

@@ -23,11 +23,11 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/latest"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 func TestResourceVersioner(t *testing.T) {
-	daemonSet := experimental.DaemonSet{ObjectMeta: api.ObjectMeta{ResourceVersion: "10"}}
+	daemonSet := extensions.DaemonSet{ObjectMeta: api.ObjectMeta{ResourceVersion: "10"}}
 	version, err := accessor.ResourceVersion(&daemonSet)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -36,7 +36,7 @@ func TestResourceVersioner(t *testing.T) {
 		t.Errorf("unexpected version %v", version)
 	}
 
-	daemonSetList := experimental.DaemonSetList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}}
+	daemonSetList := extensions.DaemonSetList{ListMeta: unversioned.ListMeta{ResourceVersion: "10"}}
 	version, err = accessor.ResourceVersion(&daemonSetList)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -47,44 +47,44 @@ func TestResourceVersioner(t *testing.T) {
 }
 
 func TestCodec(t *testing.T) {
-	daemonSet := experimental.DaemonSet{}
+	daemonSet := extensions.DaemonSet{}
 	// We do want to use package latest rather than testapi here, because we
 	// want to test if the package install and package latest work as expected.
-	data, err := latest.GroupOrDie("experimental").Codec.Encode(&daemonSet)
+	data, err := latest.GroupOrDie("extensions").Codec.Encode(&daemonSet)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	other := experimental.DaemonSet{}
+	other := extensions.DaemonSet{}
 	if err := json.Unmarshal(data, &other); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
-	if other.APIVersion != latest.GroupOrDie("experimental").GroupVersion || other.Kind != "DaemonSet" {
+	if other.APIVersion != latest.GroupOrDie("extensions").GroupVersion || other.Kind != "DaemonSet" {
 		t.Errorf("unexpected unmarshalled object %#v", other)
 	}
 }
 
 func TestInterfacesFor(t *testing.T) {
-	if _, err := latest.GroupOrDie("experimental").InterfacesFor(""); err == nil {
+	if _, err := latest.GroupOrDie("extensions").InterfacesFor(""); err == nil {
 		t.Fatalf("unexpected non-error: %v", err)
 	}
-	for i, groupVersion := range append([]string{latest.GroupOrDie("experimental").GroupVersion}, latest.GroupOrDie("experimental").GroupVersions...) {
-		if vi, err := latest.GroupOrDie("experimental").InterfacesFor(groupVersion); err != nil || vi == nil {
+	for i, groupVersion := range append([]string{latest.GroupOrDie("extensions").GroupVersion}, latest.GroupOrDie("extensions").GroupVersions...) {
+		if vi, err := latest.GroupOrDie("extensions").InterfacesFor(groupVersion); err != nil || vi == nil {
 			t.Fatalf("%d: unexpected result: %v", i, err)
 		}
 	}
 }
 
 func TestRESTMapper(t *testing.T) {
-	if v, k, err := latest.GroupOrDie("experimental").RESTMapper.VersionAndKindForResource("horizontalpodautoscalers"); err != nil || v != "experimental/v1alpha1" || k != "HorizontalPodAutoscaler" {
+	if v, k, err := latest.GroupOrDie("extensions").RESTMapper.VersionAndKindForResource("horizontalpodautoscalers"); err != nil || v != "extensions/v1beta1" || k != "HorizontalPodAutoscaler" {
 		t.Errorf("unexpected version mapping: %s %s %v", v, k, err)
 	}
 
-	if m, err := latest.GroupOrDie("experimental").RESTMapper.RESTMapping("DaemonSet", ""); err != nil || m.APIVersion != "experimental/v1alpha1" || m.Resource != "daemonsets" {
+	if m, err := latest.GroupOrDie("extensions").RESTMapper.RESTMapping("DaemonSet", ""); err != nil || m.APIVersion != "extensions/v1beta1" || m.Resource != "daemonsets" {
 		t.Errorf("unexpected version mapping: %#v %v", m, err)
 	}
 
-	for _, groupVersion := range latest.GroupOrDie("experimental").GroupVersions {
-		mapping, err := latest.GroupOrDie("experimental").RESTMapper.RESTMapping("HorizontalPodAutoscaler", groupVersion)
+	for _, groupVersion := range latest.GroupOrDie("extensions").GroupVersions {
+		mapping, err := latest.GroupOrDie("extensions").RESTMapper.RESTMapping("HorizontalPodAutoscaler", groupVersion)
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)
 		}
@@ -96,12 +96,12 @@ func TestRESTMapper(t *testing.T) {
 			t.Errorf("incorrect groupVersion: %v", mapping)
 		}
 
-		interfaces, _ := latest.GroupOrDie("experimental").InterfacesFor(groupVersion)
+		interfaces, _ := latest.GroupOrDie("extensions").InterfacesFor(groupVersion)
 		if mapping.Codec != interfaces.Codec {
 			t.Errorf("unexpected codec: %#v, expected: %#v", mapping, interfaces)
 		}
 
-		rc := &experimental.HorizontalPodAutoscaler{ObjectMeta: api.ObjectMeta{Name: "foo"}}
+		rc := &extensions.HorizontalPodAutoscaler{ObjectMeta: api.ObjectMeta{Name: "foo"}}
 		name, err := mapping.MetadataAccessor.Name(rc)
 		if err != nil {
 			t.Errorf("unexpected error: %v", err)

pkg/apis/experimental/register.go → pkg/apis/extensions/register.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package experimental
+package extensions
 
 import (
 	"k8s.io/kubernetes/pkg/api"

pkg/apis/experimental/types.go → pkg/apis/extensions/types.go

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 /*
-This file (together with pkg/apis/experimental/v1alpha1/types.go) contain the experimental
+This file (together with pkg/apis/extensions/v1beta1/types.go) contain the experimental
 types in kubernetes. These API objects are experimental, meaning that the
 APIs may be broken at any time by the kubernetes team.
 
@@ -26,7 +26,7 @@ beyond registration differences. In other words, experimental API group
 support is experimental.
 */
 
-package experimental
+package extensions
 
 import (
 	"k8s.io/kubernetes/pkg/api"

pkg/apis/experimental/v1alpha1/conversion.go → pkg/apis/extensions/v1beta1/conversion.go

@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"reflect"
 
 	"k8s.io/kubernetes/pkg/api"
 	v1 "k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/util"
 )
@@ -31,12 +31,12 @@ func addConversionFuncs() {
 	err := api.Scheme.AddConversionFuncs(
 		convert_api_PodSpec_To_v1_PodSpec,
 		convert_v1_PodSpec_To_api_PodSpec,
-		convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec,
-		convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec,
-		convert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy,
-		convert_v1alpha1_DeploymentStrategy_To_experimental_DeploymentStrategy,
-		convert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeployment,
-		convert_v1alpha1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment,
+		convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec,
+		convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec,
+		convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy,
+		convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy,
+		convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment,
+		convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment,
 	)
 	if err != nil {
 		// If one of the conversion functions is malformed, detect it immediately.
@@ -199,9 +199,9 @@ func convert_v1_PodSpec_To_api_PodSpec(in *v1.PodSpec, out *api.PodSpec, s conve
 	return nil
 }
 
-func convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *experimental.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error {
+func convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(in *extensions.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*experimental.DeploymentSpec))(in)
+		defaulting.(func(*extensions.DeploymentSpec))(in)
 	}
 	out.Replicas = new(int)
 	*out.Replicas = in.Replicas
@@ -221,7 +221,7 @@ func convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *experime
 	} else {
 		out.Template = nil
 	}
-	if err := convert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
+	if err := convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
 		return err
 	}
 	out.UniqueLabelKey = new(string)
@@ -229,7 +229,7 @@ func convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *experime
 	return nil
 }
 
-func convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *DeploymentSpec, out *experimental.DeploymentSpec, s conversion.Scope) error {
+func convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(in *DeploymentSpec, out *extensions.DeploymentSpec, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*DeploymentSpec))(in)
 	}
@@ -252,7 +252,7 @@ func convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deployme
 	} else {
 		out.Template = nil
 	}
-	if err := convert_v1alpha1_DeploymentStrategy_To_experimental_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
+	if err := convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(&in.Strategy, &out.Strategy, s); err != nil {
 		return err
 	}
 	if in.UniqueLabelKey != nil {
@@ -261,14 +261,14 @@ func convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *Deployme
 	return nil
 }
 
-func convert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy(in *experimental.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
+func convert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy(in *extensions.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*experimental.DeploymentStrategy))(in)
+		defaulting.(func(*extensions.DeploymentStrategy))(in)
 	}
 	out.Type = DeploymentStrategyType(in.Type)
 	if in.RollingUpdate != nil {
 		out.RollingUpdate = new(RollingUpdateDeployment)
-		if err := convert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
+		if err := convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
 			return err
 		}
 	} else {
@@ -277,14 +277,14 @@ func convert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy(in *
 	return nil
 }
 
-func convert_v1alpha1_DeploymentStrategy_To_experimental_DeploymentStrategy(in *DeploymentStrategy, out *experimental.DeploymentStrategy, s conversion.Scope) error {
+func convert_v1beta1_DeploymentStrategy_To_extensions_DeploymentStrategy(in *DeploymentStrategy, out *extensions.DeploymentStrategy, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*DeploymentStrategy))(in)
 	}
-	out.Type = experimental.DeploymentStrategyType(in.Type)
+	out.Type = extensions.DeploymentStrategyType(in.Type)
 	if in.RollingUpdate != nil {
-		out.RollingUpdate = new(experimental.RollingUpdateDeployment)
-		if err := convert_v1alpha1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
+		out.RollingUpdate = new(extensions.RollingUpdateDeployment)
+		if err := convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in.RollingUpdate, out.RollingUpdate, s); err != nil {
 			return err
 		}
 	} else {
@@ -293,9 +293,9 @@ func convert_v1alpha1_DeploymentStrategy_To_experimental_DeploymentStrategy(in *
 	return nil
 }
 
-func convert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeployment(in *experimental.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error {
+func convert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *extensions.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
-		defaulting.(func(*experimental.RollingUpdateDeployment))(in)
+		defaulting.(func(*extensions.RollingUpdateDeployment))(in)
 	}
 	if out.MaxUnavailable == nil {
 		out.MaxUnavailable = &util.IntOrString{}
@@ -313,7 +313,7 @@ func convert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeplo
 	return nil
 }
 
-func convert_v1alpha1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment(in *RollingUpdateDeployment, out *experimental.RollingUpdateDeployment, s conversion.Scope) error {
+func convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in *RollingUpdateDeployment, out *extensions.RollingUpdateDeployment, s conversion.Scope) error {
 	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
 		defaulting.(func(*RollingUpdateDeployment))(in)
 	}

pkg/apis/experimental/v1alpha1/defaults.go → pkg/apis/extensions/v1beta1/defaults.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"k8s.io/kubernetes/pkg/api"
@@ -25,7 +25,7 @@ func addDefaultingFuncs() {
 	api.Scheme.AddDefaultingFuncs(
 		func(obj *APIVersion) {
 			if len(obj.APIGroup) == 0 {
-				obj.APIGroup = "experimental"
+				obj.APIGroup = "extensions"
 			}
 		},
 		func(obj *DaemonSet) {

pkg/apis/experimental/v1alpha1/defaults_test.go → pkg/apis/extensions/v1beta1/defaults_test.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"reflect"

pkg/apis/experimental/v1alpha1/register.go → pkg/apis/extensions/v1beta1/register.go

@@ -14,14 +14,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/runtime"
 )
 
-var Codec = runtime.CodecFor(api.Scheme, "experimental/v1alpha1")
+var Codec = runtime.CodecFor(api.Scheme, "extensions/v1beta1")
 
 func init() {
 	addKnownTypes()
@@ -31,7 +31,7 @@ func init() {
 
 // Adds the list of known types to api.Scheme.
 func addKnownTypes() {
-	api.Scheme.AddKnownTypes("experimental/v1alpha1",
+	api.Scheme.AddKnownTypes("extensions/v1beta1",
 		&ClusterAutoscaler{},
 		&ClusterAutoscalerList{},
 		&Deployment{},

pkg/apis/experimental/v1alpha1/types.go → pkg/apis/extensions/v1beta1/types.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 import (
 	"k8s.io/kubernetes/pkg/api/resource"

pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go → pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v1alpha1
+package v1beta1
 
 // This file contains a collection of methods that can be used from go-resful to
 // generate Swagger API documentation for its models. Please read this PR for more

pkg/apiserver/apiserver.go

@@ -271,7 +271,7 @@ func AddApisWebService(container *restful.Container, apiPrefix string, groups []
 }
 
 // Adds a service to return the supported versions, preferred version, and name
-// of a group. E.g., a such web service will be registered at /apis/experimental.
+// of a group. E.g., a such web service will be registered at /apis/extensions.
 func AddGroupWebService(container *restful.Container, path string, group api.APIGroup) {
 	groupHandler := GroupHandler(group)
 	ws := new(restful.WebService)
@@ -286,7 +286,7 @@ func AddGroupWebService(container *restful.Container, path string, group api.API
 }
 
 // Adds a service to return the supported resources, E.g., a such web service
-// will be registered at /apis/experimental/v1.
+// will be registered at /apis/extensions/v1.
 func AddSupportedResourcesWebService(ws *restful.WebService, groupVersion string, apiResources []api.APIResource) {
 	resourceHandler := SupportedResourcesHandler(groupVersion, apiResources)
 	ws.Route(ws.GET("/").To(resourceHandler).

pkg/apiserver/handlers_test.go

@@ -242,10 +242,10 @@ func TestGetAPIRequestInfo(t *testing.T) {
 		{"POST", "/api/v1/namespaces/other/pods", "create", "api", "", "v1", "other", "pods", "", "", []string{"pods"}},
 
 		// api group identification
-		{"POST", "/apis/experimental/v1/namespaces/other/pods", "create", "api", "experimental", "v1", "other", "pods", "", "", []string{"pods"}},
+		{"POST", "/apis/extensions/v1/namespaces/other/pods", "create", "api", "extensions", "v1", "other", "pods", "", "", []string{"pods"}},
 
 		// api version identification
-		{"POST", "/apis/experimental/v1beta3/namespaces/other/pods", "create", "api", "experimental", "v1beta3", "other", "pods", "", "", []string{"pods"}},
+		{"POST", "/apis/extensions/v1beta3/namespaces/other/pods", "create", "api", "extensions", "v1beta3", "other", "pods", "", "", []string{"pods"}},
 	}
 
 	apiRequestInfoResolver := newTestAPIRequestInfoResolver()

pkg/client/cache/listers.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/labels"
 )
 
@@ -232,7 +232,7 @@ type StoreToDaemonSetLister struct {
 }
 
 // Exists checks if the given daemon set exists in the store.
-func (s *StoreToDaemonSetLister) Exists(ds *experimental.DaemonSet) (bool, error) {
+func (s *StoreToDaemonSetLister) Exists(ds *extensions.DaemonSet) (bool, error) {
 	_, exists, err := s.Store.Get(ds)
 	if err != nil {
 		return false, err
@@ -242,18 +242,18 @@ func (s *StoreToDaemonSetLister) Exists(ds *experimental.DaemonSet) (bool, error
 
 // List lists all daemon sets in the store.
 // TODO: converge on the interface in pkg/client
-func (s *StoreToDaemonSetLister) List() (dss []experimental.DaemonSet, err error) {
+func (s *StoreToDaemonSetLister) List() (dss []extensions.DaemonSet, err error) {
 	for _, c := range s.Store.List() {
-		dss = append(dss, *(c.(*experimental.DaemonSet)))
+		dss = append(dss, *(c.(*extensions.DaemonSet)))
 	}
 	return dss, nil
 }
 
 // GetPodDaemonSets returns a list of daemon sets managing a pod.
 // Returns an error if and only if no matching daemon sets are found.
-func (s *StoreToDaemonSetLister) GetPodDaemonSets(pod *api.Pod) (daemonSets []experimental.DaemonSet, err error) {
+func (s *StoreToDaemonSetLister) GetPodDaemonSets(pod *api.Pod) (daemonSets []extensions.DaemonSet, err error) {
 	var selector labels.Selector
-	var daemonSet experimental.DaemonSet
+	var daemonSet extensions.DaemonSet
 
 	if len(pod.Labels) == 0 {
 		err = fmt.Errorf("No daemon sets found for pod %v because it has no labels", pod.Name)
@@ -261,7 +261,7 @@ func (s *StoreToDaemonSetLister) GetPodDaemonSets(pod *api.Pod) (daemonSets []ex
 	}
 
 	for _, m := range s.Store.List() {
-		daemonSet = *m.(*experimental.DaemonSet)
+		daemonSet = *m.(*extensions.DaemonSet)
 		if daemonSet.Namespace != pod.Namespace {
 			continue
 		}
@@ -351,7 +351,7 @@ type StoreToJobLister struct {
 }
 
 // Exists checks if the given job exists in the store.
-func (s *StoreToJobLister) Exists(job *experimental.Job) (bool, error) {
+func (s *StoreToJobLister) Exists(job *extensions.Job) (bool, error) {
 	_, exists, err := s.Store.Get(job)
 	if err != nil {
 		return false, err
@@ -360,17 +360,17 @@ func (s *StoreToJobLister) Exists(job *experimental.Job) (bool, error) {
 }
 
 // StoreToJobLister lists all jobs in the store.
-func (s *StoreToJobLister) List() (jobs []experimental.Job, err error) {
+func (s *StoreToJobLister) List() (jobs []extensions.Job, err error) {
 	for _, c := range s.Store.List() {
-		jobs = append(jobs, *(c.(*experimental.Job)))
+		jobs = append(jobs, *(c.(*extensions.Job)))
 	}
 	return jobs, nil
 }
 
 // GetPodControllers returns a list of jobs managing a pod. Returns an error only if no matching jobs are found.
-func (s *StoreToJobLister) GetPodJobs(pod *api.Pod) (jobs []experimental.Job, err error) {
+func (s *StoreToJobLister) GetPodJobs(pod *api.Pod) (jobs []extensions.Job, err error) {
 	var selector labels.Selector
-	var job experimental.Job
+	var job extensions.Job
 
 	if len(pod.Labels) == 0 {
 		err = fmt.Errorf("No jobs found for pod %v because it has no labels", pod.Name)
@@ -378,7 +378,7 @@ func (s *StoreToJobLister) GetPodJobs(pod *api.Pod) (jobs []experimental.Job, er
 	}
 
 	for _, m := range s.Store.List() {
-		job = *m.(*experimental.Job)
+		job = *m.(*extensions.Job)
 		if job.Namespace != pod.Namespace {
 			continue
 		}

pkg/client/cache/listers_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/util/sets"
 )
@@ -160,44 +160,44 @@ func TestStoreToDaemonSetLister(t *testing.T) {
 	store := NewStore(MetaNamespaceKeyFunc)
 	lister := StoreToDaemonSetLister{store}
 	testCases := []struct {
-		inDSs             []*experimental.DaemonSet
-		list              func() ([]experimental.DaemonSet, error)
+		inDSs             []*extensions.DaemonSet
+		list              func() ([]extensions.DaemonSet, error)
 		outDaemonSetNames sets.String
 		expectErr         bool
 	}{
 		// Basic listing
 		{
-			inDSs: []*experimental.DaemonSet{
+			inDSs: []*extensions.DaemonSet{
 				{ObjectMeta: api.ObjectMeta{Name: "basic"}},
 			},
-			list: func() ([]experimental.DaemonSet, error) {
+			list: func() ([]extensions.DaemonSet, error) {
 				return lister.List()
 			},
 			outDaemonSetNames: sets.NewString("basic"),
 		},
 		// Listing multiple daemon sets
 		{
-			inDSs: []*experimental.DaemonSet{
+			inDSs: []*extensions.DaemonSet{
 				{ObjectMeta: api.ObjectMeta{Name: "basic"}},
 				{ObjectMeta: api.ObjectMeta{Name: "complex"}},
 				{ObjectMeta: api.ObjectMeta{Name: "complex2"}},
 			},
-			list: func() ([]experimental.DaemonSet, error) {
+			list: func() ([]extensions.DaemonSet, error) {
 				return lister.List()
 			},
 			outDaemonSetNames: sets.NewString("basic", "complex", "complex2"),
 		},
 		// No pod labels
 		{
-			inDSs: []*experimental.DaemonSet{
+			inDSs: []*extensions.DaemonSet{
 				{
 					ObjectMeta: api.ObjectMeta{Name: "basic", Namespace: "ns"},
-					Spec: experimental.DaemonSetSpec{
+					Spec: extensions.DaemonSetSpec{
 						Selector: map[string]string{"foo": "baz"},
 					},
 				},
 			},
-			list: func() ([]experimental.DaemonSet, error) {
+			list: func() ([]extensions.DaemonSet, error) {
 				pod := &api.Pod{
 					ObjectMeta: api.ObjectMeta{Name: "pod1", Namespace: "ns"},
 				}
@@ -208,12 +208,12 @@ func TestStoreToDaemonSetLister(t *testing.T) {
 		},
 		// No DS selectors
 		{
-			inDSs: []*experimental.DaemonSet{
+			inDSs: []*extensions.DaemonSet{
 				{
 					ObjectMeta: api.ObjectMeta{Name: "basic", Namespace: "ns"},
 				},
 			},
-			list: func() ([]experimental.DaemonSet, error) {
+			list: func() ([]extensions.DaemonSet, error) {
 				pod := &api.Pod{
 					ObjectMeta: api.ObjectMeta{
 						Name:      "pod1",
@@ -228,21 +228,21 @@ func TestStoreToDaemonSetLister(t *testing.T) {
 		},
 		// Matching labels to selectors and namespace
 		{
-			inDSs: []*experimental.DaemonSet{
+			inDSs: []*extensions.DaemonSet{
 				{
 					ObjectMeta: api.ObjectMeta{Name: "foo"},
-					Spec: experimental.DaemonSetSpec{
+					Spec: extensions.DaemonSetSpec{
 						Selector: map[string]string{"foo": "bar"},
 					},
 				},
 				{
 					ObjectMeta: api.ObjectMeta{Name: "bar", Namespace: "ns"},
-					Spec: experimental.DaemonSetSpec{
+					Spec: extensions.DaemonSetSpec{
 						Selector: map[string]string{"foo": "bar"},
 					},
 				},
 			},
-			list: func() ([]experimental.DaemonSet, error) {
+			list: func() ([]extensions.DaemonSet, error) {
 				pod := &api.Pod{
 					ObjectMeta: api.ObjectMeta{
 						Name:      "pod1",

pkg/client/unversioned/client_test.go

@@ -92,7 +92,7 @@ func (c *testClient) Setup(t *testing.T) *testClient {
 		// We will fix this by supporting multiple group versions in Config
 		version = c.Version
 		if len(version) == 0 {
-			version = testapi.Experimental.Version()
+			version = testapi.Extensions.Version()
 		}
 		c.ExperimentalClient = NewExperimentalOrDie(&Config{
 			Host:    c.server.URL,
@@ -229,8 +229,8 @@ func body(t *testing.T, obj runtime.Object, raw *string) *string {
 			if err != nil {
 				t.Errorf("unexpected encoding error: %v", err)
 			}
-		} else if api.Scheme.Recognizes(testapi.Experimental.GroupAndVersion(), kind) {
-			bs, err = testapi.Experimental.Codec().Encode(obj)
+		} else if api.Scheme.Recognizes(testapi.Extensions.GroupAndVersion(), kind) {
+			bs, err = testapi.Extensions.Codec().Encode(obj)
 			if err != nil {
 				t.Errorf("unexpected encoding error: %v", err)
 			}

pkg/client/unversioned/conditions.go

@@ -18,7 +18,7 @@ package unversioned
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/util/wait"
 )
 
@@ -45,7 +45,7 @@ func ControllerHasDesiredReplicas(c Interface, controller *api.ReplicationContro
 
 // JobHasDesiredParallelism returns a condition that will be true if the desired parallelism count
 // for a job equals the current active counts or is less by an appropriate successful/unsuccessful count.
-func JobHasDesiredParallelism(c Interface, job *experimental.Job) wait.ConditionFunc {
+func JobHasDesiredParallelism(c Interface, job *extensions.Job) wait.ConditionFunc {
 
 	return func() (bool, error) {
 		job, err := c.Experimental().Jobs(job.Namespace).Get(job.Name)

pkg/client/unversioned/daemon_sets.go

@@ -17,7 +17,7 @@ limitations under the License.
 package unversioned
 
 import (
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -29,11 +29,11 @@ type DaemonSetsNamespacer interface {
 }
 
 type DaemonSetInterface interface {
-	List(selector labels.Selector) (*experimental.DaemonSetList, error)
-	Get(name string) (*experimental.DaemonSet, error)
-	Create(ctrl *experimental.DaemonSet) (*experimental.DaemonSet, error)
-	Update(ctrl *experimental.DaemonSet) (*experimental.DaemonSet, error)
-	UpdateStatus(ctrl *experimental.DaemonSet) (*experimental.DaemonSet, error)
+	List(selector labels.Selector) (*extensions.DaemonSetList, error)
+	Get(name string) (*extensions.DaemonSet, error)
+	Create(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error)
+	Update(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error)
+	UpdateStatus(ctrl *extensions.DaemonSet) (*extensions.DaemonSet, error)
 	Delete(name string) error
 	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)
 }
@@ -51,36 +51,36 @@ func newDaemonSets(c *ExperimentalClient, namespace string) *daemonSets {
 // Ensure statically that daemonSets implements DaemonSetsInterface.
 var _ DaemonSetInterface = &daemonSets{}
 
-func (c *daemonSets) List(selector labels.Selector) (result *experimental.DaemonSetList, err error) {
-	result = &experimental.DaemonSetList{}
+func (c *daemonSets) List(selector labels.Selector) (result *extensions.DaemonSetList, err error) {
+	result = &extensions.DaemonSetList{}
 	err = c.r.Get().Namespace(c.ns).Resource("daemonsets").LabelsSelectorParam(selector).Do().Into(result)
 	return
 }
 
 // Get returns information about a particular daemon set.
-func (c *daemonSets) Get(name string) (result *experimental.DaemonSet, err error) {
-	result = &experimental.DaemonSet{}
+func (c *daemonSets) Get(name string) (result *extensions.DaemonSet, err error) {
+	result = &extensions.DaemonSet{}
 	err = c.r.Get().Namespace(c.ns).Resource("daemonsets").Name(name).Do().Into(result)
 	return
 }
 
 // Create creates a new daemon set.
-func (c *daemonSets) Create(daemon *experimental.DaemonSet) (result *experimental.DaemonSet, err error) {
-	result = &experimental.DaemonSet{}
+func (c *daemonSets) Create(daemon *extensions.DaemonSet) (result *extensions.DaemonSet, err error) {
+	result = &extensions.DaemonSet{}
 	err = c.r.Post().Namespace(c.ns).Resource("daemonsets").Body(daemon).Do().Into(result)
 	return
 }
 
 // Update updates an existing daemon set.
-func (c *daemonSets) Update(daemon *experimental.DaemonSet) (result *experimental.DaemonSet, err error) {
-	result = &experimental.DaemonSet{}
+func (c *daemonSets) Update(daemon *extensions.DaemonSet) (result *extensions.DaemonSet, err error) {
+	result = &extensions.DaemonSet{}
 	err = c.r.Put().Namespace(c.ns).Resource("daemonsets").Name(daemon.Name).Body(daemon).Do().Into(result)
 	return
 }
 
 // UpdateStatus updates an existing daemon set status
-func (c *daemonSets) UpdateStatus(daemon *experimental.DaemonSet) (result *experimental.DaemonSet, err error) {
-	result = &experimental.DaemonSet{}
+func (c *daemonSets) UpdateStatus(daemon *extensions.DaemonSet) (result *extensions.DaemonSet, err error) {
+	result = &extensions.DaemonSet{}
 	err = c.r.Put().Namespace(c.ns).Resource("daemonsets").Name(daemon.Name).SubResource("status").Body(daemon).Do().Into(result)
 	return
 }

pkg/client/unversioned/daemon_sets_test.go

@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/labels"
 )
 
@@ -34,11 +34,11 @@ func TestListDaemonSets(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getDSResourceName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getDSResourceName(), ns, ""),
 		},
 		Response: Response{StatusCode: 200,
-			Body: &experimental.DaemonSetList{
-				Items: []experimental.DaemonSet{
+			Body: &extensions.DaemonSetList{
+				Items: []extensions.DaemonSet{
 					{
 						ObjectMeta: api.ObjectMeta{
 							Name: "foo",
@@ -47,7 +47,7 @@ func TestListDaemonSets(t *testing.T) {
 								"name": "baz",
 							},
 						},
-						Spec: experimental.DaemonSetSpec{
+						Spec: extensions.DaemonSetSpec{
 							Template: &api.PodTemplateSpec{},
 						},
 					},
@@ -63,10 +63,10 @@ func TestListDaemonSets(t *testing.T) {
 func TestGetDaemonSet(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request: testRequest{Method: "GET", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
+		Request: testRequest{Method: "GET", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.DaemonSet{
+			Body: &extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -74,7 +74,7 @@ func TestGetDaemonSet(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.DaemonSetSpec{
+				Spec: extensions.DaemonSetSpec{
 					Template: &api.PodTemplateSpec{},
 				},
 			},
@@ -97,14 +97,14 @@ func TestGetDaemonSetWithNoName(t *testing.T) {
 
 func TestUpdateDaemonSet(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestDaemonSet := &experimental.DaemonSet{
+	requestDaemonSet := &extensions.DaemonSet{
 		ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"},
 	}
 	c := &testClient{
-		Request: testRequest{Method: "PUT", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
+		Request: testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.DaemonSet{
+			Body: &extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -112,7 +112,7 @@ func TestUpdateDaemonSet(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.DaemonSetSpec{
+				Spec: extensions.DaemonSetSpec{
 					Template: &api.PodTemplateSpec{},
 				},
 			},
@@ -124,14 +124,14 @@ func TestUpdateDaemonSet(t *testing.T) {
 
 func TestUpdateDaemonSetUpdateStatus(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestDaemonSet := &experimental.DaemonSet{
+	requestDaemonSet := &extensions.DaemonSet{
 		ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"},
 	}
 	c := &testClient{
-		Request: testRequest{Method: "PUT", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo") + "/status", Query: buildQueryValues(nil)},
+		Request: testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo") + "/status", Query: buildQueryValues(nil)},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.DaemonSet{
+			Body: &extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -139,10 +139,10 @@ func TestUpdateDaemonSetUpdateStatus(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.DaemonSetSpec{
+				Spec: extensions.DaemonSetSpec{
 					Template: &api.PodTemplateSpec{},
 				},
-				Status: experimental.DaemonSetStatus{},
+				Status: extensions.DaemonSetStatus{},
 			},
 		},
 	}
@@ -153,7 +153,7 @@ func TestUpdateDaemonSetUpdateStatus(t *testing.T) {
 func TestDeleteDaemon(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request:  testRequest{Method: "DELETE", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
+		Request:  testRequest{Method: "DELETE", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
 	err := c.Setup(t).Experimental().DaemonSets(ns).Delete("foo")
@@ -162,14 +162,14 @@ func TestDeleteDaemon(t *testing.T) {
 
 func TestCreateDaemonSet(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestDaemonSet := &experimental.DaemonSet{
+	requestDaemonSet := &extensions.DaemonSet{
 		ObjectMeta: api.ObjectMeta{Name: "foo"},
 	}
 	c := &testClient{
-		Request: testRequest{Method: "POST", Path: testapi.Experimental.ResourcePath(getDSResourceName(), ns, ""), Body: requestDaemonSet, Query: buildQueryValues(nil)},
+		Request: testRequest{Method: "POST", Path: testapi.Extensions.ResourcePath(getDSResourceName(), ns, ""), Body: requestDaemonSet, Query: buildQueryValues(nil)},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.DaemonSet{
+			Body: &extensions.DaemonSet{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -177,7 +177,7 @@ func TestCreateDaemonSet(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.DaemonSetSpec{
+				Spec: extensions.DaemonSetSpec{
 					Template: &api.PodTemplateSpec{},
 				},
 			},

pkg/client/unversioned/deployment.go

@@ -18,7 +18,7 @@ package unversioned
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,11 +31,11 @@ type DeploymentsNamespacer interface {
 
 // DeploymentInterface has methods to work with Deployment resources.
 type DeploymentInterface interface {
-	List(label labels.Selector, field fields.Selector) (*experimental.DeploymentList, error)
-	Get(name string) (*experimental.Deployment, error)
+	List(label labels.Selector, field fields.Selector) (*extensions.DeploymentList, error)
+	Get(name string) (*extensions.Deployment, error)
 	Delete(name string, options *api.DeleteOptions) error
-	Create(Deployment *experimental.Deployment) (*experimental.Deployment, error)
-	Update(Deployment *experimental.Deployment) (*experimental.Deployment, error)
+	Create(Deployment *extensions.Deployment) (*extensions.Deployment, error)
+	Update(Deployment *extensions.Deployment) (*extensions.Deployment, error)
 	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)
 }
 
@@ -54,15 +54,15 @@ func newDeployments(c *ExperimentalClient, namespace string) *deployments {
 }
 
 // List takes label and field selectors, and returns the list of Deployments that match those selectors.
-func (c *deployments) List(label labels.Selector, field fields.Selector) (result *experimental.DeploymentList, err error) {
-	result = &experimental.DeploymentList{}
+func (c *deployments) List(label labels.Selector, field fields.Selector) (result *extensions.DeploymentList, err error) {
+	result = &extensions.DeploymentList{}
 	err = c.client.Get().Namespace(c.ns).Resource("deployments").LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result)
 	return
 }
 
 // Get takes name of the deployment, and returns the corresponding deployment object, and an error if there is any.
-func (c *deployments) Get(name string) (result *experimental.Deployment, err error) {
-	result = &experimental.Deployment{}
+func (c *deployments) Get(name string) (result *extensions.Deployment, err error) {
+	result = &extensions.Deployment{}
 	err = c.client.Get().Namespace(c.ns).Resource("deployments").Name(name).Do().Into(result)
 	return
 }
@@ -80,15 +80,15 @@ func (c *deployments) Delete(name string, options *api.DeleteOptions) error {
 }
 
 // Create takes the representation of a deployment and creates it.  Returns the server's representation of the deployment, and an error, if there is any.
-func (c *deployments) Create(deployment *experimental.Deployment) (result *experimental.Deployment, err error) {
-	result = &experimental.Deployment{}
+func (c *deployments) Create(deployment *extensions.Deployment) (result *extensions.Deployment, err error) {
+	result = &extensions.Deployment{}
 	err = c.client.Post().Namespace(c.ns).Resource("deployments").Body(deployment).Do().Into(result)
 	return
 }
 
 // Update takes the representation of a deployment and updates it. Returns the server's representation of the deployment, and an error, if there is any.
-func (c *deployments) Update(deployment *experimental.Deployment) (result *experimental.Deployment, err error) {
-	result = &experimental.Deployment{}
+func (c *deployments) Update(deployment *extensions.Deployment) (result *extensions.Deployment, err error) {
+	result = &extensions.Deployment{}
 	err = c.client.Put().Namespace(c.ns).Resource("deployments").Name(deployment.Name).Body(deployment).Do().Into(result)
 	return
 }

pkg/client/unversioned/deployment_test.go

@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 )
@@ -33,7 +33,7 @@ func getDeploymentsResoureName() string {
 
 func TestDeploymentCreate(t *testing.T) {
 	ns := api.NamespaceDefault
-	deployment := experimental.Deployment{
+	deployment := extensions.Deployment{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "abc",
 			Namespace: ns,
@@ -42,7 +42,7 @@ func TestDeploymentCreate(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "POST",
-			Path:   testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, ""),
 			Query:  buildQueryValues(nil),
 			Body:   &deployment,
 		},
@@ -58,7 +58,7 @@ func TestDeploymentCreate(t *testing.T) {
 
 func TestDeploymentGet(t *testing.T) {
 	ns := api.NamespaceDefault
-	deployment := &experimental.Deployment{
+	deployment := &extensions.Deployment{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "abc",
 			Namespace: ns,
@@ -67,7 +67,7 @@ func TestDeploymentGet(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, "abc"),
+			Path:   testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, "abc"),
 			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
@@ -80,8 +80,8 @@ func TestDeploymentGet(t *testing.T) {
 
 func TestDeploymentList(t *testing.T) {
 	ns := api.NamespaceDefault
-	deploymentList := &experimental.DeploymentList{
-		Items: []experimental.Deployment{
+	deploymentList := &extensions.DeploymentList{
+		Items: []extensions.Deployment{
 			{
 				ObjectMeta: api.ObjectMeta{
 					Name:      "foo",
@@ -93,7 +93,7 @@ func TestDeploymentList(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, ""),
 			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
@@ -105,7 +105,7 @@ func TestDeploymentList(t *testing.T) {
 
 func TestDeploymentUpdate(t *testing.T) {
 	ns := api.NamespaceDefault
-	deployment := &experimental.Deployment{
+	deployment := &extensions.Deployment{
 		ObjectMeta: api.ObjectMeta{
 			Name:            "abc",
 			Namespace:       ns,
@@ -115,7 +115,7 @@ func TestDeploymentUpdate(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "PUT",
-			Path:   testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, "abc"),
+			Path:   testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, "abc"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{StatusCode: 200, Body: deployment},
@@ -129,7 +129,7 @@ func TestDeploymentDelete(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "DELETE",
-			Path:   testapi.Experimental.ResourcePath(getDeploymentsResoureName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getDeploymentsResoureName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{StatusCode: 200},
@@ -142,7 +142,7 @@ func TestDeploymentWatch(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePathWithPrefix("watch", getDeploymentsResoureName(), "", ""),
+			Path:   testapi.Extensions.ResourcePathWithPrefix("watch", getDeploymentsResoureName(), "", ""),
 			Query:  url.Values{"resourceVersion": []string{}},
 		},
 		Response: Response{StatusCode: 200},

pkg/client/unversioned/experimental.go

@@ -130,7 +130,7 @@ func NewExperimentalOrDie(c *Config) *ExperimentalClient {
 
 func setExperimentalDefaults(config *Config) error {
 	// if experimental group is not registered, return an error
-	g, err := latest.Group("experimental")
+	g, err := latest.Group("extensions")
 	if err != nil {
 		return err
 	}
@@ -146,7 +146,7 @@ func setExperimentalDefaults(config *Config) error {
 	versionInterfaces, err := g.InterfacesFor(config.Version)
 	if err != nil {
 		return fmt.Errorf("Experimental API version '%s' is not recognized (valid values: %s)",
-			config.Version, strings.Join(latest.GroupOrDie("experimental").Versions, ", "))
+			config.Version, strings.Join(latest.GroupOrDie("extensions").Versions, ", "))
 	}
 	config.Codec = versionInterfaces.Codec
 	if config.QPS == 0 {

pkg/client/unversioned/helper.go

@@ -144,7 +144,7 @@ func New(c *Config) (*Client, error) {
 		return nil, err
 	}
 
-	if _, err := latest.Group("experimental"); err != nil {
+	if _, err := latest.Group("extensions"); err != nil {
 		return &Client{RESTClient: client, ExperimentalClient: nil}, nil
 	}
 	experimentalConfig := *c

pkg/client/unversioned/horizontalpodautoscaler.go

@@ -18,7 +18,7 @@ package unversioned
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,11 +31,11 @@ type HorizontalPodAutoscalersNamespacer interface {
 
 // HorizontalPodAutoscalerInterface has methods to work with HorizontalPodAutoscaler resources.
 type HorizontalPodAutoscalerInterface interface {
-	List(label labels.Selector, field fields.Selector) (*experimental.HorizontalPodAutoscalerList, error)
-	Get(name string) (*experimental.HorizontalPodAutoscaler, error)
+	List(label labels.Selector, field fields.Selector) (*extensions.HorizontalPodAutoscalerList, error)
+	Get(name string) (*extensions.HorizontalPodAutoscaler, error)
 	Delete(name string, options *api.DeleteOptions) error
-	Create(horizontalPodAutoscaler *experimental.HorizontalPodAutoscaler) (*experimental.HorizontalPodAutoscaler, error)
-	Update(horizontalPodAutoscaler *experimental.HorizontalPodAutoscaler) (*experimental.HorizontalPodAutoscaler, error)
+	Create(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error)
+	Update(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error)
 	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)
 }
 
@@ -54,15 +54,15 @@ func newHorizontalPodAutoscalers(c *ExperimentalClient, namespace string) *horiz
 }
 
 // List takes label and field selectors, and returns the list of horizontalPodAutoscalers that match those selectors.
-func (c *horizontalPodAutoscalers) List(label labels.Selector, field fields.Selector) (result *experimental.HorizontalPodAutoscalerList, err error) {
-	result = &experimental.HorizontalPodAutoscalerList{}
+func (c *horizontalPodAutoscalers) List(label labels.Selector, field fields.Selector) (result *extensions.HorizontalPodAutoscalerList, err error) {
+	result = &extensions.HorizontalPodAutoscalerList{}
 	err = c.client.Get().Namespace(c.ns).Resource("horizontalPodAutoscalers").LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result)
 	return
 }
 
 // Get takes the name of the horizontalPodAutoscaler, and returns the corresponding HorizontalPodAutoscaler object, and an error if it occurs
-func (c *horizontalPodAutoscalers) Get(name string) (result *experimental.HorizontalPodAutoscaler, err error) {
-	result = &experimental.HorizontalPodAutoscaler{}
+func (c *horizontalPodAutoscalers) Get(name string) (result *extensions.HorizontalPodAutoscaler, err error) {
+	result = &extensions.HorizontalPodAutoscaler{}
 	err = c.client.Get().Namespace(c.ns).Resource("horizontalPodAutoscalers").Name(name).Do().Into(result)
 	return
 }
@@ -81,15 +81,15 @@ func (c *horizontalPodAutoscalers) Delete(name string, options *api.DeleteOption
 }
 
 // Create takes the representation of a horizontalPodAutoscaler and creates it.  Returns the server's representation of the horizontalPodAutoscaler, and an error, if it occurs.
-func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *experimental.HorizontalPodAutoscaler) (result *experimental.HorizontalPodAutoscaler, err error) {
-	result = &experimental.HorizontalPodAutoscaler{}
+func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (result *extensions.HorizontalPodAutoscaler, err error) {
+	result = &extensions.HorizontalPodAutoscaler{}
 	err = c.client.Post().Namespace(c.ns).Resource("horizontalPodAutoscalers").Body(horizontalPodAutoscaler).Do().Into(result)
 	return
 }
 
 // Update takes the representation of a horizontalPodAutoscaler and updates it.  Returns the server's representation of the horizontalPodAutoscaler, and an error, if it occurs.
-func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *experimental.HorizontalPodAutoscaler) (result *experimental.HorizontalPodAutoscaler, err error) {
-	result = &experimental.HorizontalPodAutoscaler{}
+func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *extensions.HorizontalPodAutoscaler) (result *extensions.HorizontalPodAutoscaler, err error) {
+	result = &extensions.HorizontalPodAutoscaler{}
 	err = c.client.Put().Namespace(c.ns).Resource("horizontalPodAutoscalers").Name(horizontalPodAutoscaler.Name).Body(horizontalPodAutoscaler).Do().Into(result)
 	return
 }

pkg/client/unversioned/horizontalpodautoscaler_test.go

@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 )
@@ -33,7 +33,7 @@ func getHorizontalPodAutoscalersResoureName() string {
 
 func TestHorizontalPodAutoscalerCreate(t *testing.T) {
 	ns := api.NamespaceDefault
-	horizontalPodAutoscaler := experimental.HorizontalPodAutoscaler{
+	horizontalPodAutoscaler := extensions.HorizontalPodAutoscaler{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "abc",
 			Namespace: ns,
@@ -42,7 +42,7 @@ func TestHorizontalPodAutoscalerCreate(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "POST",
-			Path:   testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""),
 			Query:  buildQueryValues(nil),
 			Body:   &horizontalPodAutoscaler,
 		},
@@ -58,7 +58,7 @@ func TestHorizontalPodAutoscalerCreate(t *testing.T) {
 
 func TestHorizontalPodAutoscalerGet(t *testing.T) {
 	ns := api.NamespaceDefault
-	horizontalPodAutoscaler := &experimental.HorizontalPodAutoscaler{
+	horizontalPodAutoscaler := &extensions.HorizontalPodAutoscaler{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "abc",
 			Namespace: ns,
@@ -67,7 +67,7 @@ func TestHorizontalPodAutoscalerGet(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"),
+			Path:   testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"),
 			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
@@ -80,8 +80,8 @@ func TestHorizontalPodAutoscalerGet(t *testing.T) {
 
 func TestHorizontalPodAutoscalerList(t *testing.T) {
 	ns := api.NamespaceDefault
-	horizontalPodAutoscalerList := &experimental.HorizontalPodAutoscalerList{
-		Items: []experimental.HorizontalPodAutoscaler{
+	horizontalPodAutoscalerList := &extensions.HorizontalPodAutoscalerList{
+		Items: []extensions.HorizontalPodAutoscaler{
 			{
 				ObjectMeta: api.ObjectMeta{
 					Name:      "foo",
@@ -93,7 +93,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, ""),
 			Query:  buildQueryValues(nil),
 			Body:   nil,
 		},
@@ -105,7 +105,7 @@ func TestHorizontalPodAutoscalerList(t *testing.T) {
 
 func TestHorizontalPodAutoscalerUpdate(t *testing.T) {
 	ns := api.NamespaceDefault
-	horizontalPodAutoscaler := &experimental.HorizontalPodAutoscaler{
+	horizontalPodAutoscaler := &extensions.HorizontalPodAutoscaler{
 		ObjectMeta: api.ObjectMeta{
 			Name:            "abc",
 			Namespace:       ns,
@@ -113,7 +113,7 @@ func TestHorizontalPodAutoscalerUpdate(t *testing.T) {
 		},
 	}
 	c := &testClient{
-		Request:  testRequest{Method: "PUT", Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), Query: buildQueryValues(nil)},
+		Request:  testRequest{Method: "PUT", Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "abc"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200, Body: horizontalPodAutoscaler},
 	}
 	response, err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Update(horizontalPodAutoscaler)
@@ -123,7 +123,7 @@ func TestHorizontalPodAutoscalerUpdate(t *testing.T) {
 func TestHorizontalPodAutoscalerDelete(t *testing.T) {
 	ns := api.NamespaceDefault
 	c := &testClient{
-		Request:  testRequest{Method: "DELETE", Path: testapi.Experimental.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "foo"), Query: buildQueryValues(nil)},
+		Request:  testRequest{Method: "DELETE", Path: testapi.Extensions.ResourcePath(getHorizontalPodAutoscalersResoureName(), ns, "foo"), Query: buildQueryValues(nil)},
 		Response: Response{StatusCode: 200},
 	}
 	err := c.Setup(t).Experimental().HorizontalPodAutoscalers(ns).Delete("foo", nil)
@@ -134,7 +134,7 @@ func TestHorizontalPodAutoscalerWatch(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePathWithPrefix("watch", getHorizontalPodAutoscalersResoureName(), "", ""),
+			Path:   testapi.Extensions.ResourcePathWithPrefix("watch", getHorizontalPodAutoscalersResoureName(), "", ""),
 			Query:  url.Values{"resourceVersion": []string{}}},
 		Response: Response{StatusCode: 200},
 	}

pkg/client/unversioned/import_known_versions.go

@@ -19,5 +19,5 @@ package unversioned
 // These imports are the API groups the client will support.
 import (
 	_ "k8s.io/kubernetes/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )

pkg/client/unversioned/ingress.go

@@ -18,7 +18,7 @@ package unversioned
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,13 +31,13 @@ type IngressNamespacer interface {
 
 // IngressInterface exposes methods to work on Ingress resources.
 type IngressInterface interface {
-	List(label labels.Selector, field fields.Selector) (*experimental.IngressList, error)
-	Get(name string) (*experimental.Ingress, error)
-	Create(ingress *experimental.Ingress) (*experimental.Ingress, error)
-	Update(ingress *experimental.Ingress) (*experimental.Ingress, error)
+	List(label labels.Selector, field fields.Selector) (*extensions.IngressList, error)
+	Get(name string) (*extensions.Ingress, error)
+	Create(ingress *extensions.Ingress) (*extensions.Ingress, error)
+	Update(ingress *extensions.Ingress) (*extensions.Ingress, error)
 	Delete(name string, options *api.DeleteOptions) error
 	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)
-	UpdateStatus(ingress *experimental.Ingress) (*experimental.Ingress, error)
+	UpdateStatus(ingress *extensions.Ingress) (*extensions.Ingress, error)
 }
 
 // ingress implements IngressNamespacer interface
@@ -52,29 +52,29 @@ func newIngress(c *ExperimentalClient, namespace string) *ingress {
 }
 
 // List returns a list of ingress that match the label and field selectors.
-func (c *ingress) List(label labels.Selector, field fields.Selector) (result *experimental.IngressList, err error) {
-	result = &experimental.IngressList{}
+func (c *ingress) List(label labels.Selector, field fields.Selector) (result *extensions.IngressList, err error) {
+	result = &extensions.IngressList{}
 	err = c.r.Get().Namespace(c.ns).Resource("ingress").LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result)
 	return
 }
 
 // Get returns information about a particular ingress.
-func (c *ingress) Get(name string) (result *experimental.Ingress, err error) {
-	result = &experimental.Ingress{}
+func (c *ingress) Get(name string) (result *extensions.Ingress, err error) {
+	result = &extensions.Ingress{}
 	err = c.r.Get().Namespace(c.ns).Resource("ingress").Name(name).Do().Into(result)
 	return
 }
 
 // Create creates a new ingress.
-func (c *ingress) Create(ingress *experimental.Ingress) (result *experimental.Ingress, err error) {
-	result = &experimental.Ingress{}
+func (c *ingress) Create(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
+	result = &extensions.Ingress{}
 	err = c.r.Post().Namespace(c.ns).Resource("ingress").Body(ingress).Do().Into(result)
 	return
 }
 
 // Update updates an existing ingress.
-func (c *ingress) Update(ingress *experimental.Ingress) (result *experimental.Ingress, err error) {
-	result = &experimental.Ingress{}
+func (c *ingress) Update(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
+	result = &extensions.Ingress{}
 	err = c.r.Put().Namespace(c.ns).Resource("ingress").Name(ingress.Name).Body(ingress).Do().Into(result)
 	return
 }
@@ -105,8 +105,8 @@ func (c *ingress) Watch(label labels.Selector, field fields.Selector, resourceVe
 }
 
 // UpdateStatus takes the name of the ingress and the new status.  Returns the server's representation of the ingress, and an error, if it occurs.
-func (c *ingress) UpdateStatus(ingress *experimental.Ingress) (result *experimental.Ingress, err error) {
-	result = &experimental.Ingress{}
+func (c *ingress) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
+	result = &extensions.Ingress{}
 	err = c.r.Put().Namespace(c.ns).Resource("ingress").Name(ingress.Name).SubResource("status").Body(ingress).Do().Into(result)
 	return
 }

pkg/client/unversioned/ingress_test.go

@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 )
@@ -35,11 +35,11 @@ func TestListIngress(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getIngressResourceName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getIngressResourceName(), ns, ""),
 		},
 		Response: Response{StatusCode: 200,
-			Body: &experimental.IngressList{
-				Items: []experimental.Ingress{
+			Body: &extensions.IngressList{
+				Items: []extensions.Ingress{
 					{
 						ObjectMeta: api.ObjectMeta{
 							Name: "foo",
@@ -48,8 +48,8 @@ func TestListIngress(t *testing.T) {
 								"name": "baz",
 							},
 						},
-						Spec: experimental.IngressSpec{
-							Rules: []experimental.IngressRule{},
+						Spec: extensions.IngressSpec{
+							Rules: []extensions.IngressRule{},
 						},
 					},
 				},
@@ -65,12 +65,12 @@ func TestGetIngress(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Ingress{
+			Body: &extensions.Ingress{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -78,8 +78,8 @@ func TestGetIngress(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.IngressSpec{
-					Rules: []experimental.IngressRule{},
+				Spec: extensions.IngressSpec{
+					Rules: []extensions.IngressRule{},
 				},
 			},
 		},
@@ -101,7 +101,7 @@ func TestGetIngressWithNoName(t *testing.T) {
 
 func TestUpdateIngress(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestIngress := &experimental.Ingress{
+	requestIngress := &extensions.Ingress{
 		ObjectMeta: api.ObjectMeta{
 			Name:            "foo",
 			Namespace:       ns,
@@ -111,12 +111,12 @@ func TestUpdateIngress(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "PUT",
-			Path:   testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Ingress{
+			Body: &extensions.Ingress{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -124,8 +124,8 @@ func TestUpdateIngress(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.IngressSpec{
-					Rules: []experimental.IngressRule{},
+				Spec: extensions.IngressSpec{
+					Rules: []extensions.IngressRule{},
 				},
 			},
 		},
@@ -141,25 +141,25 @@ func TestUpdateIngressStatus(t *testing.T) {
 			{IP: "127.0.0.1"},
 		},
 	}
-	requestIngress := &experimental.Ingress{
+	requestIngress := &extensions.Ingress{
 		ObjectMeta: api.ObjectMeta{
 			Name:            "foo",
 			Namespace:       ns,
 			ResourceVersion: "1",
 		},
-		Status: experimental.IngressStatus{
+		Status: extensions.IngressStatus{
 			LoadBalancer: lbStatus,
 		},
 	}
 	c := &testClient{
 		Request: testRequest{
 			Method: "PUT",
-			Path:   testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo") + "/status",
+			Path:   testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo") + "/status",
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Ingress{
+			Body: &extensions.Ingress{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -167,10 +167,10 @@ func TestUpdateIngressStatus(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.IngressSpec{
-					Rules: []experimental.IngressRule{},
+				Spec: extensions.IngressSpec{
+					Rules: []extensions.IngressRule{},
 				},
-				Status: experimental.IngressStatus{
+				Status: extensions.IngressStatus{
 					LoadBalancer: lbStatus,
 				},
 			},
@@ -185,7 +185,7 @@ func TestDeleteIngress(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "DELETE",
-			Path:   testapi.Experimental.ResourcePath(getIngressResourceName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getIngressResourceName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{StatusCode: 200},
@@ -196,7 +196,7 @@ func TestDeleteIngress(t *testing.T) {
 
 func TestCreateIngress(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestIngress := &experimental.Ingress{
+	requestIngress := &extensions.Ingress{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "foo",
 			Namespace: ns,
@@ -205,13 +205,13 @@ func TestCreateIngress(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "POST",
-			Path:   testapi.Experimental.ResourcePath(getIngressResourceName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getIngressResourceName(), ns, ""),
 			Body:   requestIngress,
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Ingress{
+			Body: &extensions.Ingress{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -219,8 +219,8 @@ func TestCreateIngress(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.IngressSpec{
-					Rules: []experimental.IngressRule{},
+				Spec: extensions.IngressSpec{
+					Rules: []extensions.IngressRule{},
 				},
 			},
 		},

pkg/client/unversioned/jobs.go

@@ -19,7 +19,7 @@ package unversioned
 import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/latest"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -32,13 +32,13 @@ type JobsNamespacer interface {
 
 // JobInterface exposes methods to work on Job resources.
 type JobInterface interface {
-	List(label labels.Selector, field fields.Selector) (*experimental.JobList, error)
-	Get(name string) (*experimental.Job, error)
-	Create(job *experimental.Job) (*experimental.Job, error)
-	Update(job *experimental.Job) (*experimental.Job, error)
+	List(label labels.Selector, field fields.Selector) (*extensions.JobList, error)
+	Get(name string) (*extensions.Job, error)
+	Create(job *extensions.Job) (*extensions.Job, error)
+	Update(job *extensions.Job) (*extensions.Job, error)
 	Delete(name string, options *api.DeleteOptions) error
 	Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)
-	UpdateStatus(job *experimental.Job) (*experimental.Job, error)
+	UpdateStatus(job *extensions.Job) (*extensions.Job, error)
 }
 
 // jobs implements JobsNamespacer interface
@@ -56,29 +56,29 @@ func newJobs(c *ExperimentalClient, namespace string) *jobs {
 var _ JobInterface = &jobs{}
 
 // List returns a list of jobs that match the label and field selectors.
-func (c *jobs) List(label labels.Selector, field fields.Selector) (result *experimental.JobList, err error) {
-	result = &experimental.JobList{}
+func (c *jobs) List(label labels.Selector, field fields.Selector) (result *extensions.JobList, err error) {
+	result = &extensions.JobList{}
 	err = c.r.Get().Namespace(c.ns).Resource("jobs").LabelsSelectorParam(label).FieldsSelectorParam(field).Do().Into(result)
 	return
 }
 
 // Get returns information about a particular job.
-func (c *jobs) Get(name string) (result *experimental.Job, err error) {
-	result = &experimental.Job{}
+func (c *jobs) Get(name string) (result *extensions.Job, err error) {
+	result = &extensions.Job{}
 	err = c.r.Get().Namespace(c.ns).Resource("jobs").Name(name).Do().Into(result)
 	return
 }
 
 // Create creates a new job.
-func (c *jobs) Create(job *experimental.Job) (result *experimental.Job, err error) {
-	result = &experimental.Job{}
+func (c *jobs) Create(job *extensions.Job) (result *extensions.Job, err error) {
+	result = &extensions.Job{}
 	err = c.r.Post().Namespace(c.ns).Resource("jobs").Body(job).Do().Into(result)
 	return
 }
 
 // Update updates an existing job.
-func (c *jobs) Update(job *experimental.Job) (result *experimental.Job, err error) {
-	result = &experimental.Job{}
+func (c *jobs) Update(job *extensions.Job) (result *extensions.Job, err error) {
+	result = &extensions.Job{}
 	err = c.r.Put().Namespace(c.ns).Resource("jobs").Name(job.Name).Body(job).Do().Into(result)
 	return
 }
@@ -109,8 +109,8 @@ func (c *jobs) Watch(label labels.Selector, field fields.Selector, resourceVersi
 }
 
 // UpdateStatus takes the name of the job and the new status.  Returns the server's representation of the job, and an error, if it occurs.
-func (c *jobs) UpdateStatus(job *experimental.Job) (result *experimental.Job, err error) {
-	result = &experimental.Job{}
+func (c *jobs) UpdateStatus(job *extensions.Job) (result *extensions.Job, err error) {
+	result = &extensions.Job{}
 	err = c.r.Put().Namespace(c.ns).Resource("jobs").Name(job.Name).SubResource("status").Body(job).Do().Into(result)
 	return
 }

pkg/client/unversioned/jobs_test.go

@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 )
@@ -35,11 +35,11 @@ func TestListJobs(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getJobResourceName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getJobResourceName(), ns, ""),
 		},
 		Response: Response{StatusCode: 200,
-			Body: &experimental.JobList{
-				Items: []experimental.Job{
+			Body: &extensions.JobList{
+				Items: []extensions.Job{
 					{
 						ObjectMeta: api.ObjectMeta{
 							Name: "foo",
@@ -48,7 +48,7 @@ func TestListJobs(t *testing.T) {
 								"name": "baz",
 							},
 						},
-						Spec: experimental.JobSpec{
+						Spec: extensions.JobSpec{
 							Template: &api.PodTemplateSpec{},
 						},
 					},
@@ -65,12 +65,12 @@ func TestGetJob(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "GET",
-			Path:   testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Job{
+			Body: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -78,7 +78,7 @@ func TestGetJob(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Template: &api.PodTemplateSpec{},
 				},
 			},
@@ -101,7 +101,7 @@ func TestGetJobWithNoName(t *testing.T) {
 
 func TestUpdateJob(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestJob := &experimental.Job{
+	requestJob := &extensions.Job{
 		ObjectMeta: api.ObjectMeta{
 			Name:            "foo",
 			Namespace:       ns,
@@ -111,12 +111,12 @@ func TestUpdateJob(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "PUT",
-			Path:   testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Job{
+			Body: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -124,7 +124,7 @@ func TestUpdateJob(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Template: &api.PodTemplateSpec{},
 				},
 			},
@@ -136,7 +136,7 @@ func TestUpdateJob(t *testing.T) {
 
 func TestUpdateJobStatus(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestJob := &experimental.Job{
+	requestJob := &extensions.Job{
 		ObjectMeta: api.ObjectMeta{
 			Name:            "foo",
 			Namespace:       ns,
@@ -146,12 +146,12 @@ func TestUpdateJobStatus(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "PUT",
-			Path:   testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo") + "/status",
+			Path:   testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo") + "/status",
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Job{
+			Body: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -159,10 +159,10 @@ func TestUpdateJobStatus(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Template: &api.PodTemplateSpec{},
 				},
-				Status: experimental.JobStatus{
+				Status: extensions.JobStatus{
 					Active: 1,
 				},
 			},
@@ -177,7 +177,7 @@ func TestDeleteJob(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "DELETE",
-			Path:   testapi.Experimental.ResourcePath(getJobResourceName(), ns, "foo"),
+			Path:   testapi.Extensions.ResourcePath(getJobResourceName(), ns, "foo"),
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{StatusCode: 200},
@@ -188,7 +188,7 @@ func TestDeleteJob(t *testing.T) {
 
 func TestCreateJob(t *testing.T) {
 	ns := api.NamespaceDefault
-	requestJob := &experimental.Job{
+	requestJob := &extensions.Job{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "foo",
 			Namespace: ns,
@@ -197,13 +197,13 @@ func TestCreateJob(t *testing.T) {
 	c := &testClient{
 		Request: testRequest{
 			Method: "POST",
-			Path:   testapi.Experimental.ResourcePath(getJobResourceName(), ns, ""),
+			Path:   testapi.Extensions.ResourcePath(getJobResourceName(), ns, ""),
 			Body:   requestJob,
 			Query:  buildQueryValues(nil),
 		},
 		Response: Response{
 			StatusCode: 200,
-			Body: &experimental.Job{
+			Body: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					Name: "foo",
 					Labels: map[string]string{
@@ -211,7 +211,7 @@ func TestCreateJob(t *testing.T) {
 						"name": "baz",
 					},
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Template: &api.PodTemplateSpec{},
 				},
 			},

pkg/client/unversioned/scale.go

@@ -18,7 +18,7 @@ package unversioned
 
 import (
 	"k8s.io/kubernetes/pkg/api/meta"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 type ScaleNamespacer interface {
@@ -27,8 +27,8 @@ type ScaleNamespacer interface {
 
 // ScaleInterface has methods to work with Scale (sub)resources.
 type ScaleInterface interface {
-	Get(string, string) (*experimental.Scale, error)
-	Update(string, *experimental.Scale) (*experimental.Scale, error)
+	Get(string, string) (*extensions.Scale, error)
+	Update(string, *extensions.Scale) (*extensions.Scale, error)
 }
 
 // horizontalPodAutoscalers implements HorizontalPodAutoscalersNamespacer interface
@@ -46,15 +46,15 @@ func newScales(c *ExperimentalClient, namespace string) *scales {
 }
 
 // Get takes the reference to scale subresource and returns the subresource or error, if one occurs.
-func (c *scales) Get(kind string, name string) (result *experimental.Scale, err error) {
-	result = &experimental.Scale{}
+func (c *scales) Get(kind string, name string) (result *extensions.Scale, err error) {
+	result = &extensions.Scale{}
 	resource, _ := meta.KindToResource(kind, false)
 	err = c.client.Get().Namespace(c.ns).Resource(resource).Name(name).SubResource("scale").Do().Into(result)
 	return
 }
 
-func (c *scales) Update(kind string, scale *experimental.Scale) (result *experimental.Scale, err error) {
-	result = &experimental.Scale{}
+func (c *scales) Update(kind string, scale *extensions.Scale) (result *extensions.Scale, err error) {
+	result = &extensions.Scale{}
 	resource, _ := meta.KindToResource(kind, false)
 	err = c.client.Put().
 		Namespace(scale.Namespace).

pkg/client/unversioned/testclient/fake_daemon_sets.go

@@ -17,7 +17,7 @@ limitations under the License.
 package testclient
 
 import (
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	kClientLib "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
@@ -34,48 +34,48 @@ type FakeDaemonSets struct {
 // Ensure statically that FakeDaemonSets implements DaemonInterface.
 var _ kClientLib.DaemonSetInterface = &FakeDaemonSets{}
 
-func (c *FakeDaemonSets) Get(name string) (*experimental.DaemonSet, error) {
-	obj, err := c.Fake.Invokes(NewGetAction("daemonsets", c.Namespace, name), &experimental.DaemonSet{})
+func (c *FakeDaemonSets) Get(name string) (*extensions.DaemonSet, error) {
+	obj, err := c.Fake.Invokes(NewGetAction("daemonsets", c.Namespace, name), &extensions.DaemonSet{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*experimental.DaemonSet), err
+	return obj.(*extensions.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) List(label labels.Selector) (*experimental.DaemonSetList, error) {
-	obj, err := c.Fake.Invokes(NewListAction("daemonsets", c.Namespace, label, nil), &experimental.DaemonSetList{})
+func (c *FakeDaemonSets) List(label labels.Selector) (*extensions.DaemonSetList, error) {
+	obj, err := c.Fake.Invokes(NewListAction("daemonsets", c.Namespace, label, nil), &extensions.DaemonSetList{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*experimental.DaemonSetList), err
+	return obj.(*extensions.DaemonSetList), err
 }
 
-func (c *FakeDaemonSets) Create(daemon *experimental.DaemonSet) (*experimental.DaemonSet, error) {
-	obj, err := c.Fake.Invokes(NewCreateAction("daemonsets", c.Namespace, daemon), &experimental.DaemonSet{})
+func (c *FakeDaemonSets) Create(daemon *extensions.DaemonSet) (*extensions.DaemonSet, error) {
+	obj, err := c.Fake.Invokes(NewCreateAction("daemonsets", c.Namespace, daemon), &extensions.DaemonSet{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*experimental.DaemonSet), err
+	return obj.(*extensions.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) Update(daemon *experimental.DaemonSet) (*experimental.DaemonSet, error) {
-	obj, err := c.Fake.Invokes(NewUpdateAction("daemonsets", c.Namespace, daemon), &experimental.DaemonSet{})
+func (c *FakeDaemonSets) Update(daemon *extensions.DaemonSet) (*extensions.DaemonSet, error) {
+	obj, err := c.Fake.Invokes(NewUpdateAction("daemonsets", c.Namespace, daemon), &extensions.DaemonSet{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*experimental.DaemonSet), err
+	return obj.(*extensions.DaemonSet), err
 }
 
-func (c *FakeDaemonSets) UpdateStatus(daemon *experimental.DaemonSet) (*experimental.DaemonSet, error) {
-	obj, err := c.Fake.Invokes(NewUpdateSubresourceAction("daemonsets", "status", c.Namespace, daemon), &experimental.DaemonSet{})
+func (c *FakeDaemonSets) UpdateStatus(daemon *extensions.DaemonSet) (*extensions.DaemonSet, error) {
+	obj, err := c.Fake.Invokes(NewUpdateSubresourceAction("daemonsets", "status", c.Namespace, daemon), &extensions.DaemonSet{})
 	if obj == nil {
 		return nil, err
 	}
-	return obj.(*experimental.DaemonSet), err
+	return obj.(*extensions.DaemonSet), err
 }
 
 func (c *FakeDaemonSets) Delete(name string) error {
-	_, err := c.Fake.Invokes(NewDeleteAction("daemonsets", c.Namespace, name), &experimental.DaemonSet{})
+	_, err := c.Fake.Invokes(NewDeleteAction("daemonsets", c.Namespace, name), &extensions.DaemonSet{})
 	return err
 }
 

pkg/client/unversioned/testclient/fake_deployments.go

@@ -18,7 +18,7 @@ package testclient
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,22 +31,22 @@ type FakeDeployments struct {
 	Namespace string
 }
 
-func (c *FakeDeployments) Get(name string) (*experimental.Deployment, error) {
-	obj, err := c.Fake.Invokes(NewGetAction("deployments", c.Namespace, name), &experimental.Deployment{})
+func (c *FakeDeployments) Get(name string) (*extensions.Deployment, error) {
+	obj, err := c.Fake.Invokes(NewGetAction("deployments", c.Namespace, name), &extensions.Deployment{})
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Deployment), err
+	return obj.(*extensions.Deployment), err
 }
 
-func (c *FakeDeployments) List(label labels.Selector, field fields.Selector) (*experimental.DeploymentList, error) {
-	obj, err := c.Fake.Invokes(NewListAction("deployments", c.Namespace, label, field), &experimental.DeploymentList{})
+func (c *FakeDeployments) List(label labels.Selector, field fields.Selector) (*extensions.DeploymentList, error) {
+	obj, err := c.Fake.Invokes(NewListAction("deployments", c.Namespace, label, field), &extensions.DeploymentList{})
 	if obj == nil {
 		return nil, err
 	}
-	list := &experimental.DeploymentList{}
-	for _, deployment := range obj.(*experimental.DeploymentList).Items {
+	list := &extensions.DeploymentList{}
+	for _, deployment := range obj.(*extensions.DeploymentList).Items {
 		if label.Matches(labels.Set(deployment.Labels)) {
 			list.Items = append(list.Items, deployment)
 		}
@@ -54,26 +54,26 @@ func (c *FakeDeployments) List(label labels.Selector, field fields.Selector) (*e
 	return list, err
 }
 
-func (c *FakeDeployments) Create(deployment *experimental.Deployment) (*experimental.Deployment, error) {
+func (c *FakeDeployments) Create(deployment *extensions.Deployment) (*extensions.Deployment, error) {
 	obj, err := c.Fake.Invokes(NewCreateAction("deployments", c.Namespace, deployment), deployment)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Deployment), err
+	return obj.(*extensions.Deployment), err
 }
 
-func (c *FakeDeployments) Update(deployment *experimental.Deployment) (*experimental.Deployment, error) {
+func (c *FakeDeployments) Update(deployment *extensions.Deployment) (*extensions.Deployment, error) {
 	obj, err := c.Fake.Invokes(NewUpdateAction("deployments", c.Namespace, deployment), deployment)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Deployment), err
+	return obj.(*extensions.Deployment), err
 }
 
 func (c *FakeDeployments) Delete(name string, options *api.DeleteOptions) error {
-	_, err := c.Fake.Invokes(NewDeleteAction("deployments", c.Namespace, name), &experimental.Deployment{})
+	_, err := c.Fake.Invokes(NewDeleteAction("deployments", c.Namespace, name), &extensions.Deployment{})
 	return err
 }
 

pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go

@@ -18,7 +18,7 @@ package testclient
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,22 +31,22 @@ type FakeHorizontalPodAutoscalers struct {
 	Namespace string
 }
 
-func (c *FakeHorizontalPodAutoscalers) Get(name string) (*experimental.HorizontalPodAutoscaler, error) {
-	obj, err := c.Fake.Invokes(NewGetAction("horizontalpodautoscalers", c.Namespace, name), &experimental.HorizontalPodAutoscaler{})
+func (c *FakeHorizontalPodAutoscalers) Get(name string) (*extensions.HorizontalPodAutoscaler, error) {
+	obj, err := c.Fake.Invokes(NewGetAction("horizontalpodautoscalers", c.Namespace, name), &extensions.HorizontalPodAutoscaler{})
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.HorizontalPodAutoscaler), err
+	return obj.(*extensions.HorizontalPodAutoscaler), err
 }
 
-func (c *FakeHorizontalPodAutoscalers) List(label labels.Selector, field fields.Selector) (*experimental.HorizontalPodAutoscalerList, error) {
-	obj, err := c.Fake.Invokes(NewListAction("horizontalpodautoscalers", c.Namespace, label, field), &experimental.HorizontalPodAutoscalerList{})
+func (c *FakeHorizontalPodAutoscalers) List(label labels.Selector, field fields.Selector) (*extensions.HorizontalPodAutoscalerList, error) {
+	obj, err := c.Fake.Invokes(NewListAction("horizontalpodautoscalers", c.Namespace, label, field), &extensions.HorizontalPodAutoscalerList{})
 	if obj == nil {
 		return nil, err
 	}
-	list := &experimental.HorizontalPodAutoscalerList{}
-	for _, a := range obj.(*experimental.HorizontalPodAutoscalerList).Items {
+	list := &extensions.HorizontalPodAutoscalerList{}
+	for _, a := range obj.(*extensions.HorizontalPodAutoscalerList).Items {
 		if label.Matches(labels.Set(a.Labels)) {
 			list.Items = append(list.Items, a)
 		}
@@ -54,26 +54,26 @@ func (c *FakeHorizontalPodAutoscalers) List(label labels.Selector, field fields.
 	return list, err
 }
 
-func (c *FakeHorizontalPodAutoscalers) Create(a *experimental.HorizontalPodAutoscaler) (*experimental.HorizontalPodAutoscaler, error) {
+func (c *FakeHorizontalPodAutoscalers) Create(a *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) {
 	obj, err := c.Fake.Invokes(NewCreateAction("horizontalpodautoscalers", c.Namespace, a), a)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.HorizontalPodAutoscaler), err
+	return obj.(*extensions.HorizontalPodAutoscaler), err
 }
 
-func (c *FakeHorizontalPodAutoscalers) Update(a *experimental.HorizontalPodAutoscaler) (*experimental.HorizontalPodAutoscaler, error) {
+func (c *FakeHorizontalPodAutoscalers) Update(a *extensions.HorizontalPodAutoscaler) (*extensions.HorizontalPodAutoscaler, error) {
 	obj, err := c.Fake.Invokes(NewUpdateAction("horizontalpodautoscalers", c.Namespace, a), a)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.HorizontalPodAutoscaler), err
+	return obj.(*extensions.HorizontalPodAutoscaler), err
 }
 
 func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *api.DeleteOptions) error {
-	_, err := c.Fake.Invokes(NewDeleteAction("horizontalpodautoscalers", c.Namespace, name), &experimental.HorizontalPodAutoscaler{})
+	_, err := c.Fake.Invokes(NewDeleteAction("horizontalpodautoscalers", c.Namespace, name), &extensions.HorizontalPodAutoscaler{})
 	return err
 }
 

pkg/client/unversioned/testclient/fake_ingress.go

@@ -18,7 +18,7 @@ package testclient
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,44 +31,44 @@ type FakeIngress struct {
 	Namespace string
 }
 
-func (c *FakeIngress) Get(name string) (*experimental.Ingress, error) {
-	obj, err := c.Fake.Invokes(NewGetAction("ingress", c.Namespace, name), &experimental.Ingress{})
+func (c *FakeIngress) Get(name string) (*extensions.Ingress, error) {
+	obj, err := c.Fake.Invokes(NewGetAction("ingress", c.Namespace, name), &extensions.Ingress{})
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Ingress), err
+	return obj.(*extensions.Ingress), err
 }
 
-func (c *FakeIngress) List(label labels.Selector, fields fields.Selector) (*experimental.IngressList, error) {
-	obj, err := c.Fake.Invokes(NewListAction("ingress", c.Namespace, label, nil), &experimental.IngressList{})
+func (c *FakeIngress) List(label labels.Selector, fields fields.Selector) (*extensions.IngressList, error) {
+	obj, err := c.Fake.Invokes(NewListAction("ingress", c.Namespace, label, nil), &extensions.IngressList{})
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.IngressList), err
+	return obj.(*extensions.IngressList), err
 }
 
-func (c *FakeIngress) Create(ingress *experimental.Ingress) (*experimental.Ingress, error) {
+func (c *FakeIngress) Create(ingress *extensions.Ingress) (*extensions.Ingress, error) {
 	obj, err := c.Fake.Invokes(NewCreateAction("ingress", c.Namespace, ingress), ingress)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Ingress), err
+	return obj.(*extensions.Ingress), err
 }
 
-func (c *FakeIngress) Update(ingress *experimental.Ingress) (*experimental.Ingress, error) {
+func (c *FakeIngress) Update(ingress *extensions.Ingress) (*extensions.Ingress, error) {
 	obj, err := c.Fake.Invokes(NewUpdateAction("ingress", c.Namespace, ingress), ingress)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Ingress), err
+	return obj.(*extensions.Ingress), err
 }
 
 func (c *FakeIngress) Delete(name string, options *api.DeleteOptions) error {
-	_, err := c.Fake.Invokes(NewDeleteAction("ingress", c.Namespace, name), &experimental.Ingress{})
+	_, err := c.Fake.Invokes(NewDeleteAction("ingress", c.Namespace, name), &extensions.Ingress{})
 	return err
 }
 
@@ -76,11 +76,11 @@ func (c *FakeIngress) Watch(label labels.Selector, field fields.Selector, resour
 	return c.Fake.InvokesWatch(NewWatchAction("ingress", c.Namespace, label, field, resourceVersion))
 }
 
-func (c *FakeIngress) UpdateStatus(ingress *experimental.Ingress) (result *experimental.Ingress, err error) {
+func (c *FakeIngress) UpdateStatus(ingress *extensions.Ingress) (result *extensions.Ingress, err error) {
 	obj, err := c.Fake.Invokes(NewUpdateSubresourceAction("ingress", "status", c.Namespace, ingress), ingress)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Ingress), err
+	return obj.(*extensions.Ingress), err
 }

pkg/client/unversioned/testclient/fake_jobs.go

@@ -18,7 +18,7 @@ package testclient
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -31,44 +31,44 @@ type FakeJobs struct {
 	Namespace string
 }
 
-func (c *FakeJobs) Get(name string) (*experimental.Job, error) {
-	obj, err := c.Fake.Invokes(NewGetAction("jobs", c.Namespace, name), &experimental.Job{})
+func (c *FakeJobs) Get(name string) (*extensions.Job, error) {
+	obj, err := c.Fake.Invokes(NewGetAction("jobs", c.Namespace, name), &extensions.Job{})
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Job), err
+	return obj.(*extensions.Job), err
 }
 
-func (c *FakeJobs) List(label labels.Selector, fields fields.Selector) (*experimental.JobList, error) {
-	obj, err := c.Fake.Invokes(NewListAction("jobs", c.Namespace, label, nil), &experimental.JobList{})
+func (c *FakeJobs) List(label labels.Selector, fields fields.Selector) (*extensions.JobList, error) {
+	obj, err := c.Fake.Invokes(NewListAction("jobs", c.Namespace, label, nil), &extensions.JobList{})
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.JobList), err
+	return obj.(*extensions.JobList), err
 }
 
-func (c *FakeJobs) Create(job *experimental.Job) (*experimental.Job, error) {
+func (c *FakeJobs) Create(job *extensions.Job) (*extensions.Job, error) {
 	obj, err := c.Fake.Invokes(NewCreateAction("jobs", c.Namespace, job), job)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Job), err
+	return obj.(*extensions.Job), err
 }
 
-func (c *FakeJobs) Update(job *experimental.Job) (*experimental.Job, error) {
+func (c *FakeJobs) Update(job *extensions.Job) (*extensions.Job, error) {
 	obj, err := c.Fake.Invokes(NewUpdateAction("jobs", c.Namespace, job), job)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Job), err
+	return obj.(*extensions.Job), err
 }
 
 func (c *FakeJobs) Delete(name string, options *api.DeleteOptions) error {
-	_, err := c.Fake.Invokes(NewDeleteAction("jobs", c.Namespace, name), &experimental.Job{})
+	_, err := c.Fake.Invokes(NewDeleteAction("jobs", c.Namespace, name), &extensions.Job{})
 	return err
 }
 
@@ -76,11 +76,11 @@ func (c *FakeJobs) Watch(label labels.Selector, field fields.Selector, resourceV
 	return c.Fake.InvokesWatch(NewWatchAction("jobs", c.Namespace, label, field, resourceVersion))
 }
 
-func (c *FakeJobs) UpdateStatus(job *experimental.Job) (result *experimental.Job, err error) {
+func (c *FakeJobs) UpdateStatus(job *extensions.Job) (result *extensions.Job, err error) {
 	obj, err := c.Fake.Invokes(NewUpdateSubresourceAction("jobs", "status", c.Namespace, job), job)
 	if obj == nil {
 		return nil, err
 	}
 
-	return obj.(*experimental.Job), err
+	return obj.(*extensions.Job), err
 }

pkg/client/unversioned/testclient/fake_scales.go

@@ -17,7 +17,7 @@ limitations under the License.
 package testclient
 
 import (
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 )
 
 // FakeScales implements ScaleInterface. Meant to be embedded into a struct to get a default
@@ -27,19 +27,19 @@ type FakeScales struct {
 	Namespace string
 }
 
-func (c *FakeScales) Get(kind string, name string) (result *experimental.Scale, err error) {
+func (c *FakeScales) Get(kind string, name string) (result *extensions.Scale, err error) {
 	action := GetActionImpl{}
 	action.Verb = "get"
 	action.Namespace = c.Namespace
 	action.Resource = kind
 	action.Subresource = "scale"
 	action.Name = name
-	obj, err := c.Fake.Invokes(action, &experimental.Scale{})
-	result = obj.(*experimental.Scale)
+	obj, err := c.Fake.Invokes(action, &extensions.Scale{})
+	result = obj.(*extensions.Scale)
 	return
 }
 
-func (c *FakeScales) Update(kind string, scale *experimental.Scale) (result *experimental.Scale, err error) {
+func (c *FakeScales) Update(kind string, scale *extensions.Scale) (result *extensions.Scale, err error) {
 	action := UpdateActionImpl{}
 	action.Verb = "update"
 	action.Namespace = c.Namespace
@@ -47,6 +47,6 @@ func (c *FakeScales) Update(kind string, scale *experimental.Scale) (result *exp
 	action.Subresource = "scale"
 	action.Object = scale
 	obj, err := c.Fake.Invokes(action, scale)
-	result = obj.(*experimental.Scale)
+	result = obj.(*extensions.Scale)
 	return
 }

pkg/controller/daemon/controller.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/client/record"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
@@ -103,22 +103,22 @@ func NewDaemonSetsController(kubeClient client.Interface, resyncPeriod controlle
 				return dsc.kubeClient.Experimental().DaemonSets(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), rv)
 			},
 		},
-		&experimental.DaemonSet{},
+		&extensions.DaemonSet{},
 		// TODO: Can we have much longer period here?
 		FullDaemonSetResyncPeriod,
 		framework.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
-				ds := obj.(*experimental.DaemonSet)
+				ds := obj.(*extensions.DaemonSet)
 				glog.V(4).Infof("Adding daemon set %s", ds.Name)
 				dsc.enqueueDaemonSet(obj)
 			},
 			UpdateFunc: func(old, cur interface{}) {
-				oldDS := old.(*experimental.DaemonSet)
+				oldDS := old.(*extensions.DaemonSet)
 				glog.V(4).Infof("Updating daemon set %s", oldDS.Name)
 				dsc.enqueueDaemonSet(cur)
 			},
 			DeleteFunc: func(obj interface{}) {
-				ds := obj.(*experimental.DaemonSet)
+				ds := obj.(*extensions.DaemonSet)
 				glog.V(4).Infof("Deleting daemon set %s", ds.Name)
 				dsc.enqueueDaemonSet(obj)
 			},
@@ -218,7 +218,7 @@ func (dsc *DaemonSetsController) enqueueDaemonSet(obj interface{}) {
 	dsc.queue.Add(key)
 }
 
-func (dsc *DaemonSetsController) getPodDaemonSet(pod *api.Pod) *experimental.DaemonSet {
+func (dsc *DaemonSetsController) getPodDaemonSet(pod *api.Pod) *extensions.DaemonSet {
 	sets, err := dsc.dsStore.GetPodDaemonSets(pod)
 	if err != nil {
 		glog.V(4).Infof("No daemon sets found for pod %v, daemon set controller will avoid syncing", pod.Name)
@@ -321,7 +321,7 @@ func (dsc *DaemonSetsController) updateNode(old, cur interface{}) {
 }
 
 // getNodesToDaemonSetPods returns a map from nodes to daemon pods (corresponding to ds) running on the nodes.
-func (dsc *DaemonSetsController) getNodesToDaemonPods(ds *experimental.DaemonSet) (map[string][]*api.Pod, error) {
+func (dsc *DaemonSetsController) getNodesToDaemonPods(ds *extensions.DaemonSet) (map[string][]*api.Pod, error) {
 	nodeToDaemonPods := make(map[string][]*api.Pod)
 	daemonPods, err := dsc.podStore.Pods(ds.Namespace).List(labels.Set(ds.Spec.Selector).AsSelector())
 	if err != nil {
@@ -334,7 +334,7 @@ func (dsc *DaemonSetsController) getNodesToDaemonPods(ds *experimental.DaemonSet
 	return nodeToDaemonPods, nil
 }
 
-func (dsc *DaemonSetsController) manage(ds *experimental.DaemonSet) {
+func (dsc *DaemonSetsController) manage(ds *extensions.DaemonSet) {
 	// Find out which nodes are running the daemon pods selected by ds.
 	nodeToDaemonPods, err := dsc.getNodesToDaemonPods(ds)
 	if err != nil {
@@ -401,7 +401,7 @@ func (dsc *DaemonSetsController) manage(ds *experimental.DaemonSet) {
 	}
 }
 
-func storeDaemonSetStatus(dsClient client.DaemonSetInterface, ds *experimental.DaemonSet, desiredNumberScheduled, currentNumberScheduled, numberMisscheduled int) error {
+func storeDaemonSetStatus(dsClient client.DaemonSetInterface, ds *extensions.DaemonSet, desiredNumberScheduled, currentNumberScheduled, numberMisscheduled int) error {
 	if ds.Status.DesiredNumberScheduled == desiredNumberScheduled && ds.Status.CurrentNumberScheduled == currentNumberScheduled && ds.Status.NumberMisscheduled == numberMisscheduled {
 		return nil
 	}
@@ -426,7 +426,7 @@ func storeDaemonSetStatus(dsClient client.DaemonSetInterface, ds *experimental.D
 	return updateErr
 }
 
-func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *experimental.DaemonSet) {
+func (dsc *DaemonSetsController) updateDaemonSetStatus(ds *extensions.DaemonSet) {
 	glog.V(4).Infof("Updating daemon set status")
 	nodeToDaemonPods, err := dsc.getNodesToDaemonPods(ds)
 	if err != nil {
@@ -482,7 +482,7 @@ func (dsc *DaemonSetsController) syncDaemonSet(key string) error {
 		dsc.expectations.DeleteExpectations(key)
 		return nil
 	}
-	ds := obj.(*experimental.DaemonSet)
+	ds := obj.(*extensions.DaemonSet)
 	if !dsc.podStoreSynced() {
 		// Sleep so we give the pod reflector goroutine a chance to run.
 		time.Sleep(PodStoreSyncedPollPeriod)
@@ -509,7 +509,7 @@ func (dsc *DaemonSetsController) syncDaemonSet(key string) error {
 }
 
 // byCreationTimestamp sorts a list by creation timestamp, using their names as a tie breaker.
-type byCreationTimestamp []experimental.DaemonSet
+type byCreationTimestamp []extensions.DaemonSet
 
 func (o byCreationTimestamp) Len() int      { return len(o) }
 func (o byCreationTimestamp) Swap(i, j int) { o[i], o[j] = o[j], o[i] }

pkg/controller/daemon/controller_test.go

@@ -23,7 +23,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/cache"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/controller"
@@ -42,7 +42,7 @@ func init() {
 	api.ForTesting_ReferencesAllowBlankSelfLinks = true
 }
 
-func getKey(ds *experimental.DaemonSet, t *testing.T) string {
+func getKey(ds *extensions.DaemonSet, t *testing.T) string {
 	if key, err := controller.KeyFunc(ds); err != nil {
 		t.Errorf("Unexpected error getting key for ds %v: %v", ds.Name, err)
 		return ""
@@ -51,14 +51,14 @@ func getKey(ds *experimental.DaemonSet, t *testing.T) string {
 	}
 }
 
-func newDaemonSet(name string) *experimental.DaemonSet {
-	return &experimental.DaemonSet{
-		TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Experimental.Version()},
+func newDaemonSet(name string) *extensions.DaemonSet {
+	return &extensions.DaemonSet{
+		TypeMeta: unversioned.TypeMeta{APIVersion: testapi.Extensions.Version()},
 		ObjectMeta: api.ObjectMeta{
 			Name:      name,
 			Namespace: api.NamespaceDefault,
 		},
-		Spec: experimental.DaemonSetSpec{
+		Spec: extensions.DaemonSetSpec{
 			Selector: simpleDaemonSetLabel,
 			Template: &api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
@@ -146,7 +146,7 @@ func validateSyncDaemonSets(t *testing.T, fakePodControl *controller.FakePodCont
 	}
 }
 
-func syncAndValidateDaemonSets(t *testing.T, manager *DaemonSetsController, ds *experimental.DaemonSet, podControl *controller.FakePodControl, expectedCreates, expectedDeletes int) {
+func syncAndValidateDaemonSets(t *testing.T, manager *DaemonSetsController, ds *extensions.DaemonSet, podControl *controller.FakePodControl, expectedCreates, expectedDeletes int) {
 	key, err := controller.KeyFunc(ds)
 	if err != nil {
 		t.Errorf("Could not get key for daemon.")

pkg/controller/deployment/deployment_controller.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/record"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
@@ -73,22 +73,22 @@ func (d *DeploymentController) reconcileDeployments() []error {
 	return errs
 }
 
-func (d *DeploymentController) reconcileDeployment(deployment *experimental.Deployment) error {
+func (d *DeploymentController) reconcileDeployment(deployment *extensions.Deployment) error {
 	switch deployment.Spec.Strategy.Type {
-	case experimental.RecreateDeploymentStrategyType:
+	case extensions.RecreateDeploymentStrategyType:
 		return d.reconcileRecreateDeployment(*deployment)
-	case experimental.RollingUpdateDeploymentStrategyType:
+	case extensions.RollingUpdateDeploymentStrategyType:
 		return d.reconcileRollingUpdateDeployment(*deployment)
 	}
 	return fmt.Errorf("unexpected deployment strategy type: %s", deployment.Spec.Strategy.Type)
 }
 
-func (d *DeploymentController) reconcileRecreateDeployment(deployment experimental.Deployment) error {
+func (d *DeploymentController) reconcileRecreateDeployment(deployment extensions.Deployment) error {
 	// TODO: implement me.
 	return nil
 }
 
-func (d *DeploymentController) reconcileRollingUpdateDeployment(deployment experimental.Deployment) error {
+func (d *DeploymentController) reconcileRollingUpdateDeployment(deployment extensions.Deployment) error {
 	newRC, err := d.getNewRC(deployment)
 	if err != nil {
 		return err
@@ -124,13 +124,13 @@ func (d *DeploymentController) reconcileRollingUpdateDeployment(deployment exper
 	return nil
 }
 
-func (d *DeploymentController) getOldRCs(deployment experimental.Deployment) ([]*api.ReplicationController, error) {
+func (d *DeploymentController) getOldRCs(deployment extensions.Deployment) ([]*api.ReplicationController, error) {
 	return deploymentUtil.GetOldRCs(deployment, d.client)
 }
 
 // Returns an RC that matches the intent of the given deployment.
 // It creates a new RC if required.
-func (d *DeploymentController) getNewRC(deployment experimental.Deployment) (*api.ReplicationController, error) {
+func (d *DeploymentController) getNewRC(deployment extensions.Deployment) (*api.ReplicationController, error) {
 	existingNewRC, err := deploymentUtil.GetNewRC(deployment, d.client)
 	if err != nil || existingNewRC != nil {
 		return existingNewRC, err
@@ -158,7 +158,7 @@ func (d *DeploymentController) getNewRC(deployment experimental.Deployment) (*ap
 	return createdRC, nil
 }
 
-func (d *DeploymentController) reconcileNewRC(allRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment experimental.Deployment) (bool, error) {
+func (d *DeploymentController) reconcileNewRC(allRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment extensions.Deployment) (bool, error) {
 	if newRC.Spec.Replicas == deployment.Spec.Replicas {
 		// Scaling not required.
 		return false, nil
@@ -192,7 +192,7 @@ func (d *DeploymentController) reconcileNewRC(allRCs []*api.ReplicationControlle
 	return true, err
 }
 
-func (d *DeploymentController) reconcileOldRCs(allRCs []*api.ReplicationController, oldRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment experimental.Deployment) (bool, error) {
+func (d *DeploymentController) reconcileOldRCs(allRCs []*api.ReplicationController, oldRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment extensions.Deployment) (bool, error) {
 	oldPodsCount := deploymentUtil.GetReplicaCountForRCs(oldRCs)
 	if oldPodsCount == 0 {
 		// Cant scale down further
@@ -239,12 +239,12 @@ func (d *DeploymentController) reconcileOldRCs(allRCs []*api.ReplicationControll
 	return true, err
 }
 
-func (d *DeploymentController) updateDeploymentStatus(allRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment experimental.Deployment) error {
+func (d *DeploymentController) updateDeploymentStatus(allRCs []*api.ReplicationController, newRC *api.ReplicationController, deployment extensions.Deployment) error {
 	totalReplicas := deploymentUtil.GetReplicaCountForRCs(allRCs)
 	updatedReplicas := deploymentUtil.GetReplicaCountForRCs([]*api.ReplicationController{newRC})
 	newDeployment := deployment
 	// TODO: Reconcile this with API definition. API definition talks about ready pods, while this just computes created pods.
-	newDeployment.Status = experimental.DeploymentStatus{
+	newDeployment.Status = extensions.DeploymentStatus{
 		Replicas:        totalReplicas,
 		UpdatedReplicas: updatedReplicas,
 	}
@@ -252,7 +252,7 @@ func (d *DeploymentController) updateDeploymentStatus(allRCs []*api.ReplicationC
 	return err
 }
 
-func (d *DeploymentController) scaleRCAndRecordEvent(rc *api.ReplicationController, newScale int, deployment experimental.Deployment) (*api.ReplicationController, error) {
+func (d *DeploymentController) scaleRCAndRecordEvent(rc *api.ReplicationController, newScale int, deployment extensions.Deployment) (*api.ReplicationController, error) {
 	scalingOperation := "down"
 	if rc.Spec.Replicas < newScale {
 		scalingOperation = "up"
@@ -270,7 +270,7 @@ func (d *DeploymentController) scaleRC(rc *api.ReplicationController, newScale i
 	return d.client.ReplicationControllers(rc.ObjectMeta.Namespace).Update(rc)
 }
 
-func (d *DeploymentController) updateDeployment(deployment *experimental.Deployment) (*experimental.Deployment, error) {
+func (d *DeploymentController) updateDeployment(deployment *extensions.Deployment) (*extensions.Deployment, error) {
 	// TODO: Using client for now, update to use store when it is ready.
 	return d.client.Experimental().Deployments(deployment.ObjectMeta.Namespace).Update(deployment)
 }

pkg/controller/deployment/deployment_controller_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
-	exp "k8s.io/kubernetes/pkg/apis/experimental"
+	exp "k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/record"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"k8s.io/kubernetes/pkg/runtime"

pkg/controller/job/controller.go

@@ -25,7 +25,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/client/record"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
@@ -45,7 +45,7 @@ type JobController struct {
 	podControl controller.PodControlInterface
 
 	// To allow injection of updateJobStatus for testing.
-	updateHandler func(job *experimental.Job) error
+	updateHandler func(job *extensions.Job) error
 	syncHandler   func(jobKey string) error
 	// podStoreSynced returns true if the pod store has been synced at least once.
 	// Added as a member to the struct to allow injection for testing.
@@ -92,13 +92,13 @@ func NewJobController(kubeClient client.Interface, resyncPeriod controller.Resyn
 				return jm.kubeClient.Experimental().Jobs(api.NamespaceAll).Watch(labels.Everything(), fields.Everything(), rv)
 			},
 		},
-		&experimental.Job{},
+		&extensions.Job{},
 		// TODO: Can we have much longer period here?
 		replicationcontroller.FullControllerResyncPeriod,
 		framework.ResourceEventHandlerFuncs{
 			AddFunc: jm.enqueueController,
 			UpdateFunc: func(old, cur interface{}) {
-				if job := cur.(*experimental.Job); !isJobFinished(job) {
+				if job := cur.(*extensions.Job); !isJobFinished(job) {
 					jm.enqueueController(job)
 				}
 			},
@@ -144,7 +144,7 @@ func (jm *JobController) Run(workers int, stopCh <-chan struct{}) {
 }
 
 // getPodJob returns the job managing the given pod.
-func (jm *JobController) getPodJob(pod *api.Pod) *experimental.Job {
+func (jm *JobController) getPodJob(pod *api.Pod) *extensions.Job {
 	jobs, err := jm.jobStore.GetPodJobs(pod)
 	if err != nil {
 		glog.V(4).Infof("No jobs found for pod %v, job controller will avoid syncing", pod.Name)
@@ -240,7 +240,7 @@ func (jm *JobController) deletePod(obj interface{}) {
 	}
 }
 
-// obj could be an *experimental.Job, or a DeletionFinalStateUnknown marker item.
+// obj could be an *extensions.Job, or a DeletionFinalStateUnknown marker item.
 func (jm *JobController) enqueueController(obj interface{}) {
 	key, err := controller.KeyFunc(obj)
 	if err != nil {
@@ -295,7 +295,7 @@ func (jm *JobController) syncJob(key string) error {
 		jm.queue.Add(key)
 		return err
 	}
-	job := *obj.(*experimental.Job)
+	job := *obj.(*extensions.Job)
 	if !jm.podStoreSynced() {
 		// Sleep so we give the pod reflector goroutine a chance to run.
 		time.Sleep(replicationcontroller.PodStoreSyncedPollPeriod)
@@ -345,9 +345,9 @@ func (jm *JobController) syncJob(key string) error {
 	return nil
 }
 
-func newCondition() experimental.JobCondition {
-	return experimental.JobCondition{
-		Type:               experimental.JobComplete,
+func newCondition() extensions.JobCondition {
+	return extensions.JobCondition{
+		Type:               extensions.JobComplete,
 		Status:             api.ConditionTrue,
 		LastProbeTime:      unversioned.Now(),
 		LastTransitionTime: unversioned.Now(),
@@ -360,7 +360,7 @@ func getStatus(pods []api.Pod) (succeeded, failed int) {
 	return
 }
 
-func (jm *JobController) manageJob(activePods []*api.Pod, succeeded int, job *experimental.Job) int {
+func (jm *JobController) manageJob(activePods []*api.Pod, succeeded int, job *extensions.Job) int {
 	var activeLock sync.Mutex
 	active := len(activePods)
 	parallelism := *job.Spec.Parallelism
@@ -430,7 +430,7 @@ func (jm *JobController) manageJob(activePods []*api.Pod, succeeded int, job *ex
 	return active
 }
 
-func (jm *JobController) updateJobStatus(job *experimental.Job) error {
+func (jm *JobController) updateJobStatus(job *extensions.Job) error {
 	_, err := jm.kubeClient.Experimental().Jobs(job.Namespace).UpdateStatus(job)
 	return err
 }
@@ -446,9 +446,9 @@ func filterPods(pods []api.Pod, phase api.PodPhase) int {
 	return result
 }
 
-func isJobFinished(j *experimental.Job) bool {
+func isJobFinished(j *extensions.Job) bool {
 	for _, c := range j.Status.Conditions {
-		if c.Type == experimental.JobComplete && c.Status == api.ConditionTrue {
+		if c.Type == extensions.JobComplete && c.Status == api.ConditionTrue {
 			return true
 		}
 	}
@@ -456,7 +456,7 @@ func isJobFinished(j *experimental.Job) bool {
 }
 
 // byCreationTimestamp sorts a list by creation timestamp, using their names as a tie breaker.
-type byCreationTimestamp []experimental.Job
+type byCreationTimestamp []extensions.Job
 
 func (o byCreationTimestamp) Len() int      { return len(o) }
 func (o byCreationTimestamp) Swap(i, j int) { o[i], o[j] = o[j], o[i] }

pkg/controller/job/controller_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"k8s.io/kubernetes/pkg/controller"
@@ -34,13 +34,13 @@ import (
 
 var alwaysReady = func() bool { return true }
 
-func newJob(parallelism, completions int) *experimental.Job {
-	return &experimental.Job{
+func newJob(parallelism, completions int) *extensions.Job {
+	return &extensions.Job{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "foobar",
 			Namespace: api.NamespaceDefault,
 		},
-		Spec: experimental.JobSpec{
+		Spec: extensions.JobSpec{
 			Parallelism: &parallelism,
 			Completions: &completions,
 			Selector:    map[string]string{"foo": "bar"},
@@ -60,7 +60,7 @@ func newJob(parallelism, completions int) *experimental.Job {
 	}
 }
 
-func getKey(job *experimental.Job, t *testing.T) string {
+func getKey(job *extensions.Job, t *testing.T) string {
 	if key, err := controller.KeyFunc(job); err != nil {
 		t.Errorf("Unexpected error getting key for job %v: %v", job.Name, err)
 		return ""
@@ -70,7 +70,7 @@ func getKey(job *experimental.Job, t *testing.T) string {
 }
 
 // create count pods with the given phase for the given job
-func newPodList(count int, status api.PodPhase, job *experimental.Job) []api.Pod {
+func newPodList(count int, status api.PodPhase, job *extensions.Job) []api.Pod {
 	pods := []api.Pod{}
 	for i := 0; i < count; i++ {
 		newPod := api.Pod{
@@ -165,8 +165,8 @@ func TestControllerSyncJob(t *testing.T) {
 		fakePodControl := controller.FakePodControl{Err: tc.podControllerError}
 		manager.podControl = &fakePodControl
 		manager.podStoreSynced = alwaysReady
-		var actual *experimental.Job
-		manager.updateHandler = func(job *experimental.Job) error {
+		var actual *extensions.Job
+		manager.updateHandler = func(job *extensions.Job) error {
 			actual = job
 			return nil
 		}
@@ -211,7 +211,7 @@ func TestControllerSyncJob(t *testing.T) {
 		if tc.expectedComplete {
 			completed := false
 			for _, v := range actual.Status.Conditions {
-				if v.Type == experimental.JobComplete && v.Status == api.ConditionTrue {
+				if v.Type == extensions.JobComplete && v.Status == api.ConditionTrue {
 					completed = true
 					break
 				}
@@ -229,7 +229,7 @@ func TestSyncJobDeleted(t *testing.T) {
 	fakePodControl := controller.FakePodControl{}
 	manager.podControl = &fakePodControl
 	manager.podStoreSynced = alwaysReady
-	manager.updateHandler = func(job *experimental.Job) error { return nil }
+	manager.updateHandler = func(job *extensions.Job) error { return nil }
 	job := newJob(2, 2)
 	err := manager.syncJob(getKey(job, t))
 	if err != nil {
@@ -249,7 +249,7 @@ func TestSyncJobUpdateRequeue(t *testing.T) {
 	fakePodControl := controller.FakePodControl{}
 	manager.podControl = &fakePodControl
 	manager.podStoreSynced = alwaysReady
-	manager.updateHandler = func(job *experimental.Job) error { return fmt.Errorf("Fake error") }
+	manager.updateHandler = func(job *extensions.Job) error { return fmt.Errorf("Fake error") }
 	job := newJob(2, 2)
 	manager.jobStore.Store.Add(job)
 	err := manager.syncJob(getKey(job, t))
@@ -269,14 +269,14 @@ func TestJobPodLookup(t *testing.T) {
 	manager := NewJobController(client, controller.NoResyncPeriodFunc)
 	manager.podStoreSynced = alwaysReady
 	testCases := []struct {
-		job *experimental.Job
+		job *extensions.Job
 		pod *api.Pod
 
 		expectedName string
 	}{
 		// pods without labels don't match any job
 		{
-			job: &experimental.Job{
+			job: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{Name: "basic"},
 			},
 			pod: &api.Pod{
@@ -286,9 +286,9 @@ func TestJobPodLookup(t *testing.T) {
 		},
 		// matching labels, different namespace
 		{
-			job: &experimental.Job{
+			job: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{Name: "foo"},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Selector: map[string]string{"foo": "bar"},
 				},
 			},
@@ -303,9 +303,9 @@ func TestJobPodLookup(t *testing.T) {
 		},
 		// matching ns and labels returns
 		{
-			job: &experimental.Job{
+			job: &extensions.Job{
 				ObjectMeta: api.ObjectMeta{Name: "bar", Namespace: "ns"},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Selector: map[string]string{"foo": "bar"},
 				},
 			},
@@ -350,7 +350,7 @@ func TestSyncJobExpectations(t *testing.T) {
 	fakePodControl := controller.FakePodControl{}
 	manager.podControl = &fakePodControl
 	manager.podStoreSynced = alwaysReady
-	manager.updateHandler = func(job *experimental.Job) error { return nil }
+	manager.updateHandler = func(job *extensions.Job) error { return nil }
 
 	job := newJob(2, 2)
 	manager.jobStore.Store.Add(job)
@@ -386,7 +386,7 @@ func TestWatchJobs(t *testing.T) {
 	manager := NewJobController(client, controller.NoResyncPeriodFunc)
 	manager.podStoreSynced = alwaysReady
 
-	var testJob experimental.Job
+	var testJob extensions.Job
 	received := make(chan struct{})
 
 	// The update sent through the fakeWatcher should make its way into the workqueue,
@@ -397,7 +397,7 @@ func TestWatchJobs(t *testing.T) {
 		if !exists || err != nil {
 			t.Errorf("Expected to find job under key %v", key)
 		}
-		job := *obj.(*experimental.Job)
+		job := *obj.(*extensions.Job)
 		if !api.Semantic.DeepDerivative(job, testJob) {
 			t.Errorf("Expected %#v, but got %#v", testJob, job)
 		}
@@ -419,10 +419,10 @@ func TestWatchJobs(t *testing.T) {
 }
 
 func TestIsJobFinished(t *testing.T) {
-	job := &experimental.Job{
-		Status: experimental.JobStatus{
-			Conditions: []experimental.JobCondition{{
-				Type:   experimental.JobComplete,
+	job := &extensions.Job{
+		Status: extensions.JobStatus{
+			Conditions: []extensions.JobCondition{{
+				Type:   extensions.JobComplete,
 				Status: api.ConditionTrue,
 			}},
 		},
@@ -462,7 +462,7 @@ func TestWatchPods(t *testing.T) {
 		if !exists || err != nil {
 			t.Errorf("Expected to find job under key %v", key)
 		}
-		job := obj.(*experimental.Job)
+		job := obj.(*extensions.Job)
 		if !api.Semantic.DeepDerivative(job, testJob) {
 			t.Errorf("\nExpected %#v,\nbut got %#v", testJob, job)
 		}

pkg/controller/persistentvolume/types.go

@@ -29,7 +29,7 @@ const (
 	// A PV created specifically for one claim must contain this annotation in order to bind to the claim.
 	// The value must be the namespace and name of the claim being bound to (i.e, claim.Namespace/claim.Name)
 	// This is an experimental feature and likely to change in the future.
-	createdForKey = "volume.experimental.kubernetes.io/provisioned-for"
+	createdForKey = "volume.extensions.kubernetes.io/provisioned-for"
 )
 
 // persistentVolumeOrderedIndex is a cache.Store that keeps persistent volumes indexed by AccessModes and ordered by storage capacity.

pkg/controller/podautoscaler/horizontal.go

@@ -24,7 +24,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/record"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
@@ -68,7 +68,7 @@ func (a *HorizontalController) Run(syncPeriod time.Duration) {
 	}, syncPeriod, util.NeverStop)
 }
 
-func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPodAutoscaler) error {
+func (a *HorizontalController) reconcileAutoscaler(hpa extensions.HorizontalPodAutoscaler) error {
 	reference := fmt.Sprintf("%s/%s/%s", hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Namespace, hpa.Spec.ScaleRef.Name)
 
 	scale, err := a.client.Experimental().Scales(hpa.Spec.ScaleRef.Namespace).Get(hpa.Spec.ScaleRef.Kind, hpa.Spec.ScaleRef.Name)
@@ -137,7 +137,7 @@ func (a *HorizontalController) reconcileAutoscaler(hpa experimental.HorizontalPo
 		desiredReplicas = currentReplicas
 	}
 
-	hpa.Status = experimental.HorizontalPodAutoscalerStatus{
+	hpa.Status = extensions.HorizontalPodAutoscalerStatus{
 		CurrentReplicas:    currentReplicas,
 		DesiredReplicas:    desiredReplicas,
 		CurrentConsumption: currentConsumption,

pkg/controller/podautoscaler/horizontal_test.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/latest"
 	"k8s.io/kubernetes/pkg/api/resource"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
@@ -77,16 +77,16 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
 
 	fakeClient := &testclient.Fake{}
 	fakeClient.AddReactor("list", "horizontalpodautoscalers", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
-		obj := &experimental.HorizontalPodAutoscalerList{
-			Items: []experimental.HorizontalPodAutoscaler{
+		obj := &extensions.HorizontalPodAutoscalerList{
+			Items: []extensions.HorizontalPodAutoscaler{
 				{
 					ObjectMeta: api.ObjectMeta{
 						Name:      hpaName,
 						Namespace: namespace,
 						SelfLink:  "experimental/v1/namespaces/" + namespace + "/horizontalpodautoscalers/" + hpaName,
 					},
-					Spec: experimental.HorizontalPodAutoscalerSpec{
-						ScaleRef: &experimental.SubresourceReference{
+					Spec: extensions.HorizontalPodAutoscalerSpec{
+						ScaleRef: &extensions.SubresourceReference{
 							Kind:        "replicationController",
 							Name:        rcName,
 							Namespace:   namespace,
@@ -94,7 +94,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
 						},
 						MinReplicas: tc.minReplicas,
 						MaxReplicas: tc.maxReplicas,
-						Target:      experimental.ResourceConsumption{Resource: tc.targetResource, Quantity: tc.targetLevel},
+						Target:      extensions.ResourceConsumption{Resource: tc.targetResource, Quantity: tc.targetLevel},
 					},
 				},
 			},
@@ -103,15 +103,15 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
 	})
 
 	fakeClient.AddReactor("get", "replicationController", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
-		obj := &experimental.Scale{
+		obj := &extensions.Scale{
 			ObjectMeta: api.ObjectMeta{
 				Name:      rcName,
 				Namespace: namespace,
 			},
-			Spec: experimental.ScaleSpec{
+			Spec: extensions.ScaleSpec{
 				Replicas: tc.initialReplicas,
 			},
-			Status: experimental.ScaleStatus{
+			Status: extensions.ScaleStatus{
 				Replicas: tc.initialReplicas,
 				Selector: map[string]string{"name": podNamePrefix},
 			},
@@ -155,15 +155,15 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
 	})
 
 	fakeClient.AddReactor("update", "replicationController", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
-		obj := action.(testclient.UpdateAction).GetObject().(*experimental.Scale)
-		replicas := action.(testclient.UpdateAction).GetObject().(*experimental.Scale).Spec.Replicas
+		obj := action.(testclient.UpdateAction).GetObject().(*extensions.Scale)
+		replicas := action.(testclient.UpdateAction).GetObject().(*extensions.Scale).Spec.Replicas
 		assert.Equal(t, tc.desiredReplicas, replicas)
 		tc.scaleUpdated = true
 		return true, obj, nil
 	})
 
 	fakeClient.AddReactor("update", "horizontalpodautoscalers", func(action testclient.Action) (handled bool, ret runtime.Object, err error) {
-		obj := action.(testclient.UpdateAction).GetObject().(*experimental.HorizontalPodAutoscaler)
+		obj := action.(testclient.UpdateAction).GetObject().(*extensions.HorizontalPodAutoscaler)
 		assert.Equal(t, namespace, obj.Namespace)
 		assert.Equal(t, hpaName, obj.Name)
 		assert.Equal(t, tc.desiredReplicas, obj.Status.DesiredReplicas)

pkg/controller/podautoscaler/metrics/metrics_client.go

@@ -25,7 +25,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
@@ -47,12 +47,12 @@ type MetricsClient interface {
 
 type ResourceConsumptionClient interface {
 	// Gets average resource consumption for pods under the given selector.
-	Get(resourceName api.ResourceName, selector map[string]string) (*experimental.ResourceConsumption, error)
+	Get(resourceName api.ResourceName, selector map[string]string) (*extensions.ResourceConsumption, error)
 }
 
 // Aggregates results into ResourceConsumption. Also returns number of
 // pods included in the aggregation.
-type metricAggregator func(heapster.MetricResultList) (experimental.ResourceConsumption, int)
+type metricAggregator func(heapster.MetricResultList) (extensions.ResourceConsumption, int)
 
 type metricDefinition struct {
 	name       string
@@ -76,23 +76,23 @@ func NewHeapsterMetricsClient(client client.Interface) *HeapsterMetricsClient {
 
 var heapsterMetricDefinitions = map[api.ResourceName]metricDefinition{
 	api.ResourceCPU: {"cpu-usage",
-		func(metrics heapster.MetricResultList) (experimental.ResourceConsumption, int) {
+		func(metrics heapster.MetricResultList) (extensions.ResourceConsumption, int) {
 			sum, count := calculateSumFromLatestSample(metrics)
 			value := "0"
 			if count > 0 {
 				// assumes that cpu usage is in millis
 				value = fmt.Sprintf("%dm", sum/uint64(count))
 			}
-			return experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(value)}, count
+			return extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(value)}, count
 		}},
 	api.ResourceMemory: {"memory-usage",
-		func(metrics heapster.MetricResultList) (experimental.ResourceConsumption, int) {
+		func(metrics heapster.MetricResultList) (extensions.ResourceConsumption, int) {
 			sum, count := calculateSumFromLatestSample(metrics)
 			value := int64(0)
 			if count > 0 {
 				value = int64(sum) / int64(count)
 			}
-			return experimental.ResourceConsumption{Resource: api.ResourceMemory, Quantity: *resource.NewQuantity(value, resource.DecimalSI)}, count
+			return extensions.ResourceConsumption{Resource: api.ResourceMemory, Quantity: *resource.NewQuantity(value, resource.DecimalSI)}, count
 		}},
 }
 
@@ -104,7 +104,7 @@ func (h *HeapsterMetricsClient) ResourceConsumption(namespace string) ResourceCo
 	}
 }
 
-func (h *HeapsterResourceConsumptionClient) Get(resourceName api.ResourceName, selector map[string]string) (*experimental.ResourceConsumption, error) {
+func (h *HeapsterResourceConsumptionClient) Get(resourceName api.ResourceName, selector map[string]string) (*extensions.ResourceConsumption, error) {
 	podList, err := h.client.Pods(h.namespace).
 		List(labels.SelectorFromSet(labels.Set(selector)), fields.Everything())
 
@@ -118,7 +118,7 @@ func (h *HeapsterResourceConsumptionClient) Get(resourceName api.ResourceName, s
 	return h.getForPods(resourceName, podNames)
 }
 
-func (h *HeapsterResourceConsumptionClient) getForPods(resourceName api.ResourceName, podNames []string) (*experimental.ResourceConsumption, error) {
+func (h *HeapsterResourceConsumptionClient) getForPods(resourceName api.ResourceName, podNames []string) (*extensions.ResourceConsumption, error) {
 	metricSpec, metricDefined := h.resourceDefinitions[resourceName]
 	if !metricDefined {
 		return nil, fmt.Errorf("heapster metric not defined for %v", resourceName)

pkg/controller/podautoscaler/metrics/metrics_client_test.go

@@ -25,7 +25,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	_ "k8s.io/kubernetes/pkg/api/latest"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -122,7 +122,7 @@ func (tc *testCase) prepareTestClient(t *testing.T) *testclient.Fake {
 	return fakeClient
 }
 
-func (tc *testCase) verifyResults(t *testing.T, val *experimental.ResourceConsumption, err error) {
+func (tc *testCase) verifyResults(t *testing.T, val *extensions.ResourceConsumption, err error) {
 	assert.Equal(t, tc.desiredError, err)
 	if tc.desiredError != nil {
 		return

pkg/conversion/unversioned_test.go

@@ -64,10 +64,10 @@ func TestV1EncodeDecodeStatus(t *testing.T) {
 }
 
 func TestExperimentalEncodeDecodeStatus(t *testing.T) {
-	// TODO: caesarxuchao: use the testapi.Experimental.Codec() once the PR that
-	// moves experimental from v1 to v1alpha1 got merged.
-	// expCodec := testapi.Experimental.Codec()
-	expCodec := runtime.CodecFor(api.Scheme, "experimental/v1alpha1")
+	// TODO: caesarxuchao: use the testapi.Extensions.Codec() once the PR that
+	// moves experimental from v1 to v1beta1 got merged.
+	// expCodec := testapi.Extensions.Codec()
+	expCodec := runtime.CodecFor(api.Scheme, "extensions/v1beta1")
 	encoded, err := expCodec.Encode(status)
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)

pkg/kubectl/cmd/util/factory.go

@@ -142,7 +142,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
 			switch group {
 			case "":
 				return client.RESTClient, nil
-			case "experimental":
+			case "extensions":
 				return client.ExperimentalClient.RESTClient, nil
 			}
 			return nil, fmt.Errorf("unable to get RESTClient for resource '%s'", mapping.Resource)
@@ -406,7 +406,7 @@ func (c *clientSwaggerSchema) ValidateBytes(data []byte) error {
 	if err != nil {
 		return fmt.Errorf("could not find api group for %s: %v", kind, err)
 	}
-	if group == "experimental" {
+	if group == "extensions" {
 		if c.c.ExperimentalClient == nil {
 			return errors.New("unable to validate: no experimental client")
 		}

pkg/kubectl/describe.go

@@ -28,7 +28,7 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fieldpath"
 	"k8s.io/kubernetes/pkg/fields"
@@ -113,7 +113,7 @@ func DescriberFor(group string, kind string, c *client.Client) (Describer, bool)
 	switch group {
 	case "":
 		f, ok = describerMap(c)[kind]
-	case "experimental":
+	case "extensions":
 		f, ok = expDescriberMap(c)[kind]
 	}
 
@@ -880,7 +880,7 @@ func (d *JobDescriber) Describe(namespace, name string) (string, error) {
 	return describeJob(job, events)
 }
 
-func describeJob(job *experimental.Job, events *api.EventList) (string, error) {
+func describeJob(job *extensions.Job, events *api.EventList) (string, error) {
 	return tabbedString(func(out io.Writer) error {
 		fmt.Fprintf(out, "Name:\t%s\n", job.Name)
 		fmt.Fprintf(out, "Namespace:\t%s\n", job.Namespace)
@@ -928,7 +928,7 @@ func (d *DaemonSetDescriber) Describe(namespace, name string) (string, error) {
 	return describeDaemonSet(daemon, events, running, waiting, succeeded, failed)
 }
 
-func describeDaemonSet(daemon *experimental.DaemonSet, events *api.EventList, running, waiting, succeeded, failed int) (string, error) {
+func describeDaemonSet(daemon *extensions.DaemonSet, events *api.EventList, running, waiting, succeeded, failed int) (string, error) {
 	return tabbedString(func(out io.Writer) error {
 		fmt.Fprintf(out, "Name:\t%s\n", daemon.Name)
 		if daemon.Spec.Template != nil {
@@ -1448,7 +1448,7 @@ func (dd *DeploymentDescriber) Describe(namespace, name string) (string, error)
 // of getting all DS's and searching through them manually).
 // TODO: write an interface for controllers and fuse getReplicationControllersForLabels
 // and getDaemonSetsForLabels.
-func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.Labels) ([]experimental.DaemonSet, error) {
+func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.Labels) ([]extensions.DaemonSet, error) {
 	// Get all daemon sets
 	// TODO: this needs a namespace scope as argument
 	dss, err := c.List(labels.Everything())
@@ -1457,7 +1457,7 @@ func getDaemonSetsForLabels(c client.DaemonSetInterface, labelsToMatch labels.La
 	}
 
 	// Find the ones that match labelsToMatch.
-	var matchingDaemonSets []experimental.DaemonSet
+	var matchingDaemonSets []extensions.DaemonSet
 	for _, ds := range dss.Items {
 		selector := labels.SelectorFromSet(ds.Spec.Selector)
 		if selector.Matches(labelsToMatch) {

pkg/kubectl/describe_test.go

@@ -27,7 +27,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 )
@@ -481,12 +481,12 @@ func TestPersistentVolumeDescriber(t *testing.T) {
 }
 
 func TestDescribeDeployment(t *testing.T) {
-	fake := testclient.NewSimpleFake(&experimental.Deployment{
+	fake := testclient.NewSimpleFake(&extensions.Deployment{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "bar",
 			Namespace: "foo",
 		},
-		Spec: experimental.DeploymentSpec{
+		Spec: extensions.DeploymentSpec{
 			Template: &api.PodTemplateSpec{},
 		},
 	})

pkg/kubectl/resource_printer.go

@@ -37,7 +37,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -723,7 +723,7 @@ func printReplicationControllerList(list *api.ReplicationControllerList, w io.Wr
 	return nil
 }
 
-func printJob(job *experimental.Job, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printJob(job *extensions.Job, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	name := job.Name
 	namespace := job.Namespace
 	containers := job.Spec.Template.Spec.Containers
@@ -766,7 +766,7 @@ func printJob(job *experimental.Job, w io.Writer, withNamespace bool, wide bool,
 	return nil
 }
 
-func printJobList(list *experimental.JobList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printJobList(list *extensions.JobList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	for _, job := range list.Items {
 		if err := printJob(&job, w, withNamespace, wide, showAll, columnLabels); err != nil {
 			return err
@@ -857,14 +857,14 @@ func printServiceList(list *api.ServiceList, w io.Writer, withNamespace bool, wi
 }
 
 // backendStringer behaves just like a string interface and converts the given backend to a string.
-func backendStringer(backend *experimental.IngressBackend) string {
+func backendStringer(backend *extensions.IngressBackend) string {
 	if backend == nil {
 		return ""
 	}
 	return fmt.Sprintf("%v:%v", backend.ServiceName, backend.ServicePort.String())
 }
 
-func printIngress(ingress *experimental.Ingress, w io.Writer, withNamespace, wide bool, showAll bool, columnLabels []string) error {
+func printIngress(ingress *extensions.Ingress, w io.Writer, withNamespace, wide bool, showAll bool, columnLabels []string) error {
 	name := ingress.Name
 	namespace := ingress.Namespace
 
@@ -912,7 +912,7 @@ func printIngress(ingress *experimental.Ingress, w io.Writer, withNamespace, wid
 	return nil
 }
 
-func printIngressList(ingressList *experimental.IngressList, w io.Writer, withNamespace, wide bool, showAll bool, columnLabels []string) error {
+func printIngressList(ingressList *extensions.IngressList, w io.Writer, withNamespace, wide bool, showAll bool, columnLabels []string) error {
 	for _, ingress := range ingressList.Items {
 		if err := printIngress(&ingress, w, withNamespace, wide, true, columnLabels); err != nil {
 			return err
@@ -921,7 +921,7 @@ func printIngressList(ingressList *experimental.IngressList, w io.Writer, withNa
 	return nil
 }
 
-func printDaemonSet(ds *experimental.DaemonSet, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printDaemonSet(ds *extensions.DaemonSet, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	name := ds.Name
 	namespace := ds.Namespace
 
@@ -966,7 +966,7 @@ func printDaemonSet(ds *experimental.DaemonSet, w io.Writer, withNamespace bool,
 	return nil
 }
 
-func printDaemonSetList(list *experimental.DaemonSetList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printDaemonSetList(list *extensions.DaemonSetList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	for _, ds := range list.Items {
 		if err := printDaemonSet(&ds, w, withNamespace, wide, showAll, columnLabels); err != nil {
 			return err
@@ -1330,7 +1330,7 @@ func printComponentStatusList(list *api.ComponentStatusList, w io.Writer, withNa
 	return nil
 }
 
-func printThirdPartyResource(rsrc *experimental.ThirdPartyResource, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printThirdPartyResource(rsrc *extensions.ThirdPartyResource, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	versions := make([]string, len(rsrc.Versions))
 	for ix := range rsrc.Versions {
 		version := &rsrc.Versions[ix]
@@ -1343,7 +1343,7 @@ func printThirdPartyResource(rsrc *experimental.ThirdPartyResource, w io.Writer,
 	return nil
 }
 
-func printThirdPartyResourceList(list *experimental.ThirdPartyResourceList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printThirdPartyResourceList(list *extensions.ThirdPartyResourceList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	for _, item := range list.Items {
 		if err := printThirdPartyResource(&item, w, withNamespace, wide, showAll, columnLabels); err != nil {
 			return err
@@ -1353,7 +1353,7 @@ func printThirdPartyResourceList(list *experimental.ThirdPartyResourceList, w io
 	return nil
 }
 
-func printDeployment(deployment *experimental.Deployment, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printDeployment(deployment *extensions.Deployment, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	if withNamespace {
 		if _, err := fmt.Fprintf(w, "%s\t", deployment.Namespace); err != nil {
 			return err
@@ -1369,7 +1369,7 @@ func printDeployment(deployment *experimental.Deployment, w io.Writer, withNames
 	return err
 }
 
-func printDeploymentList(list *experimental.DeploymentList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printDeploymentList(list *extensions.DeploymentList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	for _, item := range list.Items {
 		if err := printDeployment(&item, w, withNamespace, wide, showAll, columnLabels); err != nil {
 			return err
@@ -1378,7 +1378,7 @@ func printDeploymentList(list *experimental.DeploymentList, w io.Writer, withNam
 	return nil
 }
 
-func printHorizontalPodAutoscaler(hpa *experimental.HorizontalPodAutoscaler, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printHorizontalPodAutoscaler(hpa *extensions.HorizontalPodAutoscaler, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	namespace := hpa.Namespace
 	name := hpa.Name
 	reference := fmt.Sprintf("%s/%s/%s/%s",
@@ -1415,7 +1415,7 @@ func printHorizontalPodAutoscaler(hpa *experimental.HorizontalPodAutoscaler, w i
 	return err
 }
 
-func printHorizontalPodAutoscalerList(list *experimental.HorizontalPodAutoscalerList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
+func printHorizontalPodAutoscalerList(list *extensions.HorizontalPodAutoscalerList, w io.Writer, withNamespace bool, wide bool, showAll bool, columnLabels []string) error {
 	for i := range list.Items {
 		if err := printHorizontalPodAutoscaler(&list.Items[i], w, withNamespace, wide, showAll, columnLabels); err != nil {
 			return err

pkg/kubectl/resource_printer_test.go

@@ -30,7 +30,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/testapi"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/pkg/util/sets"
@@ -1236,22 +1236,22 @@ func TestTranslateTimestamp(t *testing.T) {
 
 func TestPrintDeployment(t *testing.T) {
 	tests := []struct {
-		deployment experimental.Deployment
+		deployment extensions.Deployment
 		expect     string
 	}{
 		{
-			experimental.Deployment{
+			extensions.Deployment{
 				ObjectMeta: api.ObjectMeta{
 					Name:              "test1",
 					CreationTimestamp: unversioned.Time{Time: time.Now().Add(1.9e9)},
 				},
-				Spec: experimental.DeploymentSpec{
+				Spec: extensions.DeploymentSpec{
 					Replicas: 5,
 					Template: &api.PodTemplateSpec{
 						Spec: api.PodSpec{Containers: make([]api.Container, 2)},
 					},
 				},
-				Status: experimental.DeploymentStatus{
+				Status: extensions.DeploymentStatus{
 					Replicas:        10,
 					UpdatedReplicas: 2,
 				},

pkg/kubectl/scale.go

@@ -23,7 +23,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/errors"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/util/wait"
 )
@@ -83,7 +83,7 @@ func (precondition *ScalePrecondition) ValidateReplicationController(controller
 }
 
 // ValidateJob ensures that the preconditions match.  Returns nil if they are valid, an error otherwise
-func (precondition *ScalePrecondition) ValidateJob(job *experimental.Job) error {
+func (precondition *ScalePrecondition) ValidateJob(job *extensions.Job) error {
 	if precondition.Size != -1 && job.Spec.Parallelism == nil {
 		return PreconditionError{"parallelism", strconv.Itoa(precondition.Size), "nil"}
 	}

pkg/kubectl/scale_test.go

@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/kubernetes/pkg/api"
 	kerrors "k8s.io/kubernetes/pkg/api/errors"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 )
@@ -53,17 +53,17 @@ type ErrorJobs struct {
 	invalid bool
 }
 
-func (c *ErrorJobs) Update(job *experimental.Job) (*experimental.Job, error) {
+func (c *ErrorJobs) Update(job *extensions.Job) (*extensions.Job, error) {
 	if c.invalid {
 		return nil, kerrors.NewInvalid(job.Kind, job.Name, nil)
 	}
 	return nil, errors.New("Job update failure")
 }
 
-func (c *ErrorJobs) Get(name string) (*experimental.Job, error) {
+func (c *ErrorJobs) Get(name string) (*extensions.Job, error) {
 	zero := 0
-	return &experimental.Job{
-		Spec: experimental.JobSpec{
+	return &extensions.Job{
+		Spec: extensions.JobSpec{
 			Parallelism: &zero,
 		},
 	}, nil
@@ -325,7 +325,7 @@ func TestJobScale(t *testing.T) {
 	if action, ok := actions[0].(testclient.GetAction); !ok || action.GetResource() != "jobs" || action.GetName() != name {
 		t.Errorf("unexpected action: %v, expected get-replicationController %s", actions[0], name)
 	}
-	if action, ok := actions[1].(testclient.UpdateAction); !ok || action.GetResource() != "jobs" || *action.GetObject().(*experimental.Job).Spec.Parallelism != int(count) {
+	if action, ok := actions[1].(testclient.UpdateAction); !ok || action.GetResource() != "jobs" || *action.GetObject().(*extensions.Job).Spec.Parallelism != int(count) {
 		t.Errorf("unexpected action %v, expected update-job with parallelism = %d", actions[1], count)
 	}
 }
@@ -351,8 +351,8 @@ func TestJobScaleInvalid(t *testing.T) {
 
 func TestJobScaleFailsPreconditions(t *testing.T) {
 	ten := 10
-	fake := testclient.NewSimpleFake(&experimental.Job{
-		Spec: experimental.JobSpec{
+	fake := testclient.NewSimpleFake(&extensions.Job{
+		Spec: extensions.JobSpec{
 			Parallelism: &ten,
 		},
 	})
@@ -375,7 +375,7 @@ func TestValidateJob(t *testing.T) {
 	zero, ten, twenty := 0, 10, 20
 	tests := []struct {
 		preconditions ScalePrecondition
-		job           experimental.Job
+		job           extensions.Job
 		expectError   bool
 		test          string
 	}{
@@ -386,11 +386,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{-1, ""},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "foo",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &ten,
 				},
 			},
@@ -399,11 +399,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{0, ""},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "foo",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &zero,
 				},
 			},
@@ -412,11 +412,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{-1, "foo"},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "foo",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &ten,
 				},
 			},
@@ -425,11 +425,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{10, "foo"},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "foo",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &ten,
 				},
 			},
@@ -438,11 +438,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{10, "foo"},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "foo",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &twenty,
 				},
 			},
@@ -451,7 +451,7 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{10, "foo"},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "foo",
 				},
@@ -461,11 +461,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{10, "foo"},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "bar",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &ten,
 				},
 			},
@@ -474,11 +474,11 @@ func TestValidateJob(t *testing.T) {
 		},
 		{
 			preconditions: ScalePrecondition{10, "foo"},
-			job: experimental.Job{
+			job: extensions.Job{
 				ObjectMeta: api.ObjectMeta{
 					ResourceVersion: "bar",
 				},
-				Spec: experimental.JobSpec{
+				Spec: extensions.JobSpec{
 					Parallelism: &twenty,
 				},
 			},

pkg/kubectl/stop_test.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/client/unversioned/testclient"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -286,23 +286,23 @@ func TestJobStop(t *testing.T) {
 		{
 			Name: "OnlyOneJob",
 			Objs: []runtime.Object{
-				&experimental.Job{ // GET
+				&extensions.Job{ // GET
 					ObjectMeta: api.ObjectMeta{
 						Name:      name,
 						Namespace: ns,
 					},
-					Spec: experimental.JobSpec{
+					Spec: extensions.JobSpec{
 						Parallelism: &zero,
 						Selector:    map[string]string{"k1": "v1"}},
 				},
-				&experimental.JobList{ // LIST
-					Items: []experimental.Job{
+				&extensions.JobList{ // LIST
+					Items: []extensions.Job{
 						{
 							ObjectMeta: api.ObjectMeta{
 								Name:      name,
 								Namespace: ns,
 							},
-							Spec: experimental.JobSpec{
+							Spec: extensions.JobSpec{
 								Parallelism: &zero,
 								Selector:    map[string]string{"k1": "v1"}},
 						},

pkg/master/import_known_versions.go

@@ -19,5 +19,5 @@ package master
 // These imports are the API groups the API server will support.
 import (
 	_ "k8s.io/kubernetes/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/apis/experimental/install"
+	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )

pkg/master/master.go

@@ -38,7 +38,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/rest"
 	apiutil "k8s.io/kubernetes/pkg/api/util"
 	"k8s.io/kubernetes/pkg/api/v1"
-	expapi "k8s.io/kubernetes/pkg/apis/experimental"
+	expapi "k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/apiserver"
 	"k8s.io/kubernetes/pkg/auth/authenticator"
 	"k8s.io/kubernetes/pkg/auth/authorizer"
@@ -653,7 +653,7 @@ func (m *Master) init(c *Config) {
 	// allGroups records all supported groups at /apis
 	allGroups := []api.APIGroup{}
 	if m.exp {
-		m.thirdPartyStorage = c.StorageDestinations.APIGroups["experimental"].Default
+		m.thirdPartyStorage = c.StorageDestinations.APIGroups["extensions"].Default
 		m.thirdPartyResources = map[string]*thirdpartyresourcedataetcd.REST{}
 
 		expVersion := m.experimental(c)
@@ -661,7 +661,7 @@ func (m *Master) init(c *Config) {
 		if err := expVersion.InstallREST(m.handlerContainer); err != nil {
 			glog.Fatalf("Unable to setup experimental api: %v", err)
 		}
-		g, err := latest.Group("experimental")
+		g, err := latest.Group("extensions")
 		if err != nil {
 			glog.Fatalf("Unable to setup experimental api: %v", err)
 		}
@@ -680,7 +680,7 @@ func (m *Master) init(c *Config) {
 			Versions:         expAPIVersions,
 			PreferredVersion: api.GroupVersion{GroupVersion: storageVersion, Version: apiutil.GetVersion(storageVersion)},
 		}
-		apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("experimental").Group+"/", group)
+		apiserver.AddGroupWebService(m.handlerContainer, c.APIGroupPrefix+"/"+latest.GroupOrDie("extensions").Group+"/", group)
 		allGroups = append(allGroups, group)
 		apiserver.InstallServiceErrorHandler(m.handlerContainer, m.newAPIRequestInfoResolver(), []string{expVersion.Version})
 	}
@@ -1023,9 +1023,9 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
 		Convertor: api.Scheme,
 		Typer:     api.Scheme,
 
-		Mapper:        thirdpartyresourcedata.NewMapper(latest.GroupOrDie("experimental").RESTMapper, kind, version, group),
-		Codec:         thirdpartyresourcedata.NewCodec(latest.GroupOrDie("experimental").Codec, kind),
-		Linker:        latest.GroupOrDie("experimental").SelfLinker,
+		Mapper:        thirdpartyresourcedata.NewMapper(latest.GroupOrDie("extensions").RESTMapper, kind, version, group),
+		Codec:         thirdpartyresourcedata.NewCodec(latest.GroupOrDie("extensions").Codec, kind),
+		Linker:        latest.GroupOrDie("extensions").SelfLinker,
 		Storage:       storage,
 		ServerVersion: latest.GroupOrDie("").GroupVersion,
 
@@ -1040,7 +1040,7 @@ func (m *Master) thirdpartyapi(group, kind, version string) *apiserver.APIGroupV
 func (m *Master) experimental(c *Config) *apiserver.APIGroupVersion {
 	controllerStorage := expcontrolleretcd.NewStorage(c.StorageDestinations.get("", "replicationControllers"))
 	dbClient := func(resource string) storage.Interface {
-		return c.StorageDestinations.get("experimental", resource)
+		return c.StorageDestinations.get("extensions", resource)
 	}
 	autoscalerStorage := horizontalpodautoscaleretcd.NewREST(dbClient("horizonalpodautoscalers"))
 	thirdPartyResourceStorage := thirdpartyresourceetcd.NewREST(dbClient("thirdpartyresources"))
@@ -1074,7 +1074,7 @@ func (m *Master) experimental(c *Config) *apiserver.APIGroupVersion {
 		strings.ToLower("ingress"):                      ingressStorage,
 	}
 
-	expMeta := latest.GroupOrDie("experimental")
+	expMeta := latest.GroupOrDie("extensions")
 
 	return &apiserver.APIGroupVersion{
 		Root: m.apiGroupPrefix,

pkg/master/master_test.go

@@ -39,7 +39,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	apiutil "k8s.io/kubernetes/pkg/api/util"
 	"k8s.io/kubernetes/pkg/api/v1"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/apiserver"
 	client "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/fields"
@@ -67,10 +67,10 @@ func setUp(t *testing.T) (Master, Config, *assert.Assertions) {
 	storageVersions := make(map[string]string)
 	storageDestinations := NewStorageDestinations()
 	storageDestinations.AddAPIGroup("", etcdstorage.NewEtcdStorage(fakeClient, testapi.Default.Codec(), etcdtest.PathPrefix()))
-	storageDestinations.AddAPIGroup("experimental", etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix()))
+	storageDestinations.AddAPIGroup("extensions", etcdstorage.NewEtcdStorage(fakeClient, testapi.Extensions.Codec(), etcdtest.PathPrefix()))
 	config.StorageDestinations = storageDestinations
 	storageVersions[""] = testapi.Default.Version()
-	storageVersions["experimental"] = testapi.Experimental.GroupAndVersion()
+	storageVersions["extensions"] = testapi.Extensions.GroupAndVersion()
 	config.StorageVersions = storageVersions
 	master.nodeRegistry = registrytest.NewNodeRegistry([]string{"node1", "node2"}, api.NodeResources{})
 
@@ -293,10 +293,10 @@ func TestExpapi(t *testing.T) {
 
 	expAPIGroup := master.experimental(&config)
 	assert.Equal(expAPIGroup.Root, master.apiGroupPrefix)
-	assert.Equal(expAPIGroup.Mapper, latest.GroupOrDie("experimental").RESTMapper)
-	assert.Equal(expAPIGroup.Codec, latest.GroupOrDie("experimental").Codec)
-	assert.Equal(expAPIGroup.Linker, latest.GroupOrDie("experimental").SelfLinker)
-	assert.Equal(expAPIGroup.Version, latest.GroupOrDie("experimental").GroupVersion)
+	assert.Equal(expAPIGroup.Mapper, latest.GroupOrDie("extensions").RESTMapper)
+	assert.Equal(expAPIGroup.Codec, latest.GroupOrDie("extensions").Codec)
+	assert.Equal(expAPIGroup.Linker, latest.GroupOrDie("extensions").SelfLinker)
+	assert.Equal(expAPIGroup.Version, latest.GroupOrDie("extensions").GroupVersion)
 }
 
 // TestSecondsSinceSync verifies that proper results are returned
@@ -471,16 +471,16 @@ func TestDiscoveryAtAPIS(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	expectGroupName := "experimental"
+	expectGroupName := "extensions"
 	expectVersions := []api.GroupVersion{
 		{
-			GroupVersion: testapi.Experimental.GroupAndVersion(),
-			Version:      testapi.Experimental.Version(),
+			GroupVersion: testapi.Extensions.GroupAndVersion(),
+			Version:      testapi.Extensions.Version(),
 		},
 	}
 	expectPreferredVersion := api.GroupVersion{
-		GroupVersion: config.StorageVersions["experimental"],
-		Version:      apiutil.GetVersion(config.StorageVersions["experimental"]),
+		GroupVersion: config.StorageVersions["extensions"],
+		Version:      apiutil.GetVersion(config.StorageVersions["extensions"]),
 	}
 	assert.Equal(expectGroupName, groupList.Groups[0].Name)
 	assert.Equal(expectVersions, groupList.Groups[0].Versions)
@@ -507,11 +507,11 @@ type FooList struct {
 func initThirdParty(t *testing.T, version string) (*Master, *tools.FakeEtcdClient, *httptest.Server, *assert.Assertions) {
 	master, _, assert := setUp(t)
 	master.thirdPartyResources = map[string]*thirdpartyresourcedatastorage.REST{}
-	api := &experimental.ThirdPartyResource{
+	api := &extensions.ThirdPartyResource{
 		ObjectMeta: api.ObjectMeta{
 			Name: "foo.company.com",
 		},
-		Versions: []experimental.APIVersion{
+		Versions: []extensions.APIVersion{
 			{
 				APIGroup: "group",
 				Name:     version,
@@ -522,7 +522,7 @@ func initThirdParty(t *testing.T, version string) (*Master, *tools.FakeEtcdClien
 
 	fakeClient := tools.NewFakeEtcdClient(t)
 	fakeClient.Machines = []string{"http://machine1:4001", "http://machine2", "http://machine3:4003"}
-	master.thirdPartyStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Experimental.Codec(), etcdtest.PathPrefix())
+	master.thirdPartyStorage = etcdstorage.NewEtcdStorage(fakeClient, testapi.Extensions.Codec(), etcdtest.PathPrefix())
 
 	if !assert.NoError(master.InstallThirdPartyResource(api)) {
 		t.FailNow()
@@ -630,11 +630,11 @@ func encodeToThirdParty(name string, obj interface{}) ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	thirdPartyData := experimental.ThirdPartyResourceData{
+	thirdPartyData := extensions.ThirdPartyResourceData{
 		ObjectMeta: api.ObjectMeta{Name: name},
 		Data:       serial,
 	}
-	return testapi.Experimental.Codec().Encode(&thirdPartyData)
+	return testapi.Extensions.Codec().Encode(&thirdPartyData)
 }
 
 func storeToEtcd(fakeClient *tools.FakeEtcdClient, path, name string, obj interface{}) error {
@@ -774,11 +774,11 @@ func testInstallThirdPartyAPIPostForVersion(t *testing.T, version string) {
 		t.FailNow()
 	}
 
-	obj, err := testapi.Experimental.Codec().Decode([]byte(etcdResp.Node.Value))
+	obj, err := testapi.Extensions.Codec().Decode([]byte(etcdResp.Node.Value))
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
-	thirdPartyObj, ok := obj.(*experimental.ThirdPartyResourceData)
+	thirdPartyObj, ok := obj.(*extensions.ThirdPartyResourceData)
 	if !ok {
 		t.Errorf("unexpected object: %v", obj)
 	}

pkg/master/thirdparty_controller.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"k8s.io/kubernetes/pkg/api"
-	expapi "k8s.io/kubernetes/pkg/apis/experimental"
+	expapi "k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	thirdpartyresourceetcd "k8s.io/kubernetes/pkg/registry/thirdpartyresource/etcd"

pkg/master/thirdparty_controller_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
-	expapi "k8s.io/kubernetes/pkg/apis/experimental"
+	expapi "k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/registry/thirdpartyresourcedata"
 	"k8s.io/kubernetes/pkg/util/sets"
 )

pkg/registry/daemonset/etcd/etcd.go

@@ -18,7 +18,7 @@ package etcd
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/daemonset"
@@ -39,10 +39,10 @@ var daemonPrefix = "/daemonsets"
 // NewREST returns a RESTStorage object that will work against DaemonSets.
 func NewREST(s storage.Interface) (*REST, *StatusREST) {
 	store := &etcdgeneric.Etcd{
-		NewFunc: func() runtime.Object { return &experimental.DaemonSet{} },
+		NewFunc: func() runtime.Object { return &extensions.DaemonSet{} },
 
 		// NewListFunc returns an object capable of storing results of an etcd list.
-		NewListFunc: func() runtime.Object { return &experimental.DaemonSetList{} },
+		NewListFunc: func() runtime.Object { return &extensions.DaemonSetList{} },
 		// Produces a path that etcd understands, to the root of the resource
 		// by combining the namespace in the context with the given prefix
 		KeyRootFunc: func(ctx api.Context) string {
@@ -55,7 +55,7 @@ func NewREST(s storage.Interface) (*REST, *StatusREST) {
 		},
 		// Retrieve the name field of a daemon set
 		ObjectNameFunc: func(obj runtime.Object) (string, error) {
-			return obj.(*experimental.DaemonSet).Name, nil
+			return obj.(*extensions.DaemonSet).Name, nil
 		},
 		// Used to match objects based on labels/fields for list and watch
 		PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher {
@@ -83,7 +83,7 @@ type StatusREST struct {
 }
 
 func (r *StatusREST) New() runtime.Object {
-	return &experimental.DaemonSet{}
+	return &extensions.DaemonSet{}
 }
 
 // Update alters the status subset of an object.

pkg/registry/daemonset/etcd/etcd_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
+	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/registrytest"
@@ -29,18 +29,18 @@ import (
 )
 
 func newStorage(t *testing.T) (*REST, *StatusREST, *tools.FakeEtcdClient) {
-	etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "experimental")
+	etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "extensions")
 	storage, statusStorage := NewREST(etcdStorage)
 	return storage, statusStorage, fakeClient
 }
 
-func newValidDaemonSet() *experimental.DaemonSet {
-	return &experimental.DaemonSet{
+func newValidDaemonSet() *extensions.DaemonSet {
+	return &extensions.DaemonSet{
 		ObjectMeta: api.ObjectMeta{
 			Name:      "foo",
 			Namespace: api.NamespaceDefault,
 		},
-		Spec: experimental.DaemonSetSpec{
+		Spec: extensions.DaemonSetSpec{
 			Selector: map[string]string{"a": "b"},
 			Template: &api.PodTemplateSpec{
 				ObjectMeta: api.ObjectMeta{
@@ -73,8 +73,8 @@ func TestCreate(t *testing.T) {
 		// valid
 		ds,
 		// invalid (invalid selector)
-		&experimental.DaemonSet{
-			Spec: experimental.DaemonSetSpec{
+		&extensions.DaemonSet{
+			Spec: extensions.DaemonSetSpec{
 				Selector: map[string]string{},
 				Template: validDaemonSet.Spec.Template,
 			},
@@ -90,28 +90,28 @@ func TestUpdate(t *testing.T) {
 		newValidDaemonSet(),
 		// updateFunc
 		func(obj runtime.Object) runtime.Object {
-			object := obj.(*experimental.DaemonSet)
+			object := obj.(*extensions.DaemonSet)
 			object.Spec.Template.Spec.NodeSelector = map[string]string{"c": "d"}
 			return object
 		},
 		// invalid updateFunc
 		func(obj runtime.Object) runtime.Object {
-			object := obj.(*experimental.DaemonSet)
+			object := obj.(*extensions.DaemonSet)
 			object.UID = "newUID"
 			return object
 		},
 		func(obj runtime.Object) runtime.Object {
-			object := obj.(*experimental.DaemonSet)
+			object := obj.(*extensions.DaemonSet)
 			object.Name = ""
 			return object
 		},
 		func(obj runtime.Object) runtime.Object {
-			object := obj.(*experimental.DaemonSet)
+			object := obj.(*extensions.DaemonSet)
 			object.Spec.Template.Spec.RestartPolicy = api.RestartPolicyOnFailure
 			return object
 		},
 		func(obj runtime.Object) runtime.Object {
-			object := obj.(*experimental.DaemonSet)
+			object := obj.(*extensions.DaemonSet)
 			object.Spec.Selector = map[string]string{}
 			return object
 		},

pkg/registry/daemonset/strategy.go

@@ -21,8 +21,8 @@ import (
 	"reflect"
 
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/apis/experimental"
-	"k8s.io/kubernetes/pkg/apis/experimental/validation"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/apis/extensions/validation"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/generic"
@@ -46,16 +46,16 @@ func (daemonSetStrategy) NamespaceScoped() bool {
 
 // PrepareForCreate clears the status of a daemon set before creation.
 func (daemonSetStrategy) PrepareForCreate(obj runtime.Object) {
-	daemonSet := obj.(*experimental.DaemonSet)
-	daemonSet.Status = experimental.DaemonSetStatus{}
+	daemonSet := obj.(*extensions.DaemonSet)
+	daemonSet.Status = extensions.DaemonSetStatus{}
 
 	daemonSet.Generation = 1
 }
 
 // PrepareForUpdate clears fields that are not allowed to be set by end users on update.
 func (daemonSetStrategy) PrepareForUpdate(obj, old runtime.Object) {
-	newDaemonSet := obj.(*experimental.DaemonSet)
-	oldDaemonSet := old.(*experimental.DaemonSet)
+	newDaemonSet := obj.(*extensions.DaemonSet)
+	oldDaemonSet := old.(*extensions.DaemonSet)
 
 	// update is not allowed to set status
 	newDaemonSet.Status = oldDaemonSet.Status
@@ -78,7 +78,7 @@ func (daemonSetStrategy) PrepareForUpdate(obj, old runtime.Object) {
 
 // Validate validates a new daemon set.
 func (daemonSetStrategy) Validate(ctx api.Context, obj runtime.Object) fielderrors.ValidationErrorList {
-	daemonSet := obj.(*experimental.DaemonSet)
+	daemonSet := obj.(*extensions.DaemonSet)
 	return validation.ValidateDaemonSet(daemonSet)
 }
 
@@ -90,8 +90,8 @@ func (daemonSetStrategy) AllowCreateOnUpdate() bool {
 
 // ValidateUpdate is the default update validation for an end user.
 func (daemonSetStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList {
-	validationErrorList := validation.ValidateDaemonSet(obj.(*experimental.DaemonSet))
-	updateErrorList := validation.ValidateDaemonSetUpdate(old.(*experimental.DaemonSet), obj.(*experimental.DaemonSet))
+	validationErrorList := validation.ValidateDaemonSet(obj.(*extensions.DaemonSet))
+	updateErrorList := validation.ValidateDaemonSetUpdate(old.(*extensions.DaemonSet), obj.(*extensions.DaemonSet))
 	return append(validationErrorList, updateErrorList...)
 }
 
@@ -101,7 +101,7 @@ func (daemonSetStrategy) AllowUnconditionalUpdate() bool {
 }
 
 // DaemonSetToSelectableFields returns a field set that represents the object.
-func DaemonSetToSelectableFields(daemon *experimental.DaemonSet) fields.Set {
+func DaemonSetToSelectableFields(daemon *extensions.DaemonSet) fields.Set {
 	return fields.Set{
 		"metadata.name": daemon.Name,
 	}
@@ -115,7 +115,7 @@ func MatchDaemonSet(label labels.Selector, field fields.Selector) generic.Matche
 		Label: label,
 		Field: field,
 		GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) {
-			ds, ok := obj.(*experimental.DaemonSet)
+			ds, ok := obj.(*extensions.DaemonSet)
 			if !ok {
 				return nil, nil, fmt.Errorf("given object is not a ds.")
 			}
@@ -131,11 +131,11 @@ type daemonSetStatusStrategy struct {
 var StatusStrategy = daemonSetStatusStrategy{Strategy}
 
 func (daemonSetStatusStrategy) PrepareForUpdate(obj, old runtime.Object) {
-	newDaemonSet := obj.(*experimental.DaemonSet)
-	oldDaemonSet := old.(*experimental.DaemonSet)
+	newDaemonSet := obj.(*extensions.DaemonSet)
+	oldDaemonSet := old.(*extensions.DaemonSet)
 	newDaemonSet.Spec = oldDaemonSet.Spec
 }
 
 func (daemonSetStatusStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList {
-	return validation.ValidateDaemonSetStatusUpdate(obj.(*experimental.DaemonSet), old.(*experimental.DaemonSet))
+	return validation.ValidateDaemonSetStatusUpdate(obj.(*extensions.DaemonSet), old.(*extensions.DaemonSet))
 }