diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh index d4c84858197..01288b48ecc 100755 --- a/cluster/gce/config-test.sh +++ b/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}" diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh index 2896be6bb74..cacb3d89a73 100755 --- a/cluster/gce/util.sh +++ b/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 diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh index 1a69cc48a60..34025721041 100644 --- a/cluster/vagrant/util.sh +++ b/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 diff --git a/cmd/genconversion/conversion.go b/cmd/genconversion/conversion.go index ea795a138fe..66ab73cda86 100644 --- a/cmd/genconversion/conversion.go +++ b/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" diff --git a/cmd/gendeepcopy/deep_copy.go b/cmd/gendeepcopy/deep_copy.go index 097a43d59c5..542fd5fd7bf 100644 --- a/cmd/gendeepcopy/deep_copy.go +++ b/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" diff --git a/cmd/integration/integration.go b/cmd/integration/integration.go index 9ab275fe2e0..676e0c5faaa 100644 --- a/cmd/integration/integration.go +++ b/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{ diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index da83674be81..96ffe5aea51 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/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) diff --git a/cmd/kube-apiserver/app/server_test.go b/cmd/kube-apiserver/app/server_test.go index fc69f9efeb5..0d83beec9d7 100644 --- a/cmd/kube-apiserver/app/server_test.go +++ b/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"}, }, diff --git a/cmd/kube-version-change/import_known_versions.go b/cmd/kube-version-change/import_known_versions.go index 6b4f94fa13a..cfccabbd989 100644 --- a/cmd/kube-version-change/import_known_versions.go +++ b/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" ) diff --git a/docs/admin/daemon.yaml b/docs/admin/daemon.yaml index 8fba40af9b5..c5cd14a5921 100644 --- a/docs/admin/daemon.yaml +++ b/docs/admin/daemon.yaml @@ -1,4 +1,4 @@ -apiVersion: experimental/v1alpha1 +apiVersion: extensions/v1beta1 kind: DaemonSet metadata: name: prometheus-node-exporter diff --git a/docs/user-guide/job.yaml b/docs/user-guide/job.yaml index 8df006ebc10..fe63d5c7d69 100644 --- a/docs/user-guide/job.yaml +++ b/docs/user-guide/job.yaml @@ -1,4 +1,4 @@ -apiVersion: experimental/v1alpha1 +apiVersion: extensions/v1beta1 kind: Job metadata: name: pi diff --git a/docs/user-guide/jobs.md b/docs/user-guide/jobs.md index 90dd0b1676a..5cf28fd0b36 100644 --- a/docs/user-guide/jobs.md +++ b/docs/user-guide/jobs.md @@ -70,7 +70,7 @@ It takes around 10s to complete. ```yaml -apiVersion: experimental/v1alpha1 +apiVersion: extensions/v1beta1 kind: Job metadata: name: pi diff --git a/examples/examples_test.go b/examples/examples_test.go index c175f1e76be..221ea71ff8d 100644 --- a/examples/examples_test.go +++ b/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{}, diff --git a/examples/experimental/deployment.yaml b/examples/experimental/deployment.yaml index 1a03974058e..340103836ac 100644 --- a/examples/experimental/deployment.yaml +++ b/examples/experimental/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: experimental/v1alpha1 +apiVersion: extensions/v1beta1 kind: Deployment metadata: name: nginx-deployment diff --git a/hack/after-build/update-generated-conversions.sh b/hack/after-build/update-generated-conversions.sh index 8106b6e99f8..a2198c44047 100755 --- a/hack/after-build/update-generated-conversions.sh +++ b/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 diff --git a/hack/after-build/update-generated-deep-copies.sh b/hack/after-build/update-generated-deep-copies.sh index 3d2fecffc9e..bbd2c20a482 100755 --- a/hack/after-build/update-generated-deep-copies.sh +++ b/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" diff --git a/hack/after-build/update-swagger-spec.sh b/hack/after-build/update-swagger-spec.sh index 9f6694f55ae..7851afecae1 100755 --- a/hack/after-build/update-swagger-spec.sh +++ b/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}" \ diff --git a/hack/after-build/verify-generated-conversions.sh b/hack/after-build/verify-generated-conversions.sh index c94da4a703a..0442e7880d1 100755 --- a/hack/after-build/verify-generated-conversions.sh +++ b/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() { diff --git a/hack/after-build/verify-generated-deep-copies.sh b/hack/after-build/verify-generated-deep-copies.sh index c0b66d6bc84..53dd6975896 100755 --- a/hack/after-build/verify-generated-deep-copies.sh +++ b/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() { diff --git a/hack/lib/util.sh b/hack/lib/util.sh index 7154e1e0082..77cb1ccf82f 100755 --- a/hack/lib/util.sh +++ b/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 diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 040a3f44efa..ba94d607c9a 100755 --- a/hack/test-cmd.sh +++ b/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" diff --git a/hack/test-go.sh b/hack/test-go.sh index 3cbc902188b..50ca0ddbc8d 100755 --- a/hack/test-go.sh +++ b/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 diff --git a/hack/test-integration.sh b/hack/test-integration.sh index c214f622137..3f34e7ebf67 100755 --- a/hack/test-integration.sh +++ b/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 diff --git a/hack/update-generated-swagger-docs.sh b/hack/update-generated-swagger-docs.sh index 6a11fce7610..8747af3e80f 100755 --- a/hack/update-generated-swagger-docs.sh +++ b/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" diff --git a/pkg/api/mapper.go b/pkg/api/mapper.go index 600973aa093..10a38ff2140 100644 --- a/pkg/api/mapper.go +++ b/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 diff --git a/pkg/api/registered/registered.go b/pkg/api/registered/registered.go index 0524a523dfb..a3f8ddfbfc4 100644 --- a/pkg/api/registered/registered.go +++ b/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") diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index 509440e16b9..3a631af7425 100644 --- a/pkg/api/serialization_test.go +++ b/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" ) diff --git a/pkg/api/testapi/testapi.go b/pkg/api/testapi/testapi.go index 963277c5c24..e0a73bd0bda 100644 --- a/pkg/api/testapi/testapi.go +++ b/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) } diff --git a/pkg/api/testing/fuzzer.go b/pkg/api/testing/fuzzer.go index d0429467f4f..7b9385fe9d3 100644 --- a/pkg/api/testing/fuzzer.go +++ b/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" diff --git a/pkg/api/util/group_version_test.go b/pkg/api/util/group_version_test.go index 163cd5f3f67..d53b5f4e5a8 100644 --- a/pkg/api/util/group_version_test.go +++ b/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 { diff --git a/pkg/api/validation/schema_test.go b/pkg/api/validation/schema_test.go index e962bc204eb..b2b5ea1a665 100644 --- a/pkg/api/validation/schema_test.go +++ b/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, }, { diff --git a/pkg/apis/experimental/deep_copy_generated.go b/pkg/apis/extensions/deep_copy_generated.go similarity index 78% rename from pkg/apis/experimental/deep_copy_generated.go rename to pkg/apis/extensions/deep_copy_generated.go index 9146ffc2ce3..3d2d5fe70dc 100644 --- a/pkg/apis/experimental/deep_copy_generated.go +++ b/pkg/apis/extensions/deep_copy_generated.go @@ -16,7 +16,7 @@ limitations under the License. // DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh. -package experimental +package extensions import ( time "time" @@ -842,26 +842,26 @@ func deepCopy_unversioned_TypeMeta(in unversioned.TypeMeta, out *unversioned.Typ return nil } -func deepCopy_experimental_APIVersion(in APIVersion, out *APIVersion, c *conversion.Cloner) error { +func deepCopy_extensions_APIVersion(in APIVersion, out *APIVersion, c *conversion.Cloner) error { out.Name = in.Name out.APIGroup = in.APIGroup return nil } -func deepCopy_experimental_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error { +func deepCopy_extensions_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_ClusterAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_ClusterAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { return err } return nil } -func deepCopy_experimental_ClusterAutoscalerList(in ClusterAutoscalerList, out *ClusterAutoscalerList, c *conversion.Cloner) error { +func deepCopy_extensions_ClusterAutoscalerList(in ClusterAutoscalerList, out *ClusterAutoscalerList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -871,7 +871,7 @@ func deepCopy_experimental_ClusterAutoscalerList(in ClusterAutoscalerList, out * if in.Items != nil { out.Items = make([]ClusterAutoscaler, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_ClusterAutoscaler(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_ClusterAutoscaler(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -881,13 +881,13 @@ func deepCopy_experimental_ClusterAutoscalerList(in ClusterAutoscalerList, out * return nil } -func deepCopy_experimental_ClusterAutoscalerSpec(in ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, c *conversion.Cloner) error { +func deepCopy_extensions_ClusterAutoscalerSpec(in ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, c *conversion.Cloner) error { out.MinNodes = in.MinNodes out.MaxNodes = in.MaxNodes if in.TargetUtilization != nil { out.TargetUtilization = make([]NodeUtilization, len(in.TargetUtilization)) for i := range in.TargetUtilization { - if err := deepCopy_experimental_NodeUtilization(in.TargetUtilization[i], &out.TargetUtilization[i], c); err != nil { + if err := deepCopy_extensions_NodeUtilization(in.TargetUtilization[i], &out.TargetUtilization[i], c); err != nil { return err } } @@ -897,23 +897,23 @@ func deepCopy_experimental_ClusterAutoscalerSpec(in ClusterAutoscalerSpec, out * return nil } -func deepCopy_experimental_DaemonSet(in DaemonSet, out *DaemonSet, c *conversion.Cloner) error { +func deepCopy_extensions_DaemonSet(in DaemonSet, out *DaemonSet, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_DaemonSetSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_DaemonSetSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_experimental_DaemonSetStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_extensions_DaemonSetStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_experimental_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *conversion.Cloner) error { +func deepCopy_extensions_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -923,7 +923,7 @@ func deepCopy_experimental_DaemonSetList(in DaemonSetList, out *DaemonSetList, c if in.Items != nil { out.Items = make([]DaemonSet, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_DaemonSet(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_DaemonSet(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -933,7 +933,7 @@ func deepCopy_experimental_DaemonSetList(in DaemonSetList, out *DaemonSetList, c return nil } -func deepCopy_experimental_DaemonSetSpec(in DaemonSetSpec, out *DaemonSetSpec, c *conversion.Cloner) error { +func deepCopy_extensions_DaemonSetSpec(in DaemonSetSpec, out *DaemonSetSpec, c *conversion.Cloner) error { if in.Selector != nil { out.Selector = make(map[string]string) for key, val := range in.Selector { @@ -953,30 +953,30 @@ func deepCopy_experimental_DaemonSetSpec(in DaemonSetSpec, out *DaemonSetSpec, c return nil } -func deepCopy_experimental_DaemonSetStatus(in DaemonSetStatus, out *DaemonSetStatus, c *conversion.Cloner) error { +func deepCopy_extensions_DaemonSetStatus(in DaemonSetStatus, out *DaemonSetStatus, c *conversion.Cloner) error { out.CurrentNumberScheduled = in.CurrentNumberScheduled out.NumberMisscheduled = in.NumberMisscheduled out.DesiredNumberScheduled = in.DesiredNumberScheduled return nil } -func deepCopy_experimental_Deployment(in Deployment, out *Deployment, c *conversion.Cloner) error { +func deepCopy_extensions_Deployment(in Deployment, out *Deployment, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_DeploymentSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_DeploymentSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_experimental_DeploymentStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_extensions_DeploymentStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_experimental_DeploymentList(in DeploymentList, out *DeploymentList, c *conversion.Cloner) error { +func deepCopy_extensions_DeploymentList(in DeploymentList, out *DeploymentList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -986,7 +986,7 @@ func deepCopy_experimental_DeploymentList(in DeploymentList, out *DeploymentList if in.Items != nil { out.Items = make([]Deployment, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_Deployment(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_Deployment(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -996,7 +996,7 @@ func deepCopy_experimental_DeploymentList(in DeploymentList, out *DeploymentList return nil } -func deepCopy_experimental_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c *conversion.Cloner) error { +func deepCopy_extensions_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c *conversion.Cloner) error { out.Replicas = in.Replicas if in.Selector != nil { out.Selector = make(map[string]string) @@ -1014,24 +1014,24 @@ func deepCopy_experimental_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec } else { out.Template = nil } - if err := deepCopy_experimental_DeploymentStrategy(in.Strategy, &out.Strategy, c); err != nil { + if err := deepCopy_extensions_DeploymentStrategy(in.Strategy, &out.Strategy, c); err != nil { return err } out.UniqueLabelKey = in.UniqueLabelKey return nil } -func deepCopy_experimental_DeploymentStatus(in DeploymentStatus, out *DeploymentStatus, c *conversion.Cloner) error { +func deepCopy_extensions_DeploymentStatus(in DeploymentStatus, out *DeploymentStatus, c *conversion.Cloner) error { out.Replicas = in.Replicas out.UpdatedReplicas = in.UpdatedReplicas return nil } -func deepCopy_experimental_DeploymentStrategy(in DeploymentStrategy, out *DeploymentStrategy, c *conversion.Cloner) error { +func deepCopy_extensions_DeploymentStrategy(in DeploymentStrategy, out *DeploymentStrategy, c *conversion.Cloner) error { out.Type = in.Type if in.RollingUpdate != nil { out.RollingUpdate = new(RollingUpdateDeployment) - if err := deepCopy_experimental_RollingUpdateDeployment(*in.RollingUpdate, out.RollingUpdate, c); err != nil { + if err := deepCopy_extensions_RollingUpdateDeployment(*in.RollingUpdate, out.RollingUpdate, c); err != nil { return err } } else { @@ -1040,19 +1040,19 @@ func deepCopy_experimental_DeploymentStrategy(in DeploymentStrategy, out *Deploy return nil } -func deepCopy_experimental_HTTPIngressPath(in HTTPIngressPath, out *HTTPIngressPath, c *conversion.Cloner) error { +func deepCopy_extensions_HTTPIngressPath(in HTTPIngressPath, out *HTTPIngressPath, c *conversion.Cloner) error { out.Path = in.Path - if err := deepCopy_experimental_IngressBackend(in.Backend, &out.Backend, c); err != nil { + if err := deepCopy_extensions_IngressBackend(in.Backend, &out.Backend, c); err != nil { return err } return nil } -func deepCopy_experimental_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIngressRuleValue, c *conversion.Cloner) error { +func deepCopy_extensions_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIngressRuleValue, c *conversion.Cloner) error { if in.Paths != nil { out.Paths = make([]HTTPIngressPath, len(in.Paths)) for i := range in.Paths { - if err := deepCopy_experimental_HTTPIngressPath(in.Paths[i], &out.Paths[i], c); err != nil { + if err := deepCopy_extensions_HTTPIngressPath(in.Paths[i], &out.Paths[i], c); err != nil { return err } } @@ -1062,23 +1062,23 @@ func deepCopy_experimental_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HT return nil } -func deepCopy_experimental_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error { +func deepCopy_extensions_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_experimental_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_extensions_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_experimental_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error { +func deepCopy_extensions_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1088,7 +1088,7 @@ func deepCopy_experimental_HorizontalPodAutoscalerList(in HorizontalPodAutoscale if in.Items != nil { out.Items = make([]HorizontalPodAutoscaler, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_HorizontalPodAutoscaler(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_HorizontalPodAutoscaler(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1098,10 +1098,10 @@ func deepCopy_experimental_HorizontalPodAutoscalerList(in HorizontalPodAutoscale return nil } -func deepCopy_experimental_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error { +func deepCopy_extensions_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error { if in.ScaleRef != nil { out.ScaleRef = new(SubresourceReference) - if err := deepCopy_experimental_SubresourceReference(*in.ScaleRef, out.ScaleRef, c); err != nil { + if err := deepCopy_extensions_SubresourceReference(*in.ScaleRef, out.ScaleRef, c); err != nil { return err } } else { @@ -1109,18 +1109,18 @@ func deepCopy_experimental_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscale } out.MinReplicas = in.MinReplicas out.MaxReplicas = in.MaxReplicas - if err := deepCopy_experimental_ResourceConsumption(in.Target, &out.Target, c); err != nil { + if err := deepCopy_extensions_ResourceConsumption(in.Target, &out.Target, c); err != nil { return err } return nil } -func deepCopy_experimental_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error { +func deepCopy_extensions_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error { out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas if in.CurrentConsumption != nil { out.CurrentConsumption = new(ResourceConsumption) - if err := deepCopy_experimental_ResourceConsumption(*in.CurrentConsumption, out.CurrentConsumption, c); err != nil { + if err := deepCopy_extensions_ResourceConsumption(*in.CurrentConsumption, out.CurrentConsumption, c); err != nil { return err } } else { @@ -1137,23 +1137,23 @@ func deepCopy_experimental_HorizontalPodAutoscalerStatus(in HorizontalPodAutosca return nil } -func deepCopy_experimental_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) error { +func deepCopy_extensions_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_IngressSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_IngressSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_experimental_IngressStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_extensions_IngressStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_experimental_IngressBackend(in IngressBackend, out *IngressBackend, c *conversion.Cloner) error { +func deepCopy_extensions_IngressBackend(in IngressBackend, out *IngressBackend, c *conversion.Cloner) error { out.ServiceName = in.ServiceName if err := deepCopy_util_IntOrString(in.ServicePort, &out.ServicePort, c); err != nil { return err @@ -1161,7 +1161,7 @@ func deepCopy_experimental_IngressBackend(in IngressBackend, out *IngressBackend return nil } -func deepCopy_experimental_IngressList(in IngressList, out *IngressList, c *conversion.Cloner) error { +func deepCopy_extensions_IngressList(in IngressList, out *IngressList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1171,7 +1171,7 @@ func deepCopy_experimental_IngressList(in IngressList, out *IngressList, c *conv if in.Items != nil { out.Items = make([]Ingress, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_Ingress(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_Ingress(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1181,18 +1181,18 @@ func deepCopy_experimental_IngressList(in IngressList, out *IngressList, c *conv return nil } -func deepCopy_experimental_IngressRule(in IngressRule, out *IngressRule, c *conversion.Cloner) error { +func deepCopy_extensions_IngressRule(in IngressRule, out *IngressRule, c *conversion.Cloner) error { out.Host = in.Host - if err := deepCopy_experimental_IngressRuleValue(in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { + if err := deepCopy_extensions_IngressRuleValue(in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { return err } return nil } -func deepCopy_experimental_IngressRuleValue(in IngressRuleValue, out *IngressRuleValue, c *conversion.Cloner) error { +func deepCopy_extensions_IngressRuleValue(in IngressRuleValue, out *IngressRuleValue, c *conversion.Cloner) error { if in.HTTP != nil { out.HTTP = new(HTTPIngressRuleValue) - if err := deepCopy_experimental_HTTPIngressRuleValue(*in.HTTP, out.HTTP, c); err != nil { + if err := deepCopy_extensions_HTTPIngressRuleValue(*in.HTTP, out.HTTP, c); err != nil { return err } } else { @@ -1201,10 +1201,10 @@ func deepCopy_experimental_IngressRuleValue(in IngressRuleValue, out *IngressRul return nil } -func deepCopy_experimental_IngressSpec(in IngressSpec, out *IngressSpec, c *conversion.Cloner) error { +func deepCopy_extensions_IngressSpec(in IngressSpec, out *IngressSpec, c *conversion.Cloner) error { if in.Backend != nil { out.Backend = new(IngressBackend) - if err := deepCopy_experimental_IngressBackend(*in.Backend, out.Backend, c); err != nil { + if err := deepCopy_extensions_IngressBackend(*in.Backend, out.Backend, c); err != nil { return err } } else { @@ -1213,7 +1213,7 @@ func deepCopy_experimental_IngressSpec(in IngressSpec, out *IngressSpec, c *conv if in.Rules != nil { out.Rules = make([]IngressRule, len(in.Rules)) for i := range in.Rules { - if err := deepCopy_experimental_IngressRule(in.Rules[i], &out.Rules[i], c); err != nil { + if err := deepCopy_extensions_IngressRule(in.Rules[i], &out.Rules[i], c); err != nil { return err } } @@ -1223,30 +1223,30 @@ func deepCopy_experimental_IngressSpec(in IngressSpec, out *IngressSpec, c *conv return nil } -func deepCopy_experimental_IngressStatus(in IngressStatus, out *IngressStatus, c *conversion.Cloner) error { +func deepCopy_extensions_IngressStatus(in IngressStatus, out *IngressStatus, c *conversion.Cloner) error { if err := deepCopy_api_LoadBalancerStatus(in.LoadBalancer, &out.LoadBalancer, c); err != nil { return err } return nil } -func deepCopy_experimental_Job(in Job, out *Job, c *conversion.Cloner) error { +func deepCopy_extensions_Job(in Job, out *Job, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_JobSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_JobSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_experimental_JobStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_extensions_JobStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_experimental_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error { +func deepCopy_extensions_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error { out.Type = in.Type out.Status = in.Status if err := deepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil { @@ -1260,7 +1260,7 @@ func deepCopy_experimental_JobCondition(in JobCondition, out *JobCondition, c *c return nil } -func deepCopy_experimental_JobList(in JobList, out *JobList, c *conversion.Cloner) error { +func deepCopy_extensions_JobList(in JobList, out *JobList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1270,7 +1270,7 @@ func deepCopy_experimental_JobList(in JobList, out *JobList, c *conversion.Clone if in.Items != nil { out.Items = make([]Job, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_Job(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_Job(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1280,7 +1280,7 @@ func deepCopy_experimental_JobList(in JobList, out *JobList, c *conversion.Clone return nil } -func deepCopy_experimental_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error { +func deepCopy_extensions_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error { if in.Parallelism != nil { out.Parallelism = new(int) *out.Parallelism = *in.Parallelism @@ -1312,11 +1312,11 @@ func deepCopy_experimental_JobSpec(in JobSpec, out *JobSpec, c *conversion.Clone return nil } -func deepCopy_experimental_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error { +func deepCopy_extensions_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error { if in.Conditions != nil { out.Conditions = make([]JobCondition, len(in.Conditions)) for i := range in.Conditions { - if err := deepCopy_experimental_JobCondition(in.Conditions[i], &out.Conditions[i], c); err != nil { + if err := deepCopy_extensions_JobCondition(in.Conditions[i], &out.Conditions[i], c); err != nil { return err } } @@ -1345,20 +1345,20 @@ func deepCopy_experimental_JobStatus(in JobStatus, out *JobStatus, c *conversion return nil } -func deepCopy_experimental_NodeUtilization(in NodeUtilization, out *NodeUtilization, c *conversion.Cloner) error { +func deepCopy_extensions_NodeUtilization(in NodeUtilization, out *NodeUtilization, c *conversion.Cloner) error { out.Resource = in.Resource out.Value = in.Value return nil } -func deepCopy_experimental_ReplicationControllerDummy(in ReplicationControllerDummy, out *ReplicationControllerDummy, c *conversion.Cloner) error { +func deepCopy_extensions_ReplicationControllerDummy(in ReplicationControllerDummy, out *ReplicationControllerDummy, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } return nil } -func deepCopy_experimental_ResourceConsumption(in ResourceConsumption, out *ResourceConsumption, c *conversion.Cloner) error { +func deepCopy_extensions_ResourceConsumption(in ResourceConsumption, out *ResourceConsumption, c *conversion.Cloner) error { out.Resource = in.Resource if err := deepCopy_resource_Quantity(in.Quantity, &out.Quantity, c); err != nil { return err @@ -1366,7 +1366,7 @@ func deepCopy_experimental_ResourceConsumption(in ResourceConsumption, out *Reso return nil } -func deepCopy_experimental_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error { +func deepCopy_extensions_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error { if err := deepCopy_util_IntOrString(in.MaxUnavailable, &out.MaxUnavailable, c); err != nil { return err } @@ -1377,28 +1377,28 @@ func deepCopy_experimental_RollingUpdateDeployment(in RollingUpdateDeployment, o return nil } -func deepCopy_experimental_Scale(in Scale, out *Scale, c *conversion.Cloner) error { +func deepCopy_extensions_Scale(in Scale, out *Scale, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_api_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_experimental_ScaleSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_extensions_ScaleSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_experimental_ScaleStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_extensions_ScaleStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_experimental_ScaleSpec(in ScaleSpec, out *ScaleSpec, c *conversion.Cloner) error { +func deepCopy_extensions_ScaleSpec(in ScaleSpec, out *ScaleSpec, c *conversion.Cloner) error { out.Replicas = in.Replicas return nil } -func deepCopy_experimental_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversion.Cloner) error { +func deepCopy_extensions_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversion.Cloner) error { out.Replicas = in.Replicas if in.Selector != nil { out.Selector = make(map[string]string) @@ -1411,7 +1411,7 @@ func deepCopy_experimental_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conv return nil } -func deepCopy_experimental_SubresourceReference(in SubresourceReference, out *SubresourceReference, c *conversion.Cloner) error { +func deepCopy_extensions_SubresourceReference(in SubresourceReference, out *SubresourceReference, c *conversion.Cloner) error { out.Kind = in.Kind out.Namespace = in.Namespace out.Name = in.Name @@ -1420,7 +1420,7 @@ func deepCopy_experimental_SubresourceReference(in SubresourceReference, out *Su return nil } -func deepCopy_experimental_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyResource, c *conversion.Cloner) error { +func deepCopy_extensions_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyResource, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1431,7 +1431,7 @@ func deepCopy_experimental_ThirdPartyResource(in ThirdPartyResource, out *ThirdP if in.Versions != nil { out.Versions = make([]APIVersion, len(in.Versions)) for i := range in.Versions { - if err := deepCopy_experimental_APIVersion(in.Versions[i], &out.Versions[i], c); err != nil { + if err := deepCopy_extensions_APIVersion(in.Versions[i], &out.Versions[i], c); err != nil { return err } } @@ -1441,7 +1441,7 @@ func deepCopy_experimental_ThirdPartyResource(in ThirdPartyResource, out *ThirdP return nil } -func deepCopy_experimental_ThirdPartyResourceData(in ThirdPartyResourceData, out *ThirdPartyResourceData, c *conversion.Cloner) error { +func deepCopy_extensions_ThirdPartyResourceData(in ThirdPartyResourceData, out *ThirdPartyResourceData, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1459,7 +1459,7 @@ func deepCopy_experimental_ThirdPartyResourceData(in ThirdPartyResourceData, out return nil } -func deepCopy_experimental_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, c *conversion.Cloner) error { +func deepCopy_extensions_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1469,7 +1469,7 @@ func deepCopy_experimental_ThirdPartyResourceDataList(in ThirdPartyResourceDataL if in.Items != nil { out.Items = make([]ThirdPartyResourceData, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_ThirdPartyResourceData(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_ThirdPartyResourceData(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1479,7 +1479,7 @@ func deepCopy_experimental_ThirdPartyResourceDataList(in ThirdPartyResourceDataL return nil } -func deepCopy_experimental_ThirdPartyResourceList(in ThirdPartyResourceList, out *ThirdPartyResourceList, c *conversion.Cloner) error { +func deepCopy_extensions_ThirdPartyResourceList(in ThirdPartyResourceList, out *ThirdPartyResourceList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1489,7 +1489,7 @@ func deepCopy_experimental_ThirdPartyResourceList(in ThirdPartyResourceList, out if in.Items != nil { out.Items = make([]ThirdPartyResource, len(in.Items)) for i := range in.Items { - if err := deepCopy_experimental_ThirdPartyResource(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_extensions_ThirdPartyResource(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1554,49 +1554,49 @@ func init() { deepCopy_unversioned_ListMeta, deepCopy_unversioned_Time, deepCopy_unversioned_TypeMeta, - deepCopy_experimental_APIVersion, - deepCopy_experimental_ClusterAutoscaler, - deepCopy_experimental_ClusterAutoscalerList, - deepCopy_experimental_ClusterAutoscalerSpec, - deepCopy_experimental_DaemonSet, - deepCopy_experimental_DaemonSetList, - deepCopy_experimental_DaemonSetSpec, - deepCopy_experimental_DaemonSetStatus, - deepCopy_experimental_Deployment, - deepCopy_experimental_DeploymentList, - deepCopy_experimental_DeploymentSpec, - deepCopy_experimental_DeploymentStatus, - deepCopy_experimental_DeploymentStrategy, - deepCopy_experimental_HTTPIngressPath, - deepCopy_experimental_HTTPIngressRuleValue, - deepCopy_experimental_HorizontalPodAutoscaler, - deepCopy_experimental_HorizontalPodAutoscalerList, - deepCopy_experimental_HorizontalPodAutoscalerSpec, - deepCopy_experimental_HorizontalPodAutoscalerStatus, - deepCopy_experimental_Ingress, - deepCopy_experimental_IngressBackend, - deepCopy_experimental_IngressList, - deepCopy_experimental_IngressRule, - deepCopy_experimental_IngressRuleValue, - deepCopy_experimental_IngressSpec, - deepCopy_experimental_IngressStatus, - deepCopy_experimental_Job, - deepCopy_experimental_JobCondition, - deepCopy_experimental_JobList, - deepCopy_experimental_JobSpec, - deepCopy_experimental_JobStatus, - deepCopy_experimental_NodeUtilization, - deepCopy_experimental_ReplicationControllerDummy, - deepCopy_experimental_ResourceConsumption, - deepCopy_experimental_RollingUpdateDeployment, - deepCopy_experimental_Scale, - deepCopy_experimental_ScaleSpec, - deepCopy_experimental_ScaleStatus, - deepCopy_experimental_SubresourceReference, - deepCopy_experimental_ThirdPartyResource, - deepCopy_experimental_ThirdPartyResourceData, - deepCopy_experimental_ThirdPartyResourceDataList, - deepCopy_experimental_ThirdPartyResourceList, + deepCopy_extensions_APIVersion, + deepCopy_extensions_ClusterAutoscaler, + deepCopy_extensions_ClusterAutoscalerList, + deepCopy_extensions_ClusterAutoscalerSpec, + deepCopy_extensions_DaemonSet, + deepCopy_extensions_DaemonSetList, + deepCopy_extensions_DaemonSetSpec, + deepCopy_extensions_DaemonSetStatus, + deepCopy_extensions_Deployment, + deepCopy_extensions_DeploymentList, + deepCopy_extensions_DeploymentSpec, + deepCopy_extensions_DeploymentStatus, + deepCopy_extensions_DeploymentStrategy, + deepCopy_extensions_HTTPIngressPath, + deepCopy_extensions_HTTPIngressRuleValue, + deepCopy_extensions_HorizontalPodAutoscaler, + deepCopy_extensions_HorizontalPodAutoscalerList, + deepCopy_extensions_HorizontalPodAutoscalerSpec, + deepCopy_extensions_HorizontalPodAutoscalerStatus, + deepCopy_extensions_Ingress, + deepCopy_extensions_IngressBackend, + deepCopy_extensions_IngressList, + deepCopy_extensions_IngressRule, + deepCopy_extensions_IngressRuleValue, + deepCopy_extensions_IngressSpec, + deepCopy_extensions_IngressStatus, + deepCopy_extensions_Job, + deepCopy_extensions_JobCondition, + deepCopy_extensions_JobList, + deepCopy_extensions_JobSpec, + deepCopy_extensions_JobStatus, + deepCopy_extensions_NodeUtilization, + deepCopy_extensions_ReplicationControllerDummy, + deepCopy_extensions_ResourceConsumption, + deepCopy_extensions_RollingUpdateDeployment, + deepCopy_extensions_Scale, + deepCopy_extensions_ScaleSpec, + deepCopy_extensions_ScaleStatus, + deepCopy_extensions_SubresourceReference, + deepCopy_extensions_ThirdPartyResource, + deepCopy_extensions_ThirdPartyResourceData, + deepCopy_extensions_ThirdPartyResourceDataList, + deepCopy_extensions_ThirdPartyResourceList, deepCopy_util_IntOrString, ) if err != nil { diff --git a/pkg/apis/experimental/install/install.go b/pkg/apis/extensions/install/install.go similarity index 84% rename from pkg/apis/experimental/install/install.go rename to pkg/apis/extensions/install/install.go index a03bc917801..100dcfdbf92 100644 --- a/pkg/apis/experimental/install/install.go +++ b/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, ", ")) } } diff --git a/pkg/apis/experimental/install/install_test.go b/pkg/apis/extensions/install/install_test.go similarity index 63% rename from pkg/apis/experimental/install/install_test.go rename to pkg/apis/extensions/install/install_test.go index a9ef7632e2a..97c28a94a25 100644 --- a/pkg/apis/experimental/install/install_test.go +++ b/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) diff --git a/pkg/apis/experimental/register.go b/pkg/apis/extensions/register.go similarity index 99% rename from pkg/apis/experimental/register.go rename to pkg/apis/extensions/register.go index 882e4e76235..535c3c407df 100644 --- a/pkg/apis/experimental/register.go +++ b/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" diff --git a/pkg/apis/experimental/types.go b/pkg/apis/extensions/types.go similarity index 99% rename from pkg/apis/experimental/types.go rename to pkg/apis/extensions/types.go index eca290cfd99..5db02930f9d 100644 --- a/pkg/apis/experimental/types.go +++ b/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" diff --git a/pkg/apis/experimental/v1alpha1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go similarity index 80% rename from pkg/apis/experimental/v1alpha1/conversion.go rename to pkg/apis/extensions/v1beta1/conversion.go index 515f5f90a6b..0f6ffac777e 100644 --- a/pkg/apis/experimental/v1alpha1/conversion.go +++ b/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) } diff --git a/pkg/apis/experimental/v1alpha1/conversion_generated.go b/pkg/apis/extensions/v1beta1/conversion_generated.go similarity index 68% rename from pkg/apis/experimental/v1alpha1/conversion_generated.go rename to pkg/apis/extensions/v1beta1/conversion_generated.go index b52a1e9cdde..9aecfbdaa77 100644 --- a/pkg/apis/experimental/v1alpha1/conversion_generated.go +++ b/pkg/apis/extensions/v1beta1/conversion_generated.go @@ -16,7 +16,7 @@ limitations under the License. // DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-conversions.sh -package v1alpha1 +package v1beta1 import ( reflect "reflect" @@ -24,7 +24,7 @@ import ( api "k8s.io/kubernetes/pkg/api" resource "k8s.io/kubernetes/pkg/api/resource" v1 "k8s.io/kubernetes/pkg/api/v1" - experimental "k8s.io/kubernetes/pkg/apis/experimental" + extensions "k8s.io/kubernetes/pkg/apis/extensions" conversion "k8s.io/kubernetes/pkg/conversion" ) @@ -2132,22 +2132,22 @@ func convert_v1_VolumeSource_To_api_VolumeSource(in *v1.VolumeSource, out *api.V return autoconvert_v1_VolumeSource_To_api_VolumeSource(in, out, s) } -func autoconvert_experimental_APIVersion_To_v1alpha1_APIVersion(in *experimental.APIVersion, out *APIVersion, s conversion.Scope) error { +func autoconvert_extensions_APIVersion_To_v1beta1_APIVersion(in *extensions.APIVersion, out *APIVersion, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.APIVersion))(in) + defaulting.(func(*extensions.APIVersion))(in) } out.Name = in.Name out.APIGroup = in.APIGroup return nil } -func convert_experimental_APIVersion_To_v1alpha1_APIVersion(in *experimental.APIVersion, out *APIVersion, s conversion.Scope) error { - return autoconvert_experimental_APIVersion_To_v1alpha1_APIVersion(in, out, s) +func convert_extensions_APIVersion_To_v1beta1_APIVersion(in *extensions.APIVersion, out *APIVersion, s conversion.Scope) error { + return autoconvert_extensions_APIVersion_To_v1beta1_APIVersion(in, out, s) } -func autoconvert_experimental_ClusterAutoscaler_To_v1alpha1_ClusterAutoscaler(in *experimental.ClusterAutoscaler, out *ClusterAutoscaler, s conversion.Scope) error { +func autoconvert_extensions_ClusterAutoscaler_To_v1beta1_ClusterAutoscaler(in *extensions.ClusterAutoscaler, out *ClusterAutoscaler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ClusterAutoscaler))(in) + defaulting.(func(*extensions.ClusterAutoscaler))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2155,19 +2155,19 @@ func autoconvert_experimental_ClusterAutoscaler_To_v1alpha1_ClusterAutoscaler(in if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_ClusterAutoscalerSpec_To_v1alpha1_ClusterAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_ClusterAutoscalerSpec_To_v1beta1_ClusterAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -func convert_experimental_ClusterAutoscaler_To_v1alpha1_ClusterAutoscaler(in *experimental.ClusterAutoscaler, out *ClusterAutoscaler, s conversion.Scope) error { - return autoconvert_experimental_ClusterAutoscaler_To_v1alpha1_ClusterAutoscaler(in, out, s) +func convert_extensions_ClusterAutoscaler_To_v1beta1_ClusterAutoscaler(in *extensions.ClusterAutoscaler, out *ClusterAutoscaler, s conversion.Scope) error { + return autoconvert_extensions_ClusterAutoscaler_To_v1beta1_ClusterAutoscaler(in, out, s) } -func autoconvert_experimental_ClusterAutoscalerList_To_v1alpha1_ClusterAutoscalerList(in *experimental.ClusterAutoscalerList, out *ClusterAutoscalerList, s conversion.Scope) error { +func autoconvert_extensions_ClusterAutoscalerList_To_v1beta1_ClusterAutoscalerList(in *extensions.ClusterAutoscalerList, out *ClusterAutoscalerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ClusterAutoscalerList))(in) + defaulting.(func(*extensions.ClusterAutoscalerList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2178,7 +2178,7 @@ func autoconvert_experimental_ClusterAutoscalerList_To_v1alpha1_ClusterAutoscale if in.Items != nil { out.Items = make([]ClusterAutoscaler, len(in.Items)) for i := range in.Items { - if err := convert_experimental_ClusterAutoscaler_To_v1alpha1_ClusterAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_ClusterAutoscaler_To_v1beta1_ClusterAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2188,20 +2188,20 @@ func autoconvert_experimental_ClusterAutoscalerList_To_v1alpha1_ClusterAutoscale return nil } -func convert_experimental_ClusterAutoscalerList_To_v1alpha1_ClusterAutoscalerList(in *experimental.ClusterAutoscalerList, out *ClusterAutoscalerList, s conversion.Scope) error { - return autoconvert_experimental_ClusterAutoscalerList_To_v1alpha1_ClusterAutoscalerList(in, out, s) +func convert_extensions_ClusterAutoscalerList_To_v1beta1_ClusterAutoscalerList(in *extensions.ClusterAutoscalerList, out *ClusterAutoscalerList, s conversion.Scope) error { + return autoconvert_extensions_ClusterAutoscalerList_To_v1beta1_ClusterAutoscalerList(in, out, s) } -func autoconvert_experimental_ClusterAutoscalerSpec_To_v1alpha1_ClusterAutoscalerSpec(in *experimental.ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, s conversion.Scope) error { +func autoconvert_extensions_ClusterAutoscalerSpec_To_v1beta1_ClusterAutoscalerSpec(in *extensions.ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ClusterAutoscalerSpec))(in) + defaulting.(func(*extensions.ClusterAutoscalerSpec))(in) } out.MinNodes = in.MinNodes out.MaxNodes = in.MaxNodes if in.TargetUtilization != nil { out.TargetUtilization = make([]NodeUtilization, len(in.TargetUtilization)) for i := range in.TargetUtilization { - if err := convert_experimental_NodeUtilization_To_v1alpha1_NodeUtilization(&in.TargetUtilization[i], &out.TargetUtilization[i], s); err != nil { + if err := convert_extensions_NodeUtilization_To_v1beta1_NodeUtilization(&in.TargetUtilization[i], &out.TargetUtilization[i], s); err != nil { return err } } @@ -2211,13 +2211,13 @@ func autoconvert_experimental_ClusterAutoscalerSpec_To_v1alpha1_ClusterAutoscale return nil } -func convert_experimental_ClusterAutoscalerSpec_To_v1alpha1_ClusterAutoscalerSpec(in *experimental.ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, s conversion.Scope) error { - return autoconvert_experimental_ClusterAutoscalerSpec_To_v1alpha1_ClusterAutoscalerSpec(in, out, s) +func convert_extensions_ClusterAutoscalerSpec_To_v1beta1_ClusterAutoscalerSpec(in *extensions.ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, s conversion.Scope) error { + return autoconvert_extensions_ClusterAutoscalerSpec_To_v1beta1_ClusterAutoscalerSpec(in, out, s) } -func autoconvert_experimental_DaemonSet_To_v1alpha1_DaemonSet(in *experimental.DaemonSet, out *DaemonSet, s conversion.Scope) error { +func autoconvert_extensions_DaemonSet_To_v1beta1_DaemonSet(in *extensions.DaemonSet, out *DaemonSet, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.DaemonSet))(in) + defaulting.(func(*extensions.DaemonSet))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2225,22 +2225,22 @@ func autoconvert_experimental_DaemonSet_To_v1alpha1_DaemonSet(in *experimental.D if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_DaemonSetSpec_To_v1alpha1_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_experimental_DaemonSetStatus_To_v1alpha1_DaemonSetStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_extensions_DaemonSetStatus_To_v1beta1_DaemonSetStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_experimental_DaemonSet_To_v1alpha1_DaemonSet(in *experimental.DaemonSet, out *DaemonSet, s conversion.Scope) error { - return autoconvert_experimental_DaemonSet_To_v1alpha1_DaemonSet(in, out, s) +func convert_extensions_DaemonSet_To_v1beta1_DaemonSet(in *extensions.DaemonSet, out *DaemonSet, s conversion.Scope) error { + return autoconvert_extensions_DaemonSet_To_v1beta1_DaemonSet(in, out, s) } -func autoconvert_experimental_DaemonSetList_To_v1alpha1_DaemonSetList(in *experimental.DaemonSetList, out *DaemonSetList, s conversion.Scope) error { +func autoconvert_extensions_DaemonSetList_To_v1beta1_DaemonSetList(in *extensions.DaemonSetList, out *DaemonSetList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.DaemonSetList))(in) + defaulting.(func(*extensions.DaemonSetList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2251,7 +2251,7 @@ func autoconvert_experimental_DaemonSetList_To_v1alpha1_DaemonSetList(in *experi if in.Items != nil { out.Items = make([]DaemonSet, len(in.Items)) for i := range in.Items { - if err := convert_experimental_DaemonSet_To_v1alpha1_DaemonSet(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_DaemonSet_To_v1beta1_DaemonSet(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2261,13 +2261,13 @@ func autoconvert_experimental_DaemonSetList_To_v1alpha1_DaemonSetList(in *experi return nil } -func convert_experimental_DaemonSetList_To_v1alpha1_DaemonSetList(in *experimental.DaemonSetList, out *DaemonSetList, s conversion.Scope) error { - return autoconvert_experimental_DaemonSetList_To_v1alpha1_DaemonSetList(in, out, s) +func convert_extensions_DaemonSetList_To_v1beta1_DaemonSetList(in *extensions.DaemonSetList, out *DaemonSetList, s conversion.Scope) error { + return autoconvert_extensions_DaemonSetList_To_v1beta1_DaemonSetList(in, out, s) } -func autoconvert_experimental_DaemonSetSpec_To_v1alpha1_DaemonSetSpec(in *experimental.DaemonSetSpec, out *DaemonSetSpec, s conversion.Scope) error { +func autoconvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *DaemonSetSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.DaemonSetSpec))(in) + defaulting.(func(*extensions.DaemonSetSpec))(in) } if in.Selector != nil { out.Selector = make(map[string]string) @@ -2288,13 +2288,13 @@ func autoconvert_experimental_DaemonSetSpec_To_v1alpha1_DaemonSetSpec(in *experi return nil } -func convert_experimental_DaemonSetSpec_To_v1alpha1_DaemonSetSpec(in *experimental.DaemonSetSpec, out *DaemonSetSpec, s conversion.Scope) error { - return autoconvert_experimental_DaemonSetSpec_To_v1alpha1_DaemonSetSpec(in, out, s) +func convert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in *extensions.DaemonSetSpec, out *DaemonSetSpec, s conversion.Scope) error { + return autoconvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec(in, out, s) } -func autoconvert_experimental_DaemonSetStatus_To_v1alpha1_DaemonSetStatus(in *experimental.DaemonSetStatus, out *DaemonSetStatus, s conversion.Scope) error { +func autoconvert_extensions_DaemonSetStatus_To_v1beta1_DaemonSetStatus(in *extensions.DaemonSetStatus, out *DaemonSetStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.DaemonSetStatus))(in) + defaulting.(func(*extensions.DaemonSetStatus))(in) } out.CurrentNumberScheduled = in.CurrentNumberScheduled out.NumberMisscheduled = in.NumberMisscheduled @@ -2302,13 +2302,13 @@ func autoconvert_experimental_DaemonSetStatus_To_v1alpha1_DaemonSetStatus(in *ex return nil } -func convert_experimental_DaemonSetStatus_To_v1alpha1_DaemonSetStatus(in *experimental.DaemonSetStatus, out *DaemonSetStatus, s conversion.Scope) error { - return autoconvert_experimental_DaemonSetStatus_To_v1alpha1_DaemonSetStatus(in, out, s) +func convert_extensions_DaemonSetStatus_To_v1beta1_DaemonSetStatus(in *extensions.DaemonSetStatus, out *DaemonSetStatus, s conversion.Scope) error { + return autoconvert_extensions_DaemonSetStatus_To_v1beta1_DaemonSetStatus(in, out, s) } -func autoconvert_experimental_Deployment_To_v1alpha1_Deployment(in *experimental.Deployment, out *Deployment, s conversion.Scope) error { +func autoconvert_extensions_Deployment_To_v1beta1_Deployment(in *extensions.Deployment, out *Deployment, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.Deployment))(in) + defaulting.(func(*extensions.Deployment))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2316,22 +2316,22 @@ func autoconvert_experimental_Deployment_To_v1alpha1_Deployment(in *experimental if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_experimental_DeploymentStatus_To_v1alpha1_DeploymentStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_experimental_Deployment_To_v1alpha1_Deployment(in *experimental.Deployment, out *Deployment, s conversion.Scope) error { - return autoconvert_experimental_Deployment_To_v1alpha1_Deployment(in, out, s) +func convert_extensions_Deployment_To_v1beta1_Deployment(in *extensions.Deployment, out *Deployment, s conversion.Scope) error { + return autoconvert_extensions_Deployment_To_v1beta1_Deployment(in, out, s) } -func autoconvert_experimental_DeploymentList_To_v1alpha1_DeploymentList(in *experimental.DeploymentList, out *DeploymentList, s conversion.Scope) error { +func autoconvert_extensions_DeploymentList_To_v1beta1_DeploymentList(in *extensions.DeploymentList, out *DeploymentList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.DeploymentList))(in) + defaulting.(func(*extensions.DeploymentList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2342,7 +2342,7 @@ func autoconvert_experimental_DeploymentList_To_v1alpha1_DeploymentList(in *expe if in.Items != nil { out.Items = make([]Deployment, len(in.Items)) for i := range in.Items { - if err := convert_experimental_Deployment_To_v1alpha1_Deployment(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_Deployment_To_v1beta1_Deployment(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2352,13 +2352,13 @@ func autoconvert_experimental_DeploymentList_To_v1alpha1_DeploymentList(in *expe return nil } -func convert_experimental_DeploymentList_To_v1alpha1_DeploymentList(in *experimental.DeploymentList, out *DeploymentList, s conversion.Scope) error { - return autoconvert_experimental_DeploymentList_To_v1alpha1_DeploymentList(in, out, s) +func convert_extensions_DeploymentList_To_v1beta1_DeploymentList(in *extensions.DeploymentList, out *DeploymentList, s conversion.Scope) error { + return autoconvert_extensions_DeploymentList_To_v1beta1_DeploymentList(in, out, s) } -func autoconvert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *experimental.DeploymentSpec, out *DeploymentSpec, s conversion.Scope) error { +func autoconvert_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) } if err := s.Convert(&in.Replicas, &out.Replicas, 0); err != nil { return err @@ -2379,7 +2379,7 @@ func autoconvert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *expe } 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 } if err := s.Convert(&in.UniqueLabelKey, &out.UniqueLabelKey, 0); err != nil { @@ -2388,27 +2388,27 @@ func autoconvert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec(in *expe return nil } -func autoconvert_experimental_DeploymentStatus_To_v1alpha1_DeploymentStatus(in *experimental.DeploymentStatus, out *DeploymentStatus, s conversion.Scope) error { +func autoconvert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus(in *extensions.DeploymentStatus, out *DeploymentStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.DeploymentStatus))(in) + defaulting.(func(*extensions.DeploymentStatus))(in) } out.Replicas = in.Replicas out.UpdatedReplicas = in.UpdatedReplicas return nil } -func convert_experimental_DeploymentStatus_To_v1alpha1_DeploymentStatus(in *experimental.DeploymentStatus, out *DeploymentStatus, s conversion.Scope) error { - return autoconvert_experimental_DeploymentStatus_To_v1alpha1_DeploymentStatus(in, out, s) +func convert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus(in *extensions.DeploymentStatus, out *DeploymentStatus, s conversion.Scope) error { + return autoconvert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus(in, out, s) } -func autoconvert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy(in *experimental.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error { +func autoconvert_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 { @@ -2417,29 +2417,29 @@ func autoconvert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy( return nil } -func autoconvert_experimental_HTTPIngressPath_To_v1alpha1_HTTPIngressPath(in *experimental.HTTPIngressPath, out *HTTPIngressPath, s conversion.Scope) error { +func autoconvert_extensions_HTTPIngressPath_To_v1beta1_HTTPIngressPath(in *extensions.HTTPIngressPath, out *HTTPIngressPath, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.HTTPIngressPath))(in) + defaulting.(func(*extensions.HTTPIngressPath))(in) } out.Path = in.Path - if err := convert_experimental_IngressBackend_To_v1alpha1_IngressBackend(&in.Backend, &out.Backend, s); err != nil { + if err := convert_extensions_IngressBackend_To_v1beta1_IngressBackend(&in.Backend, &out.Backend, s); err != nil { return err } return nil } -func convert_experimental_HTTPIngressPath_To_v1alpha1_HTTPIngressPath(in *experimental.HTTPIngressPath, out *HTTPIngressPath, s conversion.Scope) error { - return autoconvert_experimental_HTTPIngressPath_To_v1alpha1_HTTPIngressPath(in, out, s) +func convert_extensions_HTTPIngressPath_To_v1beta1_HTTPIngressPath(in *extensions.HTTPIngressPath, out *HTTPIngressPath, s conversion.Scope) error { + return autoconvert_extensions_HTTPIngressPath_To_v1beta1_HTTPIngressPath(in, out, s) } -func autoconvert_experimental_HTTPIngressRuleValue_To_v1alpha1_HTTPIngressRuleValue(in *experimental.HTTPIngressRuleValue, out *HTTPIngressRuleValue, s conversion.Scope) error { +func autoconvert_extensions_HTTPIngressRuleValue_To_v1beta1_HTTPIngressRuleValue(in *extensions.HTTPIngressRuleValue, out *HTTPIngressRuleValue, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.HTTPIngressRuleValue))(in) + defaulting.(func(*extensions.HTTPIngressRuleValue))(in) } if in.Paths != nil { out.Paths = make([]HTTPIngressPath, len(in.Paths)) for i := range in.Paths { - if err := convert_experimental_HTTPIngressPath_To_v1alpha1_HTTPIngressPath(&in.Paths[i], &out.Paths[i], s); err != nil { + if err := convert_extensions_HTTPIngressPath_To_v1beta1_HTTPIngressPath(&in.Paths[i], &out.Paths[i], s); err != nil { return err } } @@ -2449,13 +2449,13 @@ func autoconvert_experimental_HTTPIngressRuleValue_To_v1alpha1_HTTPIngressRuleVa return nil } -func convert_experimental_HTTPIngressRuleValue_To_v1alpha1_HTTPIngressRuleValue(in *experimental.HTTPIngressRuleValue, out *HTTPIngressRuleValue, s conversion.Scope) error { - return autoconvert_experimental_HTTPIngressRuleValue_To_v1alpha1_HTTPIngressRuleValue(in, out, s) +func convert_extensions_HTTPIngressRuleValue_To_v1beta1_HTTPIngressRuleValue(in *extensions.HTTPIngressRuleValue, out *HTTPIngressRuleValue, s conversion.Scope) error { + return autoconvert_extensions_HTTPIngressRuleValue_To_v1beta1_HTTPIngressRuleValue(in, out, s) } -func autoconvert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodAutoscaler(in *experimental.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error { +func autoconvert_extensions_HorizontalPodAutoscaler_To_v1beta1_HorizontalPodAutoscaler(in *extensions.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.HorizontalPodAutoscaler))(in) + defaulting.(func(*extensions.HorizontalPodAutoscaler))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2463,22 +2463,22 @@ func autoconvert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodA if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_extensions_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodAutoscaler(in *experimental.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error { - return autoconvert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodAutoscaler(in, out, s) +func convert_extensions_HorizontalPodAutoscaler_To_v1beta1_HorizontalPodAutoscaler(in *extensions.HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, s conversion.Scope) error { + return autoconvert_extensions_HorizontalPodAutoscaler_To_v1beta1_HorizontalPodAutoscaler(in, out, s) } -func autoconvert_experimental_HorizontalPodAutoscalerList_To_v1alpha1_HorizontalPodAutoscalerList(in *experimental.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error { +func autoconvert_extensions_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAutoscalerList(in *extensions.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.HorizontalPodAutoscalerList))(in) + defaulting.(func(*extensions.HorizontalPodAutoscalerList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2489,7 +2489,7 @@ func autoconvert_experimental_HorizontalPodAutoscalerList_To_v1alpha1_Horizontal if in.Items != nil { out.Items = make([]HorizontalPodAutoscaler, len(in.Items)) for i := range in.Items { - if err := convert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_HorizontalPodAutoscaler_To_v1beta1_HorizontalPodAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2499,17 +2499,17 @@ func autoconvert_experimental_HorizontalPodAutoscalerList_To_v1alpha1_Horizontal return nil } -func convert_experimental_HorizontalPodAutoscalerList_To_v1alpha1_HorizontalPodAutoscalerList(in *experimental.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error { - return autoconvert_experimental_HorizontalPodAutoscalerList_To_v1alpha1_HorizontalPodAutoscalerList(in, out, s) +func convert_extensions_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAutoscalerList(in *extensions.HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, s conversion.Scope) error { + return autoconvert_extensions_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAutoscalerList(in, out, s) } -func autoconvert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec(in *experimental.HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, s conversion.Scope) error { +func autoconvert_extensions_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec(in *extensions.HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.HorizontalPodAutoscalerSpec))(in) + defaulting.(func(*extensions.HorizontalPodAutoscalerSpec))(in) } if in.ScaleRef != nil { out.ScaleRef = new(SubresourceReference) - if err := convert_experimental_SubresourceReference_To_v1alpha1_SubresourceReference(in.ScaleRef, out.ScaleRef, s); err != nil { + if err := convert_extensions_SubresourceReference_To_v1beta1_SubresourceReference(in.ScaleRef, out.ScaleRef, s); err != nil { return err } } else { @@ -2517,25 +2517,25 @@ func autoconvert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_Horizontal } out.MinReplicas = in.MinReplicas out.MaxReplicas = in.MaxReplicas - if err := convert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumption(&in.Target, &out.Target, s); err != nil { + if err := convert_extensions_ResourceConsumption_To_v1beta1_ResourceConsumption(&in.Target, &out.Target, s); err != nil { return err } return nil } -func convert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec(in *experimental.HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, s conversion.Scope) error { - return autoconvert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec(in, out, s) +func convert_extensions_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec(in *extensions.HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, s conversion.Scope) error { + return autoconvert_extensions_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec(in, out, s) } -func autoconvert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus(in *experimental.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { +func autoconvert_extensions_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(in *extensions.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.HorizontalPodAutoscalerStatus))(in) + defaulting.(func(*extensions.HorizontalPodAutoscalerStatus))(in) } out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas if in.CurrentConsumption != nil { out.CurrentConsumption = new(ResourceConsumption) - if err := convert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumption(in.CurrentConsumption, out.CurrentConsumption, s); err != nil { + if err := convert_extensions_ResourceConsumption_To_v1beta1_ResourceConsumption(in.CurrentConsumption, out.CurrentConsumption, s); err != nil { return err } } else { @@ -2551,13 +2551,13 @@ func autoconvert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_Horizont return nil } -func convert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus(in *experimental.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { - return autoconvert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus(in, out, s) +func convert_extensions_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(in *extensions.HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, s conversion.Scope) error { + return autoconvert_extensions_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus(in, out, s) } -func autoconvert_experimental_Ingress_To_v1alpha1_Ingress(in *experimental.Ingress, out *Ingress, s conversion.Scope) error { +func autoconvert_extensions_Ingress_To_v1beta1_Ingress(in *extensions.Ingress, out *Ingress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.Ingress))(in) + defaulting.(func(*extensions.Ingress))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2565,22 +2565,22 @@ func autoconvert_experimental_Ingress_To_v1alpha1_Ingress(in *experimental.Ingre if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_IngressSpec_To_v1alpha1_IngressSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_IngressSpec_To_v1beta1_IngressSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_experimental_IngressStatus_To_v1alpha1_IngressStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_extensions_IngressStatus_To_v1beta1_IngressStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_experimental_Ingress_To_v1alpha1_Ingress(in *experimental.Ingress, out *Ingress, s conversion.Scope) error { - return autoconvert_experimental_Ingress_To_v1alpha1_Ingress(in, out, s) +func convert_extensions_Ingress_To_v1beta1_Ingress(in *extensions.Ingress, out *Ingress, s conversion.Scope) error { + return autoconvert_extensions_Ingress_To_v1beta1_Ingress(in, out, s) } -func autoconvert_experimental_IngressBackend_To_v1alpha1_IngressBackend(in *experimental.IngressBackend, out *IngressBackend, s conversion.Scope) error { +func autoconvert_extensions_IngressBackend_To_v1beta1_IngressBackend(in *extensions.IngressBackend, out *IngressBackend, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.IngressBackend))(in) + defaulting.(func(*extensions.IngressBackend))(in) } out.ServiceName = in.ServiceName if err := s.Convert(&in.ServicePort, &out.ServicePort, 0); err != nil { @@ -2589,13 +2589,13 @@ func autoconvert_experimental_IngressBackend_To_v1alpha1_IngressBackend(in *expe return nil } -func convert_experimental_IngressBackend_To_v1alpha1_IngressBackend(in *experimental.IngressBackend, out *IngressBackend, s conversion.Scope) error { - return autoconvert_experimental_IngressBackend_To_v1alpha1_IngressBackend(in, out, s) +func convert_extensions_IngressBackend_To_v1beta1_IngressBackend(in *extensions.IngressBackend, out *IngressBackend, s conversion.Scope) error { + return autoconvert_extensions_IngressBackend_To_v1beta1_IngressBackend(in, out, s) } -func autoconvert_experimental_IngressList_To_v1alpha1_IngressList(in *experimental.IngressList, out *IngressList, s conversion.Scope) error { +func autoconvert_extensions_IngressList_To_v1beta1_IngressList(in *extensions.IngressList, out *IngressList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.IngressList))(in) + defaulting.(func(*extensions.IngressList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2606,7 +2606,7 @@ func autoconvert_experimental_IngressList_To_v1alpha1_IngressList(in *experiment if in.Items != nil { out.Items = make([]Ingress, len(in.Items)) for i := range in.Items { - if err := convert_experimental_Ingress_To_v1alpha1_Ingress(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_Ingress_To_v1beta1_Ingress(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2616,32 +2616,32 @@ func autoconvert_experimental_IngressList_To_v1alpha1_IngressList(in *experiment return nil } -func convert_experimental_IngressList_To_v1alpha1_IngressList(in *experimental.IngressList, out *IngressList, s conversion.Scope) error { - return autoconvert_experimental_IngressList_To_v1alpha1_IngressList(in, out, s) +func convert_extensions_IngressList_To_v1beta1_IngressList(in *extensions.IngressList, out *IngressList, s conversion.Scope) error { + return autoconvert_extensions_IngressList_To_v1beta1_IngressList(in, out, s) } -func autoconvert_experimental_IngressRule_To_v1alpha1_IngressRule(in *experimental.IngressRule, out *IngressRule, s conversion.Scope) error { +func autoconvert_extensions_IngressRule_To_v1beta1_IngressRule(in *extensions.IngressRule, out *IngressRule, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.IngressRule))(in) + defaulting.(func(*extensions.IngressRule))(in) } out.Host = in.Host - if err := convert_experimental_IngressRuleValue_To_v1alpha1_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, s); err != nil { + if err := convert_extensions_IngressRuleValue_To_v1beta1_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, s); err != nil { return err } return nil } -func convert_experimental_IngressRule_To_v1alpha1_IngressRule(in *experimental.IngressRule, out *IngressRule, s conversion.Scope) error { - return autoconvert_experimental_IngressRule_To_v1alpha1_IngressRule(in, out, s) +func convert_extensions_IngressRule_To_v1beta1_IngressRule(in *extensions.IngressRule, out *IngressRule, s conversion.Scope) error { + return autoconvert_extensions_IngressRule_To_v1beta1_IngressRule(in, out, s) } -func autoconvert_experimental_IngressRuleValue_To_v1alpha1_IngressRuleValue(in *experimental.IngressRuleValue, out *IngressRuleValue, s conversion.Scope) error { +func autoconvert_extensions_IngressRuleValue_To_v1beta1_IngressRuleValue(in *extensions.IngressRuleValue, out *IngressRuleValue, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.IngressRuleValue))(in) + defaulting.(func(*extensions.IngressRuleValue))(in) } if in.HTTP != nil { out.HTTP = new(HTTPIngressRuleValue) - if err := convert_experimental_HTTPIngressRuleValue_To_v1alpha1_HTTPIngressRuleValue(in.HTTP, out.HTTP, s); err != nil { + if err := convert_extensions_HTTPIngressRuleValue_To_v1beta1_HTTPIngressRuleValue(in.HTTP, out.HTTP, s); err != nil { return err } } else { @@ -2650,17 +2650,17 @@ func autoconvert_experimental_IngressRuleValue_To_v1alpha1_IngressRuleValue(in * return nil } -func convert_experimental_IngressRuleValue_To_v1alpha1_IngressRuleValue(in *experimental.IngressRuleValue, out *IngressRuleValue, s conversion.Scope) error { - return autoconvert_experimental_IngressRuleValue_To_v1alpha1_IngressRuleValue(in, out, s) +func convert_extensions_IngressRuleValue_To_v1beta1_IngressRuleValue(in *extensions.IngressRuleValue, out *IngressRuleValue, s conversion.Scope) error { + return autoconvert_extensions_IngressRuleValue_To_v1beta1_IngressRuleValue(in, out, s) } -func autoconvert_experimental_IngressSpec_To_v1alpha1_IngressSpec(in *experimental.IngressSpec, out *IngressSpec, s conversion.Scope) error { +func autoconvert_extensions_IngressSpec_To_v1beta1_IngressSpec(in *extensions.IngressSpec, out *IngressSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.IngressSpec))(in) + defaulting.(func(*extensions.IngressSpec))(in) } if in.Backend != nil { out.Backend = new(IngressBackend) - if err := convert_experimental_IngressBackend_To_v1alpha1_IngressBackend(in.Backend, out.Backend, s); err != nil { + if err := convert_extensions_IngressBackend_To_v1beta1_IngressBackend(in.Backend, out.Backend, s); err != nil { return err } } else { @@ -2669,7 +2669,7 @@ func autoconvert_experimental_IngressSpec_To_v1alpha1_IngressSpec(in *experiment if in.Rules != nil { out.Rules = make([]IngressRule, len(in.Rules)) for i := range in.Rules { - if err := convert_experimental_IngressRule_To_v1alpha1_IngressRule(&in.Rules[i], &out.Rules[i], s); err != nil { + if err := convert_extensions_IngressRule_To_v1beta1_IngressRule(&in.Rules[i], &out.Rules[i], s); err != nil { return err } } @@ -2679,13 +2679,13 @@ func autoconvert_experimental_IngressSpec_To_v1alpha1_IngressSpec(in *experiment return nil } -func convert_experimental_IngressSpec_To_v1alpha1_IngressSpec(in *experimental.IngressSpec, out *IngressSpec, s conversion.Scope) error { - return autoconvert_experimental_IngressSpec_To_v1alpha1_IngressSpec(in, out, s) +func convert_extensions_IngressSpec_To_v1beta1_IngressSpec(in *extensions.IngressSpec, out *IngressSpec, s conversion.Scope) error { + return autoconvert_extensions_IngressSpec_To_v1beta1_IngressSpec(in, out, s) } -func autoconvert_experimental_IngressStatus_To_v1alpha1_IngressStatus(in *experimental.IngressStatus, out *IngressStatus, s conversion.Scope) error { +func autoconvert_extensions_IngressStatus_To_v1beta1_IngressStatus(in *extensions.IngressStatus, out *IngressStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.IngressStatus))(in) + defaulting.(func(*extensions.IngressStatus))(in) } if err := convert_api_LoadBalancerStatus_To_v1_LoadBalancerStatus(&in.LoadBalancer, &out.LoadBalancer, s); err != nil { return err @@ -2693,13 +2693,13 @@ func autoconvert_experimental_IngressStatus_To_v1alpha1_IngressStatus(in *experi return nil } -func convert_experimental_IngressStatus_To_v1alpha1_IngressStatus(in *experimental.IngressStatus, out *IngressStatus, s conversion.Scope) error { - return autoconvert_experimental_IngressStatus_To_v1alpha1_IngressStatus(in, out, s) +func convert_extensions_IngressStatus_To_v1beta1_IngressStatus(in *extensions.IngressStatus, out *IngressStatus, s conversion.Scope) error { + return autoconvert_extensions_IngressStatus_To_v1beta1_IngressStatus(in, out, s) } -func autoconvert_experimental_Job_To_v1alpha1_Job(in *experimental.Job, out *Job, s conversion.Scope) error { +func autoconvert_extensions_Job_To_v1beta1_Job(in *extensions.Job, out *Job, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.Job))(in) + defaulting.(func(*extensions.Job))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2707,22 +2707,22 @@ func autoconvert_experimental_Job_To_v1alpha1_Job(in *experimental.Job, out *Job if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_JobSpec_To_v1alpha1_JobSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_JobSpec_To_v1beta1_JobSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_experimental_JobStatus_To_v1alpha1_JobStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_extensions_JobStatus_To_v1beta1_JobStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_experimental_Job_To_v1alpha1_Job(in *experimental.Job, out *Job, s conversion.Scope) error { - return autoconvert_experimental_Job_To_v1alpha1_Job(in, out, s) +func convert_extensions_Job_To_v1beta1_Job(in *extensions.Job, out *Job, s conversion.Scope) error { + return autoconvert_extensions_Job_To_v1beta1_Job(in, out, s) } -func autoconvert_experimental_JobCondition_To_v1alpha1_JobCondition(in *experimental.JobCondition, out *JobCondition, s conversion.Scope) error { +func autoconvert_extensions_JobCondition_To_v1beta1_JobCondition(in *extensions.JobCondition, out *JobCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.JobCondition))(in) + defaulting.(func(*extensions.JobCondition))(in) } out.Type = JobConditionType(in.Type) out.Status = v1.ConditionStatus(in.Status) @@ -2737,13 +2737,13 @@ func autoconvert_experimental_JobCondition_To_v1alpha1_JobCondition(in *experime return nil } -func convert_experimental_JobCondition_To_v1alpha1_JobCondition(in *experimental.JobCondition, out *JobCondition, s conversion.Scope) error { - return autoconvert_experimental_JobCondition_To_v1alpha1_JobCondition(in, out, s) +func convert_extensions_JobCondition_To_v1beta1_JobCondition(in *extensions.JobCondition, out *JobCondition, s conversion.Scope) error { + return autoconvert_extensions_JobCondition_To_v1beta1_JobCondition(in, out, s) } -func autoconvert_experimental_JobList_To_v1alpha1_JobList(in *experimental.JobList, out *JobList, s conversion.Scope) error { +func autoconvert_extensions_JobList_To_v1beta1_JobList(in *extensions.JobList, out *JobList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.JobList))(in) + defaulting.(func(*extensions.JobList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2754,7 +2754,7 @@ func autoconvert_experimental_JobList_To_v1alpha1_JobList(in *experimental.JobLi if in.Items != nil { out.Items = make([]Job, len(in.Items)) for i := range in.Items { - if err := convert_experimental_Job_To_v1alpha1_Job(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_Job_To_v1beta1_Job(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -2764,13 +2764,13 @@ func autoconvert_experimental_JobList_To_v1alpha1_JobList(in *experimental.JobLi return nil } -func convert_experimental_JobList_To_v1alpha1_JobList(in *experimental.JobList, out *JobList, s conversion.Scope) error { - return autoconvert_experimental_JobList_To_v1alpha1_JobList(in, out, s) +func convert_extensions_JobList_To_v1beta1_JobList(in *extensions.JobList, out *JobList, s conversion.Scope) error { + return autoconvert_extensions_JobList_To_v1beta1_JobList(in, out, s) } -func autoconvert_experimental_JobSpec_To_v1alpha1_JobSpec(in *experimental.JobSpec, out *JobSpec, s conversion.Scope) error { +func autoconvert_extensions_JobSpec_To_v1beta1_JobSpec(in *extensions.JobSpec, out *JobSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.JobSpec))(in) + defaulting.(func(*extensions.JobSpec))(in) } if in.Parallelism != nil { out.Parallelism = new(int) @@ -2803,18 +2803,18 @@ func autoconvert_experimental_JobSpec_To_v1alpha1_JobSpec(in *experimental.JobSp return nil } -func convert_experimental_JobSpec_To_v1alpha1_JobSpec(in *experimental.JobSpec, out *JobSpec, s conversion.Scope) error { - return autoconvert_experimental_JobSpec_To_v1alpha1_JobSpec(in, out, s) +func convert_extensions_JobSpec_To_v1beta1_JobSpec(in *extensions.JobSpec, out *JobSpec, s conversion.Scope) error { + return autoconvert_extensions_JobSpec_To_v1beta1_JobSpec(in, out, s) } -func autoconvert_experimental_JobStatus_To_v1alpha1_JobStatus(in *experimental.JobStatus, out *JobStatus, s conversion.Scope) error { +func autoconvert_extensions_JobStatus_To_v1beta1_JobStatus(in *extensions.JobStatus, out *JobStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.JobStatus))(in) + defaulting.(func(*extensions.JobStatus))(in) } if in.Conditions != nil { out.Conditions = make([]JobCondition, len(in.Conditions)) for i := range in.Conditions { - if err := convert_experimental_JobCondition_To_v1alpha1_JobCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { + if err := convert_extensions_JobCondition_To_v1beta1_JobCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err } } @@ -2841,26 +2841,26 @@ func autoconvert_experimental_JobStatus_To_v1alpha1_JobStatus(in *experimental.J return nil } -func convert_experimental_JobStatus_To_v1alpha1_JobStatus(in *experimental.JobStatus, out *JobStatus, s conversion.Scope) error { - return autoconvert_experimental_JobStatus_To_v1alpha1_JobStatus(in, out, s) +func convert_extensions_JobStatus_To_v1beta1_JobStatus(in *extensions.JobStatus, out *JobStatus, s conversion.Scope) error { + return autoconvert_extensions_JobStatus_To_v1beta1_JobStatus(in, out, s) } -func autoconvert_experimental_NodeUtilization_To_v1alpha1_NodeUtilization(in *experimental.NodeUtilization, out *NodeUtilization, s conversion.Scope) error { +func autoconvert_extensions_NodeUtilization_To_v1beta1_NodeUtilization(in *extensions.NodeUtilization, out *NodeUtilization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.NodeUtilization))(in) + defaulting.(func(*extensions.NodeUtilization))(in) } out.Resource = NodeResource(in.Resource) out.Value = in.Value return nil } -func convert_experimental_NodeUtilization_To_v1alpha1_NodeUtilization(in *experimental.NodeUtilization, out *NodeUtilization, s conversion.Scope) error { - return autoconvert_experimental_NodeUtilization_To_v1alpha1_NodeUtilization(in, out, s) +func convert_extensions_NodeUtilization_To_v1beta1_NodeUtilization(in *extensions.NodeUtilization, out *NodeUtilization, s conversion.Scope) error { + return autoconvert_extensions_NodeUtilization_To_v1beta1_NodeUtilization(in, out, s) } -func autoconvert_experimental_ReplicationControllerDummy_To_v1alpha1_ReplicationControllerDummy(in *experimental.ReplicationControllerDummy, out *ReplicationControllerDummy, s conversion.Scope) error { +func autoconvert_extensions_ReplicationControllerDummy_To_v1beta1_ReplicationControllerDummy(in *extensions.ReplicationControllerDummy, out *ReplicationControllerDummy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ReplicationControllerDummy))(in) + defaulting.(func(*extensions.ReplicationControllerDummy))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2868,13 +2868,13 @@ func autoconvert_experimental_ReplicationControllerDummy_To_v1alpha1_Replication return nil } -func convert_experimental_ReplicationControllerDummy_To_v1alpha1_ReplicationControllerDummy(in *experimental.ReplicationControllerDummy, out *ReplicationControllerDummy, s conversion.Scope) error { - return autoconvert_experimental_ReplicationControllerDummy_To_v1alpha1_ReplicationControllerDummy(in, out, s) +func convert_extensions_ReplicationControllerDummy_To_v1beta1_ReplicationControllerDummy(in *extensions.ReplicationControllerDummy, out *ReplicationControllerDummy, s conversion.Scope) error { + return autoconvert_extensions_ReplicationControllerDummy_To_v1beta1_ReplicationControllerDummy(in, out, s) } -func autoconvert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumption(in *experimental.ResourceConsumption, out *ResourceConsumption, s conversion.Scope) error { +func autoconvert_extensions_ResourceConsumption_To_v1beta1_ResourceConsumption(in *extensions.ResourceConsumption, out *ResourceConsumption, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ResourceConsumption))(in) + defaulting.(func(*extensions.ResourceConsumption))(in) } out.Resource = v1.ResourceName(in.Resource) if err := s.Convert(&in.Quantity, &out.Quantity, 0); err != nil { @@ -2883,13 +2883,13 @@ func autoconvert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumptio return nil } -func convert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumption(in *experimental.ResourceConsumption, out *ResourceConsumption, s conversion.Scope) error { - return autoconvert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumption(in, out, s) +func convert_extensions_ResourceConsumption_To_v1beta1_ResourceConsumption(in *extensions.ResourceConsumption, out *ResourceConsumption, s conversion.Scope) error { + return autoconvert_extensions_ResourceConsumption_To_v1beta1_ResourceConsumption(in, out, s) } -func autoconvert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeployment(in *experimental.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error { +func autoconvert_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 err := s.Convert(&in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil { return err @@ -2901,9 +2901,9 @@ func autoconvert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateD return nil } -func autoconvert_experimental_Scale_To_v1alpha1_Scale(in *experimental.Scale, out *Scale, s conversion.Scope) error { +func autoconvert_extensions_Scale_To_v1beta1_Scale(in *extensions.Scale, out *Scale, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.Scale))(in) + defaulting.(func(*extensions.Scale))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2911,34 +2911,34 @@ func autoconvert_experimental_Scale_To_v1alpha1_Scale(in *experimental.Scale, ou if err := convert_api_ObjectMeta_To_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_experimental_ScaleSpec_To_v1alpha1_ScaleSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_experimental_ScaleStatus_To_v1alpha1_ScaleStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_experimental_Scale_To_v1alpha1_Scale(in *experimental.Scale, out *Scale, s conversion.Scope) error { - return autoconvert_experimental_Scale_To_v1alpha1_Scale(in, out, s) +func convert_extensions_Scale_To_v1beta1_Scale(in *extensions.Scale, out *Scale, s conversion.Scope) error { + return autoconvert_extensions_Scale_To_v1beta1_Scale(in, out, s) } -func autoconvert_experimental_ScaleSpec_To_v1alpha1_ScaleSpec(in *experimental.ScaleSpec, out *ScaleSpec, s conversion.Scope) error { +func autoconvert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in *extensions.ScaleSpec, out *ScaleSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ScaleSpec))(in) + defaulting.(func(*extensions.ScaleSpec))(in) } out.Replicas = in.Replicas return nil } -func convert_experimental_ScaleSpec_To_v1alpha1_ScaleSpec(in *experimental.ScaleSpec, out *ScaleSpec, s conversion.Scope) error { - return autoconvert_experimental_ScaleSpec_To_v1alpha1_ScaleSpec(in, out, s) +func convert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in *extensions.ScaleSpec, out *ScaleSpec, s conversion.Scope) error { + return autoconvert_extensions_ScaleSpec_To_v1beta1_ScaleSpec(in, out, s) } -func autoconvert_experimental_ScaleStatus_To_v1alpha1_ScaleStatus(in *experimental.ScaleStatus, out *ScaleStatus, s conversion.Scope) error { +func autoconvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ScaleStatus))(in) + defaulting.(func(*extensions.ScaleStatus))(in) } out.Replicas = in.Replicas if in.Selector != nil { @@ -2952,13 +2952,13 @@ func autoconvert_experimental_ScaleStatus_To_v1alpha1_ScaleStatus(in *experiment return nil } -func convert_experimental_ScaleStatus_To_v1alpha1_ScaleStatus(in *experimental.ScaleStatus, out *ScaleStatus, s conversion.Scope) error { - return autoconvert_experimental_ScaleStatus_To_v1alpha1_ScaleStatus(in, out, s) +func convert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in *extensions.ScaleStatus, out *ScaleStatus, s conversion.Scope) error { + return autoconvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus(in, out, s) } -func autoconvert_experimental_SubresourceReference_To_v1alpha1_SubresourceReference(in *experimental.SubresourceReference, out *SubresourceReference, s conversion.Scope) error { +func autoconvert_extensions_SubresourceReference_To_v1beta1_SubresourceReference(in *extensions.SubresourceReference, out *SubresourceReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.SubresourceReference))(in) + defaulting.(func(*extensions.SubresourceReference))(in) } out.Kind = in.Kind out.Namespace = in.Namespace @@ -2968,13 +2968,13 @@ func autoconvert_experimental_SubresourceReference_To_v1alpha1_SubresourceRefere return nil } -func convert_experimental_SubresourceReference_To_v1alpha1_SubresourceReference(in *experimental.SubresourceReference, out *SubresourceReference, s conversion.Scope) error { - return autoconvert_experimental_SubresourceReference_To_v1alpha1_SubresourceReference(in, out, s) +func convert_extensions_SubresourceReference_To_v1beta1_SubresourceReference(in *extensions.SubresourceReference, out *SubresourceReference, s conversion.Scope) error { + return autoconvert_extensions_SubresourceReference_To_v1beta1_SubresourceReference(in, out, s) } -func autoconvert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource(in *experimental.ThirdPartyResource, out *ThirdPartyResource, s conversion.Scope) error { +func autoconvert_extensions_ThirdPartyResource_To_v1beta1_ThirdPartyResource(in *extensions.ThirdPartyResource, out *ThirdPartyResource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ThirdPartyResource))(in) + defaulting.(func(*extensions.ThirdPartyResource))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -2986,7 +2986,7 @@ func autoconvert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource( if in.Versions != nil { out.Versions = make([]APIVersion, len(in.Versions)) for i := range in.Versions { - if err := convert_experimental_APIVersion_To_v1alpha1_APIVersion(&in.Versions[i], &out.Versions[i], s); err != nil { + if err := convert_extensions_APIVersion_To_v1beta1_APIVersion(&in.Versions[i], &out.Versions[i], s); err != nil { return err } } @@ -2996,13 +2996,13 @@ func autoconvert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource( return nil } -func convert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource(in *experimental.ThirdPartyResource, out *ThirdPartyResource, s conversion.Scope) error { - return autoconvert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource(in, out, s) +func convert_extensions_ThirdPartyResource_To_v1beta1_ThirdPartyResource(in *extensions.ThirdPartyResource, out *ThirdPartyResource, s conversion.Scope) error { + return autoconvert_extensions_ThirdPartyResource_To_v1beta1_ThirdPartyResource(in, out, s) } -func autoconvert_experimental_ThirdPartyResourceData_To_v1alpha1_ThirdPartyResourceData(in *experimental.ThirdPartyResourceData, out *ThirdPartyResourceData, s conversion.Scope) error { +func autoconvert_extensions_ThirdPartyResourceData_To_v1beta1_ThirdPartyResourceData(in *extensions.ThirdPartyResourceData, out *ThirdPartyResourceData, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ThirdPartyResourceData))(in) + defaulting.(func(*extensions.ThirdPartyResourceData))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3016,13 +3016,13 @@ func autoconvert_experimental_ThirdPartyResourceData_To_v1alpha1_ThirdPartyResou return nil } -func convert_experimental_ThirdPartyResourceData_To_v1alpha1_ThirdPartyResourceData(in *experimental.ThirdPartyResourceData, out *ThirdPartyResourceData, s conversion.Scope) error { - return autoconvert_experimental_ThirdPartyResourceData_To_v1alpha1_ThirdPartyResourceData(in, out, s) +func convert_extensions_ThirdPartyResourceData_To_v1beta1_ThirdPartyResourceData(in *extensions.ThirdPartyResourceData, out *ThirdPartyResourceData, s conversion.Scope) error { + return autoconvert_extensions_ThirdPartyResourceData_To_v1beta1_ThirdPartyResourceData(in, out, s) } -func autoconvert_experimental_ThirdPartyResourceDataList_To_v1alpha1_ThirdPartyResourceDataList(in *experimental.ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, s conversion.Scope) error { +func autoconvert_extensions_ThirdPartyResourceDataList_To_v1beta1_ThirdPartyResourceDataList(in *extensions.ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ThirdPartyResourceDataList))(in) + defaulting.(func(*extensions.ThirdPartyResourceDataList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3033,7 +3033,7 @@ func autoconvert_experimental_ThirdPartyResourceDataList_To_v1alpha1_ThirdPartyR if in.Items != nil { out.Items = make([]ThirdPartyResourceData, len(in.Items)) for i := range in.Items { - if err := convert_experimental_ThirdPartyResourceData_To_v1alpha1_ThirdPartyResourceData(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_ThirdPartyResourceData_To_v1beta1_ThirdPartyResourceData(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3043,13 +3043,13 @@ func autoconvert_experimental_ThirdPartyResourceDataList_To_v1alpha1_ThirdPartyR return nil } -func convert_experimental_ThirdPartyResourceDataList_To_v1alpha1_ThirdPartyResourceDataList(in *experimental.ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, s conversion.Scope) error { - return autoconvert_experimental_ThirdPartyResourceDataList_To_v1alpha1_ThirdPartyResourceDataList(in, out, s) +func convert_extensions_ThirdPartyResourceDataList_To_v1beta1_ThirdPartyResourceDataList(in *extensions.ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, s conversion.Scope) error { + return autoconvert_extensions_ThirdPartyResourceDataList_To_v1beta1_ThirdPartyResourceDataList(in, out, s) } -func autoconvert_experimental_ThirdPartyResourceList_To_v1alpha1_ThirdPartyResourceList(in *experimental.ThirdPartyResourceList, out *ThirdPartyResourceList, s conversion.Scope) error { +func autoconvert_extensions_ThirdPartyResourceList_To_v1beta1_ThirdPartyResourceList(in *extensions.ThirdPartyResourceList, out *ThirdPartyResourceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { - defaulting.(func(*experimental.ThirdPartyResourceList))(in) + defaulting.(func(*extensions.ThirdPartyResourceList))(in) } if err := s.Convert(&in.TypeMeta, &out.TypeMeta, 0); err != nil { return err @@ -3060,7 +3060,7 @@ func autoconvert_experimental_ThirdPartyResourceList_To_v1alpha1_ThirdPartyResou if in.Items != nil { out.Items = make([]ThirdPartyResource, len(in.Items)) for i := range in.Items { - if err := convert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_extensions_ThirdPartyResource_To_v1beta1_ThirdPartyResource(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3070,11 +3070,11 @@ func autoconvert_experimental_ThirdPartyResourceList_To_v1alpha1_ThirdPartyResou return nil } -func convert_experimental_ThirdPartyResourceList_To_v1alpha1_ThirdPartyResourceList(in *experimental.ThirdPartyResourceList, out *ThirdPartyResourceList, s conversion.Scope) error { - return autoconvert_experimental_ThirdPartyResourceList_To_v1alpha1_ThirdPartyResourceList(in, out, s) +func convert_extensions_ThirdPartyResourceList_To_v1beta1_ThirdPartyResourceList(in *extensions.ThirdPartyResourceList, out *ThirdPartyResourceList, s conversion.Scope) error { + return autoconvert_extensions_ThirdPartyResourceList_To_v1beta1_ThirdPartyResourceList(in, out, s) } -func autoconvert_v1alpha1_APIVersion_To_experimental_APIVersion(in *APIVersion, out *experimental.APIVersion, s conversion.Scope) error { +func autoconvert_v1beta1_APIVersion_To_extensions_APIVersion(in *APIVersion, out *extensions.APIVersion, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*APIVersion))(in) } @@ -3083,11 +3083,11 @@ func autoconvert_v1alpha1_APIVersion_To_experimental_APIVersion(in *APIVersion, return nil } -func convert_v1alpha1_APIVersion_To_experimental_APIVersion(in *APIVersion, out *experimental.APIVersion, s conversion.Scope) error { - return autoconvert_v1alpha1_APIVersion_To_experimental_APIVersion(in, out, s) +func convert_v1beta1_APIVersion_To_extensions_APIVersion(in *APIVersion, out *extensions.APIVersion, s conversion.Scope) error { + return autoconvert_v1beta1_APIVersion_To_extensions_APIVersion(in, out, s) } -func autoconvert_v1alpha1_ClusterAutoscaler_To_experimental_ClusterAutoscaler(in *ClusterAutoscaler, out *experimental.ClusterAutoscaler, s conversion.Scope) error { +func autoconvert_v1beta1_ClusterAutoscaler_To_extensions_ClusterAutoscaler(in *ClusterAutoscaler, out *extensions.ClusterAutoscaler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ClusterAutoscaler))(in) } @@ -3097,17 +3097,17 @@ func autoconvert_v1alpha1_ClusterAutoscaler_To_experimental_ClusterAutoscaler(in if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_ClusterAutoscalerSpec_To_experimental_ClusterAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_ClusterAutoscalerSpec_To_extensions_ClusterAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { return err } return nil } -func convert_v1alpha1_ClusterAutoscaler_To_experimental_ClusterAutoscaler(in *ClusterAutoscaler, out *experimental.ClusterAutoscaler, s conversion.Scope) error { - return autoconvert_v1alpha1_ClusterAutoscaler_To_experimental_ClusterAutoscaler(in, out, s) +func convert_v1beta1_ClusterAutoscaler_To_extensions_ClusterAutoscaler(in *ClusterAutoscaler, out *extensions.ClusterAutoscaler, s conversion.Scope) error { + return autoconvert_v1beta1_ClusterAutoscaler_To_extensions_ClusterAutoscaler(in, out, s) } -func autoconvert_v1alpha1_ClusterAutoscalerList_To_experimental_ClusterAutoscalerList(in *ClusterAutoscalerList, out *experimental.ClusterAutoscalerList, s conversion.Scope) error { +func autoconvert_v1beta1_ClusterAutoscalerList_To_extensions_ClusterAutoscalerList(in *ClusterAutoscalerList, out *extensions.ClusterAutoscalerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ClusterAutoscalerList))(in) } @@ -3118,9 +3118,9 @@ func autoconvert_v1alpha1_ClusterAutoscalerList_To_experimental_ClusterAutoscale return err } if in.Items != nil { - out.Items = make([]experimental.ClusterAutoscaler, len(in.Items)) + out.Items = make([]extensions.ClusterAutoscaler, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_ClusterAutoscaler_To_experimental_ClusterAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_ClusterAutoscaler_To_extensions_ClusterAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3130,20 +3130,20 @@ func autoconvert_v1alpha1_ClusterAutoscalerList_To_experimental_ClusterAutoscale return nil } -func convert_v1alpha1_ClusterAutoscalerList_To_experimental_ClusterAutoscalerList(in *ClusterAutoscalerList, out *experimental.ClusterAutoscalerList, s conversion.Scope) error { - return autoconvert_v1alpha1_ClusterAutoscalerList_To_experimental_ClusterAutoscalerList(in, out, s) +func convert_v1beta1_ClusterAutoscalerList_To_extensions_ClusterAutoscalerList(in *ClusterAutoscalerList, out *extensions.ClusterAutoscalerList, s conversion.Scope) error { + return autoconvert_v1beta1_ClusterAutoscalerList_To_extensions_ClusterAutoscalerList(in, out, s) } -func autoconvert_v1alpha1_ClusterAutoscalerSpec_To_experimental_ClusterAutoscalerSpec(in *ClusterAutoscalerSpec, out *experimental.ClusterAutoscalerSpec, s conversion.Scope) error { +func autoconvert_v1beta1_ClusterAutoscalerSpec_To_extensions_ClusterAutoscalerSpec(in *ClusterAutoscalerSpec, out *extensions.ClusterAutoscalerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ClusterAutoscalerSpec))(in) } out.MinNodes = in.MinNodes out.MaxNodes = in.MaxNodes if in.TargetUtilization != nil { - out.TargetUtilization = make([]experimental.NodeUtilization, len(in.TargetUtilization)) + out.TargetUtilization = make([]extensions.NodeUtilization, len(in.TargetUtilization)) for i := range in.TargetUtilization { - if err := convert_v1alpha1_NodeUtilization_To_experimental_NodeUtilization(&in.TargetUtilization[i], &out.TargetUtilization[i], s); err != nil { + if err := convert_v1beta1_NodeUtilization_To_extensions_NodeUtilization(&in.TargetUtilization[i], &out.TargetUtilization[i], s); err != nil { return err } } @@ -3153,11 +3153,11 @@ func autoconvert_v1alpha1_ClusterAutoscalerSpec_To_experimental_ClusterAutoscale return nil } -func convert_v1alpha1_ClusterAutoscalerSpec_To_experimental_ClusterAutoscalerSpec(in *ClusterAutoscalerSpec, out *experimental.ClusterAutoscalerSpec, s conversion.Scope) error { - return autoconvert_v1alpha1_ClusterAutoscalerSpec_To_experimental_ClusterAutoscalerSpec(in, out, s) +func convert_v1beta1_ClusterAutoscalerSpec_To_extensions_ClusterAutoscalerSpec(in *ClusterAutoscalerSpec, out *extensions.ClusterAutoscalerSpec, s conversion.Scope) error { + return autoconvert_v1beta1_ClusterAutoscalerSpec_To_extensions_ClusterAutoscalerSpec(in, out, s) } -func autoconvert_v1alpha1_DaemonSet_To_experimental_DaemonSet(in *DaemonSet, out *experimental.DaemonSet, s conversion.Scope) error { +func autoconvert_v1beta1_DaemonSet_To_extensions_DaemonSet(in *DaemonSet, out *extensions.DaemonSet, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DaemonSet))(in) } @@ -3167,20 +3167,20 @@ func autoconvert_v1alpha1_DaemonSet_To_experimental_DaemonSet(in *DaemonSet, out if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_DaemonSetSpec_To_experimental_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1alpha1_DaemonSetStatus_To_experimental_DaemonSetStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_v1beta1_DaemonSetStatus_To_extensions_DaemonSetStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1alpha1_DaemonSet_To_experimental_DaemonSet(in *DaemonSet, out *experimental.DaemonSet, s conversion.Scope) error { - return autoconvert_v1alpha1_DaemonSet_To_experimental_DaemonSet(in, out, s) +func convert_v1beta1_DaemonSet_To_extensions_DaemonSet(in *DaemonSet, out *extensions.DaemonSet, s conversion.Scope) error { + return autoconvert_v1beta1_DaemonSet_To_extensions_DaemonSet(in, out, s) } -func autoconvert_v1alpha1_DaemonSetList_To_experimental_DaemonSetList(in *DaemonSetList, out *experimental.DaemonSetList, s conversion.Scope) error { +func autoconvert_v1beta1_DaemonSetList_To_extensions_DaemonSetList(in *DaemonSetList, out *extensions.DaemonSetList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DaemonSetList))(in) } @@ -3191,9 +3191,9 @@ func autoconvert_v1alpha1_DaemonSetList_To_experimental_DaemonSetList(in *Daemon return err } if in.Items != nil { - out.Items = make([]experimental.DaemonSet, len(in.Items)) + out.Items = make([]extensions.DaemonSet, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_DaemonSet_To_experimental_DaemonSet(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_DaemonSet_To_extensions_DaemonSet(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3203,11 +3203,11 @@ func autoconvert_v1alpha1_DaemonSetList_To_experimental_DaemonSetList(in *Daemon return nil } -func convert_v1alpha1_DaemonSetList_To_experimental_DaemonSetList(in *DaemonSetList, out *experimental.DaemonSetList, s conversion.Scope) error { - return autoconvert_v1alpha1_DaemonSetList_To_experimental_DaemonSetList(in, out, s) +func convert_v1beta1_DaemonSetList_To_extensions_DaemonSetList(in *DaemonSetList, out *extensions.DaemonSetList, s conversion.Scope) error { + return autoconvert_v1beta1_DaemonSetList_To_extensions_DaemonSetList(in, out, s) } -func autoconvert_v1alpha1_DaemonSetSpec_To_experimental_DaemonSetSpec(in *DaemonSetSpec, out *experimental.DaemonSetSpec, s conversion.Scope) error { +func autoconvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DaemonSetSpec))(in) } @@ -3230,11 +3230,11 @@ func autoconvert_v1alpha1_DaemonSetSpec_To_experimental_DaemonSetSpec(in *Daemon return nil } -func convert_v1alpha1_DaemonSetSpec_To_experimental_DaemonSetSpec(in *DaemonSetSpec, out *experimental.DaemonSetSpec, s conversion.Scope) error { - return autoconvert_v1alpha1_DaemonSetSpec_To_experimental_DaemonSetSpec(in, out, s) +func convert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in *DaemonSetSpec, out *extensions.DaemonSetSpec, s conversion.Scope) error { + return autoconvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec(in, out, s) } -func autoconvert_v1alpha1_DaemonSetStatus_To_experimental_DaemonSetStatus(in *DaemonSetStatus, out *experimental.DaemonSetStatus, s conversion.Scope) error { +func autoconvert_v1beta1_DaemonSetStatus_To_extensions_DaemonSetStatus(in *DaemonSetStatus, out *extensions.DaemonSetStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DaemonSetStatus))(in) } @@ -3244,11 +3244,11 @@ func autoconvert_v1alpha1_DaemonSetStatus_To_experimental_DaemonSetStatus(in *Da return nil } -func convert_v1alpha1_DaemonSetStatus_To_experimental_DaemonSetStatus(in *DaemonSetStatus, out *experimental.DaemonSetStatus, s conversion.Scope) error { - return autoconvert_v1alpha1_DaemonSetStatus_To_experimental_DaemonSetStatus(in, out, s) +func convert_v1beta1_DaemonSetStatus_To_extensions_DaemonSetStatus(in *DaemonSetStatus, out *extensions.DaemonSetStatus, s conversion.Scope) error { + return autoconvert_v1beta1_DaemonSetStatus_To_extensions_DaemonSetStatus(in, out, s) } -func autoconvert_v1alpha1_Deployment_To_experimental_Deployment(in *Deployment, out *experimental.Deployment, s conversion.Scope) error { +func autoconvert_v1beta1_Deployment_To_extensions_Deployment(in *Deployment, out *extensions.Deployment, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Deployment))(in) } @@ -3258,20 +3258,20 @@ func autoconvert_v1alpha1_Deployment_To_experimental_Deployment(in *Deployment, if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1alpha1_DeploymentStatus_To_experimental_DeploymentStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_v1beta1_DeploymentStatus_To_extensions_DeploymentStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1alpha1_Deployment_To_experimental_Deployment(in *Deployment, out *experimental.Deployment, s conversion.Scope) error { - return autoconvert_v1alpha1_Deployment_To_experimental_Deployment(in, out, s) +func convert_v1beta1_Deployment_To_extensions_Deployment(in *Deployment, out *extensions.Deployment, s conversion.Scope) error { + return autoconvert_v1beta1_Deployment_To_extensions_Deployment(in, out, s) } -func autoconvert_v1alpha1_DeploymentList_To_experimental_DeploymentList(in *DeploymentList, out *experimental.DeploymentList, s conversion.Scope) error { +func autoconvert_v1beta1_DeploymentList_To_extensions_DeploymentList(in *DeploymentList, out *extensions.DeploymentList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DeploymentList))(in) } @@ -3282,9 +3282,9 @@ func autoconvert_v1alpha1_DeploymentList_To_experimental_DeploymentList(in *Depl return err } if in.Items != nil { - out.Items = make([]experimental.Deployment, len(in.Items)) + out.Items = make([]extensions.Deployment, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_Deployment_To_experimental_Deployment(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_Deployment_To_extensions_Deployment(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3294,11 +3294,11 @@ func autoconvert_v1alpha1_DeploymentList_To_experimental_DeploymentList(in *Depl return nil } -func convert_v1alpha1_DeploymentList_To_experimental_DeploymentList(in *DeploymentList, out *experimental.DeploymentList, s conversion.Scope) error { - return autoconvert_v1alpha1_DeploymentList_To_experimental_DeploymentList(in, out, s) +func convert_v1beta1_DeploymentList_To_extensions_DeploymentList(in *DeploymentList, out *extensions.DeploymentList, s conversion.Scope) error { + return autoconvert_v1beta1_DeploymentList_To_extensions_DeploymentList(in, out, s) } -func autoconvert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *DeploymentSpec, out *experimental.DeploymentSpec, s conversion.Scope) error { +func autoconvert_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) } @@ -3319,14 +3319,14 @@ func autoconvert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec(in *Depl } 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 } // in.UniqueLabelKey has no peer in out return nil } -func autoconvert_v1alpha1_DeploymentStatus_To_experimental_DeploymentStatus(in *DeploymentStatus, out *experimental.DeploymentStatus, s conversion.Scope) error { +func autoconvert_v1beta1_DeploymentStatus_To_extensions_DeploymentStatus(in *DeploymentStatus, out *extensions.DeploymentStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*DeploymentStatus))(in) } @@ -3335,33 +3335,33 @@ func autoconvert_v1alpha1_DeploymentStatus_To_experimental_DeploymentStatus(in * return nil } -func convert_v1alpha1_DeploymentStatus_To_experimental_DeploymentStatus(in *DeploymentStatus, out *experimental.DeploymentStatus, s conversion.Scope) error { - return autoconvert_v1alpha1_DeploymentStatus_To_experimental_DeploymentStatus(in, out, s) +func convert_v1beta1_DeploymentStatus_To_extensions_DeploymentStatus(in *DeploymentStatus, out *extensions.DeploymentStatus, s conversion.Scope) error { + return autoconvert_v1beta1_DeploymentStatus_To_extensions_DeploymentStatus(in, out, s) } -func autoconvert_v1alpha1_HTTPIngressPath_To_experimental_HTTPIngressPath(in *HTTPIngressPath, out *experimental.HTTPIngressPath, s conversion.Scope) error { +func autoconvert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath(in *HTTPIngressPath, out *extensions.HTTPIngressPath, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HTTPIngressPath))(in) } out.Path = in.Path - if err := convert_v1alpha1_IngressBackend_To_experimental_IngressBackend(&in.Backend, &out.Backend, s); err != nil { + if err := convert_v1beta1_IngressBackend_To_extensions_IngressBackend(&in.Backend, &out.Backend, s); err != nil { return err } return nil } -func convert_v1alpha1_HTTPIngressPath_To_experimental_HTTPIngressPath(in *HTTPIngressPath, out *experimental.HTTPIngressPath, s conversion.Scope) error { - return autoconvert_v1alpha1_HTTPIngressPath_To_experimental_HTTPIngressPath(in, out, s) +func convert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath(in *HTTPIngressPath, out *extensions.HTTPIngressPath, s conversion.Scope) error { + return autoconvert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath(in, out, s) } -func autoconvert_v1alpha1_HTTPIngressRuleValue_To_experimental_HTTPIngressRuleValue(in *HTTPIngressRuleValue, out *experimental.HTTPIngressRuleValue, s conversion.Scope) error { +func autoconvert_v1beta1_HTTPIngressRuleValue_To_extensions_HTTPIngressRuleValue(in *HTTPIngressRuleValue, out *extensions.HTTPIngressRuleValue, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HTTPIngressRuleValue))(in) } if in.Paths != nil { - out.Paths = make([]experimental.HTTPIngressPath, len(in.Paths)) + out.Paths = make([]extensions.HTTPIngressPath, len(in.Paths)) for i := range in.Paths { - if err := convert_v1alpha1_HTTPIngressPath_To_experimental_HTTPIngressPath(&in.Paths[i], &out.Paths[i], s); err != nil { + if err := convert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath(&in.Paths[i], &out.Paths[i], s); err != nil { return err } } @@ -3371,11 +3371,11 @@ func autoconvert_v1alpha1_HTTPIngressRuleValue_To_experimental_HTTPIngressRuleVa return nil } -func convert_v1alpha1_HTTPIngressRuleValue_To_experimental_HTTPIngressRuleValue(in *HTTPIngressRuleValue, out *experimental.HTTPIngressRuleValue, s conversion.Scope) error { - return autoconvert_v1alpha1_HTTPIngressRuleValue_To_experimental_HTTPIngressRuleValue(in, out, s) +func convert_v1beta1_HTTPIngressRuleValue_To_extensions_HTTPIngressRuleValue(in *HTTPIngressRuleValue, out *extensions.HTTPIngressRuleValue, s conversion.Scope) error { + return autoconvert_v1beta1_HTTPIngressRuleValue_To_extensions_HTTPIngressRuleValue(in, out, s) } -func autoconvert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *experimental.HorizontalPodAutoscaler, s conversion.Scope) error { +func autoconvert_v1beta1_HorizontalPodAutoscaler_To_extensions_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *extensions.HorizontalPodAutoscaler, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HorizontalPodAutoscaler))(in) } @@ -3385,20 +3385,20 @@ func autoconvert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodA if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_HorizontalPodAutoscalerSpec_To_extensions_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_v1beta1_HorizontalPodAutoscalerStatus_To_extensions_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *experimental.HorizontalPodAutoscaler, s conversion.Scope) error { - return autoconvert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodAutoscaler(in, out, s) +func convert_v1beta1_HorizontalPodAutoscaler_To_extensions_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler, out *extensions.HorizontalPodAutoscaler, s conversion.Scope) error { + return autoconvert_v1beta1_HorizontalPodAutoscaler_To_extensions_HorizontalPodAutoscaler(in, out, s) } -func autoconvert_v1alpha1_HorizontalPodAutoscalerList_To_experimental_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *experimental.HorizontalPodAutoscalerList, s conversion.Scope) error { +func autoconvert_v1beta1_HorizontalPodAutoscalerList_To_extensions_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *extensions.HorizontalPodAutoscalerList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HorizontalPodAutoscalerList))(in) } @@ -3409,9 +3409,9 @@ func autoconvert_v1alpha1_HorizontalPodAutoscalerList_To_experimental_Horizontal return err } if in.Items != nil { - out.Items = make([]experimental.HorizontalPodAutoscaler, len(in.Items)) + out.Items = make([]extensions.HorizontalPodAutoscaler, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_HorizontalPodAutoscaler_To_extensions_HorizontalPodAutoscaler(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3421,17 +3421,17 @@ func autoconvert_v1alpha1_HorizontalPodAutoscalerList_To_experimental_Horizontal return nil } -func convert_v1alpha1_HorizontalPodAutoscalerList_To_experimental_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *experimental.HorizontalPodAutoscalerList, s conversion.Scope) error { - return autoconvert_v1alpha1_HorizontalPodAutoscalerList_To_experimental_HorizontalPodAutoscalerList(in, out, s) +func convert_v1beta1_HorizontalPodAutoscalerList_To_extensions_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList, out *extensions.HorizontalPodAutoscalerList, s conversion.Scope) error { + return autoconvert_v1beta1_HorizontalPodAutoscalerList_To_extensions_HorizontalPodAutoscalerList(in, out, s) } -func autoconvert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec(in *HorizontalPodAutoscalerSpec, out *experimental.HorizontalPodAutoscalerSpec, s conversion.Scope) error { +func autoconvert_v1beta1_HorizontalPodAutoscalerSpec_To_extensions_HorizontalPodAutoscalerSpec(in *HorizontalPodAutoscalerSpec, out *extensions.HorizontalPodAutoscalerSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HorizontalPodAutoscalerSpec))(in) } if in.ScaleRef != nil { - out.ScaleRef = new(experimental.SubresourceReference) - if err := convert_v1alpha1_SubresourceReference_To_experimental_SubresourceReference(in.ScaleRef, out.ScaleRef, s); err != nil { + out.ScaleRef = new(extensions.SubresourceReference) + if err := convert_v1beta1_SubresourceReference_To_extensions_SubresourceReference(in.ScaleRef, out.ScaleRef, s); err != nil { return err } } else { @@ -3439,25 +3439,25 @@ func autoconvert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_Horizontal } out.MinReplicas = in.MinReplicas out.MaxReplicas = in.MaxReplicas - if err := convert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumption(&in.Target, &out.Target, s); err != nil { + if err := convert_v1beta1_ResourceConsumption_To_extensions_ResourceConsumption(&in.Target, &out.Target, s); err != nil { return err } return nil } -func convert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec(in *HorizontalPodAutoscalerSpec, out *experimental.HorizontalPodAutoscalerSpec, s conversion.Scope) error { - return autoconvert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec(in, out, s) +func convert_v1beta1_HorizontalPodAutoscalerSpec_To_extensions_HorizontalPodAutoscalerSpec(in *HorizontalPodAutoscalerSpec, out *extensions.HorizontalPodAutoscalerSpec, s conversion.Scope) error { + return autoconvert_v1beta1_HorizontalPodAutoscalerSpec_To_extensions_HorizontalPodAutoscalerSpec(in, out, s) } -func autoconvert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *experimental.HorizontalPodAutoscalerStatus, s conversion.Scope) error { +func autoconvert_v1beta1_HorizontalPodAutoscalerStatus_To_extensions_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *extensions.HorizontalPodAutoscalerStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*HorizontalPodAutoscalerStatus))(in) } out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas if in.CurrentConsumption != nil { - out.CurrentConsumption = new(experimental.ResourceConsumption) - if err := convert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumption(in.CurrentConsumption, out.CurrentConsumption, s); err != nil { + out.CurrentConsumption = new(extensions.ResourceConsumption) + if err := convert_v1beta1_ResourceConsumption_To_extensions_ResourceConsumption(in.CurrentConsumption, out.CurrentConsumption, s); err != nil { return err } } else { @@ -3473,11 +3473,11 @@ func autoconvert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_Horizont return nil } -func convert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *experimental.HorizontalPodAutoscalerStatus, s conversion.Scope) error { - return autoconvert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus(in, out, s) +func convert_v1beta1_HorizontalPodAutoscalerStatus_To_extensions_HorizontalPodAutoscalerStatus(in *HorizontalPodAutoscalerStatus, out *extensions.HorizontalPodAutoscalerStatus, s conversion.Scope) error { + return autoconvert_v1beta1_HorizontalPodAutoscalerStatus_To_extensions_HorizontalPodAutoscalerStatus(in, out, s) } -func autoconvert_v1alpha1_Ingress_To_experimental_Ingress(in *Ingress, out *experimental.Ingress, s conversion.Scope) error { +func autoconvert_v1beta1_Ingress_To_extensions_Ingress(in *Ingress, out *extensions.Ingress, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Ingress))(in) } @@ -3487,20 +3487,20 @@ func autoconvert_v1alpha1_Ingress_To_experimental_Ingress(in *Ingress, out *expe if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_IngressSpec_To_experimental_IngressSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_IngressSpec_To_extensions_IngressSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1alpha1_IngressStatus_To_experimental_IngressStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_v1beta1_IngressStatus_To_extensions_IngressStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1alpha1_Ingress_To_experimental_Ingress(in *Ingress, out *experimental.Ingress, s conversion.Scope) error { - return autoconvert_v1alpha1_Ingress_To_experimental_Ingress(in, out, s) +func convert_v1beta1_Ingress_To_extensions_Ingress(in *Ingress, out *extensions.Ingress, s conversion.Scope) error { + return autoconvert_v1beta1_Ingress_To_extensions_Ingress(in, out, s) } -func autoconvert_v1alpha1_IngressBackend_To_experimental_IngressBackend(in *IngressBackend, out *experimental.IngressBackend, s conversion.Scope) error { +func autoconvert_v1beta1_IngressBackend_To_extensions_IngressBackend(in *IngressBackend, out *extensions.IngressBackend, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*IngressBackend))(in) } @@ -3511,11 +3511,11 @@ func autoconvert_v1alpha1_IngressBackend_To_experimental_IngressBackend(in *Ingr return nil } -func convert_v1alpha1_IngressBackend_To_experimental_IngressBackend(in *IngressBackend, out *experimental.IngressBackend, s conversion.Scope) error { - return autoconvert_v1alpha1_IngressBackend_To_experimental_IngressBackend(in, out, s) +func convert_v1beta1_IngressBackend_To_extensions_IngressBackend(in *IngressBackend, out *extensions.IngressBackend, s conversion.Scope) error { + return autoconvert_v1beta1_IngressBackend_To_extensions_IngressBackend(in, out, s) } -func autoconvert_v1alpha1_IngressList_To_experimental_IngressList(in *IngressList, out *experimental.IngressList, s conversion.Scope) error { +func autoconvert_v1beta1_IngressList_To_extensions_IngressList(in *IngressList, out *extensions.IngressList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*IngressList))(in) } @@ -3526,9 +3526,9 @@ func autoconvert_v1alpha1_IngressList_To_experimental_IngressList(in *IngressLis return err } if in.Items != nil { - out.Items = make([]experimental.Ingress, len(in.Items)) + out.Items = make([]extensions.Ingress, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_Ingress_To_experimental_Ingress(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_Ingress_To_extensions_Ingress(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3538,32 +3538,32 @@ func autoconvert_v1alpha1_IngressList_To_experimental_IngressList(in *IngressLis return nil } -func convert_v1alpha1_IngressList_To_experimental_IngressList(in *IngressList, out *experimental.IngressList, s conversion.Scope) error { - return autoconvert_v1alpha1_IngressList_To_experimental_IngressList(in, out, s) +func convert_v1beta1_IngressList_To_extensions_IngressList(in *IngressList, out *extensions.IngressList, s conversion.Scope) error { + return autoconvert_v1beta1_IngressList_To_extensions_IngressList(in, out, s) } -func autoconvert_v1alpha1_IngressRule_To_experimental_IngressRule(in *IngressRule, out *experimental.IngressRule, s conversion.Scope) error { +func autoconvert_v1beta1_IngressRule_To_extensions_IngressRule(in *IngressRule, out *extensions.IngressRule, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*IngressRule))(in) } out.Host = in.Host - if err := convert_v1alpha1_IngressRuleValue_To_experimental_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, s); err != nil { + if err := convert_v1beta1_IngressRuleValue_To_extensions_IngressRuleValue(&in.IngressRuleValue, &out.IngressRuleValue, s); err != nil { return err } return nil } -func convert_v1alpha1_IngressRule_To_experimental_IngressRule(in *IngressRule, out *experimental.IngressRule, s conversion.Scope) error { - return autoconvert_v1alpha1_IngressRule_To_experimental_IngressRule(in, out, s) +func convert_v1beta1_IngressRule_To_extensions_IngressRule(in *IngressRule, out *extensions.IngressRule, s conversion.Scope) error { + return autoconvert_v1beta1_IngressRule_To_extensions_IngressRule(in, out, s) } -func autoconvert_v1alpha1_IngressRuleValue_To_experimental_IngressRuleValue(in *IngressRuleValue, out *experimental.IngressRuleValue, s conversion.Scope) error { +func autoconvert_v1beta1_IngressRuleValue_To_extensions_IngressRuleValue(in *IngressRuleValue, out *extensions.IngressRuleValue, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*IngressRuleValue))(in) } if in.HTTP != nil { - out.HTTP = new(experimental.HTTPIngressRuleValue) - if err := convert_v1alpha1_HTTPIngressRuleValue_To_experimental_HTTPIngressRuleValue(in.HTTP, out.HTTP, s); err != nil { + out.HTTP = new(extensions.HTTPIngressRuleValue) + if err := convert_v1beta1_HTTPIngressRuleValue_To_extensions_HTTPIngressRuleValue(in.HTTP, out.HTTP, s); err != nil { return err } } else { @@ -3572,26 +3572,26 @@ func autoconvert_v1alpha1_IngressRuleValue_To_experimental_IngressRuleValue(in * return nil } -func convert_v1alpha1_IngressRuleValue_To_experimental_IngressRuleValue(in *IngressRuleValue, out *experimental.IngressRuleValue, s conversion.Scope) error { - return autoconvert_v1alpha1_IngressRuleValue_To_experimental_IngressRuleValue(in, out, s) +func convert_v1beta1_IngressRuleValue_To_extensions_IngressRuleValue(in *IngressRuleValue, out *extensions.IngressRuleValue, s conversion.Scope) error { + return autoconvert_v1beta1_IngressRuleValue_To_extensions_IngressRuleValue(in, out, s) } -func autoconvert_v1alpha1_IngressSpec_To_experimental_IngressSpec(in *IngressSpec, out *experimental.IngressSpec, s conversion.Scope) error { +func autoconvert_v1beta1_IngressSpec_To_extensions_IngressSpec(in *IngressSpec, out *extensions.IngressSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*IngressSpec))(in) } if in.Backend != nil { - out.Backend = new(experimental.IngressBackend) - if err := convert_v1alpha1_IngressBackend_To_experimental_IngressBackend(in.Backend, out.Backend, s); err != nil { + out.Backend = new(extensions.IngressBackend) + if err := convert_v1beta1_IngressBackend_To_extensions_IngressBackend(in.Backend, out.Backend, s); err != nil { return err } } else { out.Backend = nil } if in.Rules != nil { - out.Rules = make([]experimental.IngressRule, len(in.Rules)) + out.Rules = make([]extensions.IngressRule, len(in.Rules)) for i := range in.Rules { - if err := convert_v1alpha1_IngressRule_To_experimental_IngressRule(&in.Rules[i], &out.Rules[i], s); err != nil { + if err := convert_v1beta1_IngressRule_To_extensions_IngressRule(&in.Rules[i], &out.Rules[i], s); err != nil { return err } } @@ -3601,11 +3601,11 @@ func autoconvert_v1alpha1_IngressSpec_To_experimental_IngressSpec(in *IngressSpe return nil } -func convert_v1alpha1_IngressSpec_To_experimental_IngressSpec(in *IngressSpec, out *experimental.IngressSpec, s conversion.Scope) error { - return autoconvert_v1alpha1_IngressSpec_To_experimental_IngressSpec(in, out, s) +func convert_v1beta1_IngressSpec_To_extensions_IngressSpec(in *IngressSpec, out *extensions.IngressSpec, s conversion.Scope) error { + return autoconvert_v1beta1_IngressSpec_To_extensions_IngressSpec(in, out, s) } -func autoconvert_v1alpha1_IngressStatus_To_experimental_IngressStatus(in *IngressStatus, out *experimental.IngressStatus, s conversion.Scope) error { +func autoconvert_v1beta1_IngressStatus_To_extensions_IngressStatus(in *IngressStatus, out *extensions.IngressStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*IngressStatus))(in) } @@ -3615,11 +3615,11 @@ func autoconvert_v1alpha1_IngressStatus_To_experimental_IngressStatus(in *Ingres return nil } -func convert_v1alpha1_IngressStatus_To_experimental_IngressStatus(in *IngressStatus, out *experimental.IngressStatus, s conversion.Scope) error { - return autoconvert_v1alpha1_IngressStatus_To_experimental_IngressStatus(in, out, s) +func convert_v1beta1_IngressStatus_To_extensions_IngressStatus(in *IngressStatus, out *extensions.IngressStatus, s conversion.Scope) error { + return autoconvert_v1beta1_IngressStatus_To_extensions_IngressStatus(in, out, s) } -func autoconvert_v1alpha1_Job_To_experimental_Job(in *Job, out *experimental.Job, s conversion.Scope) error { +func autoconvert_v1beta1_Job_To_extensions_Job(in *Job, out *extensions.Job, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Job))(in) } @@ -3629,24 +3629,24 @@ func autoconvert_v1alpha1_Job_To_experimental_Job(in *Job, out *experimental.Job if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_JobSpec_To_experimental_JobSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_JobSpec_To_extensions_JobSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1alpha1_JobStatus_To_experimental_JobStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_v1beta1_JobStatus_To_extensions_JobStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1alpha1_Job_To_experimental_Job(in *Job, out *experimental.Job, s conversion.Scope) error { - return autoconvert_v1alpha1_Job_To_experimental_Job(in, out, s) +func convert_v1beta1_Job_To_extensions_Job(in *Job, out *extensions.Job, s conversion.Scope) error { + return autoconvert_v1beta1_Job_To_extensions_Job(in, out, s) } -func autoconvert_v1alpha1_JobCondition_To_experimental_JobCondition(in *JobCondition, out *experimental.JobCondition, s conversion.Scope) error { +func autoconvert_v1beta1_JobCondition_To_extensions_JobCondition(in *JobCondition, out *extensions.JobCondition, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*JobCondition))(in) } - out.Type = experimental.JobConditionType(in.Type) + out.Type = extensions.JobConditionType(in.Type) out.Status = api.ConditionStatus(in.Status) if err := s.Convert(&in.LastProbeTime, &out.LastProbeTime, 0); err != nil { return err @@ -3659,11 +3659,11 @@ func autoconvert_v1alpha1_JobCondition_To_experimental_JobCondition(in *JobCondi return nil } -func convert_v1alpha1_JobCondition_To_experimental_JobCondition(in *JobCondition, out *experimental.JobCondition, s conversion.Scope) error { - return autoconvert_v1alpha1_JobCondition_To_experimental_JobCondition(in, out, s) +func convert_v1beta1_JobCondition_To_extensions_JobCondition(in *JobCondition, out *extensions.JobCondition, s conversion.Scope) error { + return autoconvert_v1beta1_JobCondition_To_extensions_JobCondition(in, out, s) } -func autoconvert_v1alpha1_JobList_To_experimental_JobList(in *JobList, out *experimental.JobList, s conversion.Scope) error { +func autoconvert_v1beta1_JobList_To_extensions_JobList(in *JobList, out *extensions.JobList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*JobList))(in) } @@ -3674,9 +3674,9 @@ func autoconvert_v1alpha1_JobList_To_experimental_JobList(in *JobList, out *expe return err } if in.Items != nil { - out.Items = make([]experimental.Job, len(in.Items)) + out.Items = make([]extensions.Job, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_Job_To_experimental_Job(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_Job_To_extensions_Job(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3686,11 +3686,11 @@ func autoconvert_v1alpha1_JobList_To_experimental_JobList(in *JobList, out *expe return nil } -func convert_v1alpha1_JobList_To_experimental_JobList(in *JobList, out *experimental.JobList, s conversion.Scope) error { - return autoconvert_v1alpha1_JobList_To_experimental_JobList(in, out, s) +func convert_v1beta1_JobList_To_extensions_JobList(in *JobList, out *extensions.JobList, s conversion.Scope) error { + return autoconvert_v1beta1_JobList_To_extensions_JobList(in, out, s) } -func autoconvert_v1alpha1_JobSpec_To_experimental_JobSpec(in *JobSpec, out *experimental.JobSpec, s conversion.Scope) error { +func autoconvert_v1beta1_JobSpec_To_extensions_JobSpec(in *JobSpec, out *extensions.JobSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*JobSpec))(in) } @@ -3725,18 +3725,18 @@ func autoconvert_v1alpha1_JobSpec_To_experimental_JobSpec(in *JobSpec, out *expe return nil } -func convert_v1alpha1_JobSpec_To_experimental_JobSpec(in *JobSpec, out *experimental.JobSpec, s conversion.Scope) error { - return autoconvert_v1alpha1_JobSpec_To_experimental_JobSpec(in, out, s) +func convert_v1beta1_JobSpec_To_extensions_JobSpec(in *JobSpec, out *extensions.JobSpec, s conversion.Scope) error { + return autoconvert_v1beta1_JobSpec_To_extensions_JobSpec(in, out, s) } -func autoconvert_v1alpha1_JobStatus_To_experimental_JobStatus(in *JobStatus, out *experimental.JobStatus, s conversion.Scope) error { +func autoconvert_v1beta1_JobStatus_To_extensions_JobStatus(in *JobStatus, out *extensions.JobStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*JobStatus))(in) } if in.Conditions != nil { - out.Conditions = make([]experimental.JobCondition, len(in.Conditions)) + out.Conditions = make([]extensions.JobCondition, len(in.Conditions)) for i := range in.Conditions { - if err := convert_v1alpha1_JobCondition_To_experimental_JobCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { + if err := convert_v1beta1_JobCondition_To_extensions_JobCondition(&in.Conditions[i], &out.Conditions[i], s); err != nil { return err } } @@ -3763,24 +3763,24 @@ func autoconvert_v1alpha1_JobStatus_To_experimental_JobStatus(in *JobStatus, out return nil } -func convert_v1alpha1_JobStatus_To_experimental_JobStatus(in *JobStatus, out *experimental.JobStatus, s conversion.Scope) error { - return autoconvert_v1alpha1_JobStatus_To_experimental_JobStatus(in, out, s) +func convert_v1beta1_JobStatus_To_extensions_JobStatus(in *JobStatus, out *extensions.JobStatus, s conversion.Scope) error { + return autoconvert_v1beta1_JobStatus_To_extensions_JobStatus(in, out, s) } -func autoconvert_v1alpha1_NodeUtilization_To_experimental_NodeUtilization(in *NodeUtilization, out *experimental.NodeUtilization, s conversion.Scope) error { +func autoconvert_v1beta1_NodeUtilization_To_extensions_NodeUtilization(in *NodeUtilization, out *extensions.NodeUtilization, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*NodeUtilization))(in) } - out.Resource = experimental.NodeResource(in.Resource) + out.Resource = extensions.NodeResource(in.Resource) out.Value = in.Value return nil } -func convert_v1alpha1_NodeUtilization_To_experimental_NodeUtilization(in *NodeUtilization, out *experimental.NodeUtilization, s conversion.Scope) error { - return autoconvert_v1alpha1_NodeUtilization_To_experimental_NodeUtilization(in, out, s) +func convert_v1beta1_NodeUtilization_To_extensions_NodeUtilization(in *NodeUtilization, out *extensions.NodeUtilization, s conversion.Scope) error { + return autoconvert_v1beta1_NodeUtilization_To_extensions_NodeUtilization(in, out, s) } -func autoconvert_v1alpha1_ReplicationControllerDummy_To_experimental_ReplicationControllerDummy(in *ReplicationControllerDummy, out *experimental.ReplicationControllerDummy, s conversion.Scope) error { +func autoconvert_v1beta1_ReplicationControllerDummy_To_extensions_ReplicationControllerDummy(in *ReplicationControllerDummy, out *extensions.ReplicationControllerDummy, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ReplicationControllerDummy))(in) } @@ -3790,11 +3790,11 @@ func autoconvert_v1alpha1_ReplicationControllerDummy_To_experimental_Replication return nil } -func convert_v1alpha1_ReplicationControllerDummy_To_experimental_ReplicationControllerDummy(in *ReplicationControllerDummy, out *experimental.ReplicationControllerDummy, s conversion.Scope) error { - return autoconvert_v1alpha1_ReplicationControllerDummy_To_experimental_ReplicationControllerDummy(in, out, s) +func convert_v1beta1_ReplicationControllerDummy_To_extensions_ReplicationControllerDummy(in *ReplicationControllerDummy, out *extensions.ReplicationControllerDummy, s conversion.Scope) error { + return autoconvert_v1beta1_ReplicationControllerDummy_To_extensions_ReplicationControllerDummy(in, out, s) } -func autoconvert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumption(in *ResourceConsumption, out *experimental.ResourceConsumption, s conversion.Scope) error { +func autoconvert_v1beta1_ResourceConsumption_To_extensions_ResourceConsumption(in *ResourceConsumption, out *extensions.ResourceConsumption, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ResourceConsumption))(in) } @@ -3805,11 +3805,11 @@ func autoconvert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumptio return nil } -func convert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumption(in *ResourceConsumption, out *experimental.ResourceConsumption, s conversion.Scope) error { - return autoconvert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumption(in, out, s) +func convert_v1beta1_ResourceConsumption_To_extensions_ResourceConsumption(in *ResourceConsumption, out *extensions.ResourceConsumption, s conversion.Scope) error { + return autoconvert_v1beta1_ResourceConsumption_To_extensions_ResourceConsumption(in, out, s) } -func autoconvert_v1alpha1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment(in *RollingUpdateDeployment, out *experimental.RollingUpdateDeployment, s conversion.Scope) error { +func autoconvert_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) } @@ -3819,7 +3819,7 @@ func autoconvert_v1alpha1_RollingUpdateDeployment_To_experimental_RollingUpdateD return nil } -func autoconvert_v1alpha1_Scale_To_experimental_Scale(in *Scale, out *experimental.Scale, s conversion.Scope) error { +func autoconvert_v1beta1_Scale_To_extensions_Scale(in *Scale, out *extensions.Scale, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*Scale))(in) } @@ -3829,20 +3829,20 @@ func autoconvert_v1alpha1_Scale_To_experimental_Scale(in *Scale, out *experiment if err := convert_v1_ObjectMeta_To_api_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil { return err } - if err := convert_v1alpha1_ScaleSpec_To_experimental_ScaleSpec(&in.Spec, &out.Spec, s); err != nil { + if err := convert_v1beta1_ScaleSpec_To_extensions_ScaleSpec(&in.Spec, &out.Spec, s); err != nil { return err } - if err := convert_v1alpha1_ScaleStatus_To_experimental_ScaleStatus(&in.Status, &out.Status, s); err != nil { + if err := convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(&in.Status, &out.Status, s); err != nil { return err } return nil } -func convert_v1alpha1_Scale_To_experimental_Scale(in *Scale, out *experimental.Scale, s conversion.Scope) error { - return autoconvert_v1alpha1_Scale_To_experimental_Scale(in, out, s) +func convert_v1beta1_Scale_To_extensions_Scale(in *Scale, out *extensions.Scale, s conversion.Scope) error { + return autoconvert_v1beta1_Scale_To_extensions_Scale(in, out, s) } -func autoconvert_v1alpha1_ScaleSpec_To_experimental_ScaleSpec(in *ScaleSpec, out *experimental.ScaleSpec, s conversion.Scope) error { +func autoconvert_v1beta1_ScaleSpec_To_extensions_ScaleSpec(in *ScaleSpec, out *extensions.ScaleSpec, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ScaleSpec))(in) } @@ -3850,11 +3850,11 @@ func autoconvert_v1alpha1_ScaleSpec_To_experimental_ScaleSpec(in *ScaleSpec, out return nil } -func convert_v1alpha1_ScaleSpec_To_experimental_ScaleSpec(in *ScaleSpec, out *experimental.ScaleSpec, s conversion.Scope) error { - return autoconvert_v1alpha1_ScaleSpec_To_experimental_ScaleSpec(in, out, s) +func convert_v1beta1_ScaleSpec_To_extensions_ScaleSpec(in *ScaleSpec, out *extensions.ScaleSpec, s conversion.Scope) error { + return autoconvert_v1beta1_ScaleSpec_To_extensions_ScaleSpec(in, out, s) } -func autoconvert_v1alpha1_ScaleStatus_To_experimental_ScaleStatus(in *ScaleStatus, out *experimental.ScaleStatus, s conversion.Scope) error { +func autoconvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out *extensions.ScaleStatus, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ScaleStatus))(in) } @@ -3870,11 +3870,11 @@ func autoconvert_v1alpha1_ScaleStatus_To_experimental_ScaleStatus(in *ScaleStatu return nil } -func convert_v1alpha1_ScaleStatus_To_experimental_ScaleStatus(in *ScaleStatus, out *experimental.ScaleStatus, s conversion.Scope) error { - return autoconvert_v1alpha1_ScaleStatus_To_experimental_ScaleStatus(in, out, s) +func convert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in *ScaleStatus, out *extensions.ScaleStatus, s conversion.Scope) error { + return autoconvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus(in, out, s) } -func autoconvert_v1alpha1_SubresourceReference_To_experimental_SubresourceReference(in *SubresourceReference, out *experimental.SubresourceReference, s conversion.Scope) error { +func autoconvert_v1beta1_SubresourceReference_To_extensions_SubresourceReference(in *SubresourceReference, out *extensions.SubresourceReference, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*SubresourceReference))(in) } @@ -3886,11 +3886,11 @@ func autoconvert_v1alpha1_SubresourceReference_To_experimental_SubresourceRefere return nil } -func convert_v1alpha1_SubresourceReference_To_experimental_SubresourceReference(in *SubresourceReference, out *experimental.SubresourceReference, s conversion.Scope) error { - return autoconvert_v1alpha1_SubresourceReference_To_experimental_SubresourceReference(in, out, s) +func convert_v1beta1_SubresourceReference_To_extensions_SubresourceReference(in *SubresourceReference, out *extensions.SubresourceReference, s conversion.Scope) error { + return autoconvert_v1beta1_SubresourceReference_To_extensions_SubresourceReference(in, out, s) } -func autoconvert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource(in *ThirdPartyResource, out *experimental.ThirdPartyResource, s conversion.Scope) error { +func autoconvert_v1beta1_ThirdPartyResource_To_extensions_ThirdPartyResource(in *ThirdPartyResource, out *extensions.ThirdPartyResource, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ThirdPartyResource))(in) } @@ -3902,9 +3902,9 @@ func autoconvert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource( } out.Description = in.Description if in.Versions != nil { - out.Versions = make([]experimental.APIVersion, len(in.Versions)) + out.Versions = make([]extensions.APIVersion, len(in.Versions)) for i := range in.Versions { - if err := convert_v1alpha1_APIVersion_To_experimental_APIVersion(&in.Versions[i], &out.Versions[i], s); err != nil { + if err := convert_v1beta1_APIVersion_To_extensions_APIVersion(&in.Versions[i], &out.Versions[i], s); err != nil { return err } } @@ -3914,11 +3914,11 @@ func autoconvert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource( return nil } -func convert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource(in *ThirdPartyResource, out *experimental.ThirdPartyResource, s conversion.Scope) error { - return autoconvert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource(in, out, s) +func convert_v1beta1_ThirdPartyResource_To_extensions_ThirdPartyResource(in *ThirdPartyResource, out *extensions.ThirdPartyResource, s conversion.Scope) error { + return autoconvert_v1beta1_ThirdPartyResource_To_extensions_ThirdPartyResource(in, out, s) } -func autoconvert_v1alpha1_ThirdPartyResourceData_To_experimental_ThirdPartyResourceData(in *ThirdPartyResourceData, out *experimental.ThirdPartyResourceData, s conversion.Scope) error { +func autoconvert_v1beta1_ThirdPartyResourceData_To_extensions_ThirdPartyResourceData(in *ThirdPartyResourceData, out *extensions.ThirdPartyResourceData, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ThirdPartyResourceData))(in) } @@ -3934,11 +3934,11 @@ func autoconvert_v1alpha1_ThirdPartyResourceData_To_experimental_ThirdPartyResou return nil } -func convert_v1alpha1_ThirdPartyResourceData_To_experimental_ThirdPartyResourceData(in *ThirdPartyResourceData, out *experimental.ThirdPartyResourceData, s conversion.Scope) error { - return autoconvert_v1alpha1_ThirdPartyResourceData_To_experimental_ThirdPartyResourceData(in, out, s) +func convert_v1beta1_ThirdPartyResourceData_To_extensions_ThirdPartyResourceData(in *ThirdPartyResourceData, out *extensions.ThirdPartyResourceData, s conversion.Scope) error { + return autoconvert_v1beta1_ThirdPartyResourceData_To_extensions_ThirdPartyResourceData(in, out, s) } -func autoconvert_v1alpha1_ThirdPartyResourceDataList_To_experimental_ThirdPartyResourceDataList(in *ThirdPartyResourceDataList, out *experimental.ThirdPartyResourceDataList, s conversion.Scope) error { +func autoconvert_v1beta1_ThirdPartyResourceDataList_To_extensions_ThirdPartyResourceDataList(in *ThirdPartyResourceDataList, out *extensions.ThirdPartyResourceDataList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ThirdPartyResourceDataList))(in) } @@ -3949,9 +3949,9 @@ func autoconvert_v1alpha1_ThirdPartyResourceDataList_To_experimental_ThirdPartyR return err } if in.Items != nil { - out.Items = make([]experimental.ThirdPartyResourceData, len(in.Items)) + out.Items = make([]extensions.ThirdPartyResourceData, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_ThirdPartyResourceData_To_experimental_ThirdPartyResourceData(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_ThirdPartyResourceData_To_extensions_ThirdPartyResourceData(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3961,11 +3961,11 @@ func autoconvert_v1alpha1_ThirdPartyResourceDataList_To_experimental_ThirdPartyR return nil } -func convert_v1alpha1_ThirdPartyResourceDataList_To_experimental_ThirdPartyResourceDataList(in *ThirdPartyResourceDataList, out *experimental.ThirdPartyResourceDataList, s conversion.Scope) error { - return autoconvert_v1alpha1_ThirdPartyResourceDataList_To_experimental_ThirdPartyResourceDataList(in, out, s) +func convert_v1beta1_ThirdPartyResourceDataList_To_extensions_ThirdPartyResourceDataList(in *ThirdPartyResourceDataList, out *extensions.ThirdPartyResourceDataList, s conversion.Scope) error { + return autoconvert_v1beta1_ThirdPartyResourceDataList_To_extensions_ThirdPartyResourceDataList(in, out, s) } -func autoconvert_v1alpha1_ThirdPartyResourceList_To_experimental_ThirdPartyResourceList(in *ThirdPartyResourceList, out *experimental.ThirdPartyResourceList, s conversion.Scope) error { +func autoconvert_v1beta1_ThirdPartyResourceList_To_extensions_ThirdPartyResourceList(in *ThirdPartyResourceList, out *extensions.ThirdPartyResourceList, s conversion.Scope) error { if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found { defaulting.(func(*ThirdPartyResourceList))(in) } @@ -3976,9 +3976,9 @@ func autoconvert_v1alpha1_ThirdPartyResourceList_To_experimental_ThirdPartyResou return err } if in.Items != nil { - out.Items = make([]experimental.ThirdPartyResource, len(in.Items)) + out.Items = make([]extensions.ThirdPartyResource, len(in.Items)) for i := range in.Items { - if err := convert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource(&in.Items[i], &out.Items[i], s); err != nil { + if err := convert_v1beta1_ThirdPartyResource_To_extensions_ThirdPartyResource(&in.Items[i], &out.Items[i], s); err != nil { return err } } @@ -3988,8 +3988,8 @@ func autoconvert_v1alpha1_ThirdPartyResourceList_To_experimental_ThirdPartyResou return nil } -func convert_v1alpha1_ThirdPartyResourceList_To_experimental_ThirdPartyResourceList(in *ThirdPartyResourceList, out *experimental.ThirdPartyResourceList, s conversion.Scope) error { - return autoconvert_v1alpha1_ThirdPartyResourceList_To_experimental_ThirdPartyResourceList(in, out, s) +func convert_v1beta1_ThirdPartyResourceList_To_extensions_ThirdPartyResourceList(in *ThirdPartyResourceList, out *extensions.ThirdPartyResourceList, s conversion.Scope) error { + return autoconvert_v1beta1_ThirdPartyResourceList_To_extensions_ThirdPartyResourceList(in, out, s) } func init() { @@ -4035,49 +4035,49 @@ func init() { autoconvert_api_VolumeMount_To_v1_VolumeMount, autoconvert_api_VolumeSource_To_v1_VolumeSource, autoconvert_api_Volume_To_v1_Volume, - autoconvert_experimental_APIVersion_To_v1alpha1_APIVersion, - autoconvert_experimental_ClusterAutoscalerList_To_v1alpha1_ClusterAutoscalerList, - autoconvert_experimental_ClusterAutoscalerSpec_To_v1alpha1_ClusterAutoscalerSpec, - autoconvert_experimental_ClusterAutoscaler_To_v1alpha1_ClusterAutoscaler, - autoconvert_experimental_DaemonSetList_To_v1alpha1_DaemonSetList, - autoconvert_experimental_DaemonSetSpec_To_v1alpha1_DaemonSetSpec, - autoconvert_experimental_DaemonSetStatus_To_v1alpha1_DaemonSetStatus, - autoconvert_experimental_DaemonSet_To_v1alpha1_DaemonSet, - autoconvert_experimental_DeploymentList_To_v1alpha1_DeploymentList, - autoconvert_experimental_DeploymentSpec_To_v1alpha1_DeploymentSpec, - autoconvert_experimental_DeploymentStatus_To_v1alpha1_DeploymentStatus, - autoconvert_experimental_DeploymentStrategy_To_v1alpha1_DeploymentStrategy, - autoconvert_experimental_Deployment_To_v1alpha1_Deployment, - autoconvert_experimental_HTTPIngressPath_To_v1alpha1_HTTPIngressPath, - autoconvert_experimental_HTTPIngressRuleValue_To_v1alpha1_HTTPIngressRuleValue, - autoconvert_experimental_HorizontalPodAutoscalerList_To_v1alpha1_HorizontalPodAutoscalerList, - autoconvert_experimental_HorizontalPodAutoscalerSpec_To_v1alpha1_HorizontalPodAutoscalerSpec, - autoconvert_experimental_HorizontalPodAutoscalerStatus_To_v1alpha1_HorizontalPodAutoscalerStatus, - autoconvert_experimental_HorizontalPodAutoscaler_To_v1alpha1_HorizontalPodAutoscaler, - autoconvert_experimental_IngressBackend_To_v1alpha1_IngressBackend, - autoconvert_experimental_IngressList_To_v1alpha1_IngressList, - autoconvert_experimental_IngressRuleValue_To_v1alpha1_IngressRuleValue, - autoconvert_experimental_IngressRule_To_v1alpha1_IngressRule, - autoconvert_experimental_IngressSpec_To_v1alpha1_IngressSpec, - autoconvert_experimental_IngressStatus_To_v1alpha1_IngressStatus, - autoconvert_experimental_Ingress_To_v1alpha1_Ingress, - autoconvert_experimental_JobCondition_To_v1alpha1_JobCondition, - autoconvert_experimental_JobList_To_v1alpha1_JobList, - autoconvert_experimental_JobSpec_To_v1alpha1_JobSpec, - autoconvert_experimental_JobStatus_To_v1alpha1_JobStatus, - autoconvert_experimental_Job_To_v1alpha1_Job, - autoconvert_experimental_NodeUtilization_To_v1alpha1_NodeUtilization, - autoconvert_experimental_ReplicationControllerDummy_To_v1alpha1_ReplicationControllerDummy, - autoconvert_experimental_ResourceConsumption_To_v1alpha1_ResourceConsumption, - autoconvert_experimental_RollingUpdateDeployment_To_v1alpha1_RollingUpdateDeployment, - autoconvert_experimental_ScaleSpec_To_v1alpha1_ScaleSpec, - autoconvert_experimental_ScaleStatus_To_v1alpha1_ScaleStatus, - autoconvert_experimental_Scale_To_v1alpha1_Scale, - autoconvert_experimental_SubresourceReference_To_v1alpha1_SubresourceReference, - autoconvert_experimental_ThirdPartyResourceDataList_To_v1alpha1_ThirdPartyResourceDataList, - autoconvert_experimental_ThirdPartyResourceData_To_v1alpha1_ThirdPartyResourceData, - autoconvert_experimental_ThirdPartyResourceList_To_v1alpha1_ThirdPartyResourceList, - autoconvert_experimental_ThirdPartyResource_To_v1alpha1_ThirdPartyResource, + autoconvert_extensions_APIVersion_To_v1beta1_APIVersion, + autoconvert_extensions_ClusterAutoscalerList_To_v1beta1_ClusterAutoscalerList, + autoconvert_extensions_ClusterAutoscalerSpec_To_v1beta1_ClusterAutoscalerSpec, + autoconvert_extensions_ClusterAutoscaler_To_v1beta1_ClusterAutoscaler, + autoconvert_extensions_DaemonSetList_To_v1beta1_DaemonSetList, + autoconvert_extensions_DaemonSetSpec_To_v1beta1_DaemonSetSpec, + autoconvert_extensions_DaemonSetStatus_To_v1beta1_DaemonSetStatus, + autoconvert_extensions_DaemonSet_To_v1beta1_DaemonSet, + autoconvert_extensions_DeploymentList_To_v1beta1_DeploymentList, + autoconvert_extensions_DeploymentSpec_To_v1beta1_DeploymentSpec, + autoconvert_extensions_DeploymentStatus_To_v1beta1_DeploymentStatus, + autoconvert_extensions_DeploymentStrategy_To_v1beta1_DeploymentStrategy, + autoconvert_extensions_Deployment_To_v1beta1_Deployment, + autoconvert_extensions_HTTPIngressPath_To_v1beta1_HTTPIngressPath, + autoconvert_extensions_HTTPIngressRuleValue_To_v1beta1_HTTPIngressRuleValue, + autoconvert_extensions_HorizontalPodAutoscalerList_To_v1beta1_HorizontalPodAutoscalerList, + autoconvert_extensions_HorizontalPodAutoscalerSpec_To_v1beta1_HorizontalPodAutoscalerSpec, + autoconvert_extensions_HorizontalPodAutoscalerStatus_To_v1beta1_HorizontalPodAutoscalerStatus, + autoconvert_extensions_HorizontalPodAutoscaler_To_v1beta1_HorizontalPodAutoscaler, + autoconvert_extensions_IngressBackend_To_v1beta1_IngressBackend, + autoconvert_extensions_IngressList_To_v1beta1_IngressList, + autoconvert_extensions_IngressRuleValue_To_v1beta1_IngressRuleValue, + autoconvert_extensions_IngressRule_To_v1beta1_IngressRule, + autoconvert_extensions_IngressSpec_To_v1beta1_IngressSpec, + autoconvert_extensions_IngressStatus_To_v1beta1_IngressStatus, + autoconvert_extensions_Ingress_To_v1beta1_Ingress, + autoconvert_extensions_JobCondition_To_v1beta1_JobCondition, + autoconvert_extensions_JobList_To_v1beta1_JobList, + autoconvert_extensions_JobSpec_To_v1beta1_JobSpec, + autoconvert_extensions_JobStatus_To_v1beta1_JobStatus, + autoconvert_extensions_Job_To_v1beta1_Job, + autoconvert_extensions_NodeUtilization_To_v1beta1_NodeUtilization, + autoconvert_extensions_ReplicationControllerDummy_To_v1beta1_ReplicationControllerDummy, + autoconvert_extensions_ResourceConsumption_To_v1beta1_ResourceConsumption, + autoconvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment, + autoconvert_extensions_ScaleSpec_To_v1beta1_ScaleSpec, + autoconvert_extensions_ScaleStatus_To_v1beta1_ScaleStatus, + autoconvert_extensions_Scale_To_v1beta1_Scale, + autoconvert_extensions_SubresourceReference_To_v1beta1_SubresourceReference, + autoconvert_extensions_ThirdPartyResourceDataList_To_v1beta1_ThirdPartyResourceDataList, + autoconvert_extensions_ThirdPartyResourceData_To_v1beta1_ThirdPartyResourceData, + autoconvert_extensions_ThirdPartyResourceList_To_v1beta1_ThirdPartyResourceList, + autoconvert_extensions_ThirdPartyResource_To_v1beta1_ThirdPartyResource, autoconvert_v1_AWSElasticBlockStoreVolumeSource_To_api_AWSElasticBlockStoreVolumeSource, autoconvert_v1_Capabilities_To_api_Capabilities, autoconvert_v1_CephFSVolumeSource_To_api_CephFSVolumeSource, @@ -4119,48 +4119,48 @@ func init() { autoconvert_v1_VolumeMount_To_api_VolumeMount, autoconvert_v1_VolumeSource_To_api_VolumeSource, autoconvert_v1_Volume_To_api_Volume, - autoconvert_v1alpha1_APIVersion_To_experimental_APIVersion, - autoconvert_v1alpha1_ClusterAutoscalerList_To_experimental_ClusterAutoscalerList, - autoconvert_v1alpha1_ClusterAutoscalerSpec_To_experimental_ClusterAutoscalerSpec, - autoconvert_v1alpha1_ClusterAutoscaler_To_experimental_ClusterAutoscaler, - autoconvert_v1alpha1_DaemonSetList_To_experimental_DaemonSetList, - autoconvert_v1alpha1_DaemonSetSpec_To_experimental_DaemonSetSpec, - autoconvert_v1alpha1_DaemonSetStatus_To_experimental_DaemonSetStatus, - autoconvert_v1alpha1_DaemonSet_To_experimental_DaemonSet, - autoconvert_v1alpha1_DeploymentList_To_experimental_DeploymentList, - autoconvert_v1alpha1_DeploymentSpec_To_experimental_DeploymentSpec, - autoconvert_v1alpha1_DeploymentStatus_To_experimental_DeploymentStatus, - autoconvert_v1alpha1_Deployment_To_experimental_Deployment, - autoconvert_v1alpha1_HTTPIngressPath_To_experimental_HTTPIngressPath, - autoconvert_v1alpha1_HTTPIngressRuleValue_To_experimental_HTTPIngressRuleValue, - autoconvert_v1alpha1_HorizontalPodAutoscalerList_To_experimental_HorizontalPodAutoscalerList, - autoconvert_v1alpha1_HorizontalPodAutoscalerSpec_To_experimental_HorizontalPodAutoscalerSpec, - autoconvert_v1alpha1_HorizontalPodAutoscalerStatus_To_experimental_HorizontalPodAutoscalerStatus, - autoconvert_v1alpha1_HorizontalPodAutoscaler_To_experimental_HorizontalPodAutoscaler, - autoconvert_v1alpha1_IngressBackend_To_experimental_IngressBackend, - autoconvert_v1alpha1_IngressList_To_experimental_IngressList, - autoconvert_v1alpha1_IngressRuleValue_To_experimental_IngressRuleValue, - autoconvert_v1alpha1_IngressRule_To_experimental_IngressRule, - autoconvert_v1alpha1_IngressSpec_To_experimental_IngressSpec, - autoconvert_v1alpha1_IngressStatus_To_experimental_IngressStatus, - autoconvert_v1alpha1_Ingress_To_experimental_Ingress, - autoconvert_v1alpha1_JobCondition_To_experimental_JobCondition, - autoconvert_v1alpha1_JobList_To_experimental_JobList, - autoconvert_v1alpha1_JobSpec_To_experimental_JobSpec, - autoconvert_v1alpha1_JobStatus_To_experimental_JobStatus, - autoconvert_v1alpha1_Job_To_experimental_Job, - autoconvert_v1alpha1_NodeUtilization_To_experimental_NodeUtilization, - autoconvert_v1alpha1_ReplicationControllerDummy_To_experimental_ReplicationControllerDummy, - autoconvert_v1alpha1_ResourceConsumption_To_experimental_ResourceConsumption, - autoconvert_v1alpha1_RollingUpdateDeployment_To_experimental_RollingUpdateDeployment, - autoconvert_v1alpha1_ScaleSpec_To_experimental_ScaleSpec, - autoconvert_v1alpha1_ScaleStatus_To_experimental_ScaleStatus, - autoconvert_v1alpha1_Scale_To_experimental_Scale, - autoconvert_v1alpha1_SubresourceReference_To_experimental_SubresourceReference, - autoconvert_v1alpha1_ThirdPartyResourceDataList_To_experimental_ThirdPartyResourceDataList, - autoconvert_v1alpha1_ThirdPartyResourceData_To_experimental_ThirdPartyResourceData, - autoconvert_v1alpha1_ThirdPartyResourceList_To_experimental_ThirdPartyResourceList, - autoconvert_v1alpha1_ThirdPartyResource_To_experimental_ThirdPartyResource, + autoconvert_v1beta1_APIVersion_To_extensions_APIVersion, + autoconvert_v1beta1_ClusterAutoscalerList_To_extensions_ClusterAutoscalerList, + autoconvert_v1beta1_ClusterAutoscalerSpec_To_extensions_ClusterAutoscalerSpec, + autoconvert_v1beta1_ClusterAutoscaler_To_extensions_ClusterAutoscaler, + autoconvert_v1beta1_DaemonSetList_To_extensions_DaemonSetList, + autoconvert_v1beta1_DaemonSetSpec_To_extensions_DaemonSetSpec, + autoconvert_v1beta1_DaemonSetStatus_To_extensions_DaemonSetStatus, + autoconvert_v1beta1_DaemonSet_To_extensions_DaemonSet, + autoconvert_v1beta1_DeploymentList_To_extensions_DeploymentList, + autoconvert_v1beta1_DeploymentSpec_To_extensions_DeploymentSpec, + autoconvert_v1beta1_DeploymentStatus_To_extensions_DeploymentStatus, + autoconvert_v1beta1_Deployment_To_extensions_Deployment, + autoconvert_v1beta1_HTTPIngressPath_To_extensions_HTTPIngressPath, + autoconvert_v1beta1_HTTPIngressRuleValue_To_extensions_HTTPIngressRuleValue, + autoconvert_v1beta1_HorizontalPodAutoscalerList_To_extensions_HorizontalPodAutoscalerList, + autoconvert_v1beta1_HorizontalPodAutoscalerSpec_To_extensions_HorizontalPodAutoscalerSpec, + autoconvert_v1beta1_HorizontalPodAutoscalerStatus_To_extensions_HorizontalPodAutoscalerStatus, + autoconvert_v1beta1_HorizontalPodAutoscaler_To_extensions_HorizontalPodAutoscaler, + autoconvert_v1beta1_IngressBackend_To_extensions_IngressBackend, + autoconvert_v1beta1_IngressList_To_extensions_IngressList, + autoconvert_v1beta1_IngressRuleValue_To_extensions_IngressRuleValue, + autoconvert_v1beta1_IngressRule_To_extensions_IngressRule, + autoconvert_v1beta1_IngressSpec_To_extensions_IngressSpec, + autoconvert_v1beta1_IngressStatus_To_extensions_IngressStatus, + autoconvert_v1beta1_Ingress_To_extensions_Ingress, + autoconvert_v1beta1_JobCondition_To_extensions_JobCondition, + autoconvert_v1beta1_JobList_To_extensions_JobList, + autoconvert_v1beta1_JobSpec_To_extensions_JobSpec, + autoconvert_v1beta1_JobStatus_To_extensions_JobStatus, + autoconvert_v1beta1_Job_To_extensions_Job, + autoconvert_v1beta1_NodeUtilization_To_extensions_NodeUtilization, + autoconvert_v1beta1_ReplicationControllerDummy_To_extensions_ReplicationControllerDummy, + autoconvert_v1beta1_ResourceConsumption_To_extensions_ResourceConsumption, + autoconvert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment, + autoconvert_v1beta1_ScaleSpec_To_extensions_ScaleSpec, + autoconvert_v1beta1_ScaleStatus_To_extensions_ScaleStatus, + autoconvert_v1beta1_Scale_To_extensions_Scale, + autoconvert_v1beta1_SubresourceReference_To_extensions_SubresourceReference, + autoconvert_v1beta1_ThirdPartyResourceDataList_To_extensions_ThirdPartyResourceDataList, + autoconvert_v1beta1_ThirdPartyResourceData_To_extensions_ThirdPartyResourceData, + autoconvert_v1beta1_ThirdPartyResourceList_To_extensions_ThirdPartyResourceList, + autoconvert_v1beta1_ThirdPartyResource_To_extensions_ThirdPartyResource, ) if err != nil { // If one of the conversion functions is malformed, detect it immediately. diff --git a/pkg/apis/experimental/v1alpha1/deep_copy_generated.go b/pkg/apis/extensions/v1beta1/deep_copy_generated.go similarity index 79% rename from pkg/apis/experimental/v1alpha1/deep_copy_generated.go rename to pkg/apis/extensions/v1beta1/deep_copy_generated.go index 7511e5e80b6..90e7cec003a 100644 --- a/pkg/apis/experimental/v1alpha1/deep_copy_generated.go +++ b/pkg/apis/extensions/v1beta1/deep_copy_generated.go @@ -16,7 +16,7 @@ limitations under the License. // DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY $KUBEROOT/hack/update-generated-deep-copies.sh. -package v1alpha1 +package v1beta1 import ( time "time" @@ -844,26 +844,26 @@ func deepCopy_v1_VolumeSource(in v1.VolumeSource, out *v1.VolumeSource, c *conve return nil } -func deepCopy_v1alpha1_APIVersion(in APIVersion, out *APIVersion, c *conversion.Cloner) error { +func deepCopy_v1beta1_APIVersion(in APIVersion, out *APIVersion, c *conversion.Cloner) error { out.Name = in.Name out.APIGroup = in.APIGroup return nil } -func deepCopy_v1alpha1_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error { +func deepCopy_v1beta1_ClusterAutoscaler(in ClusterAutoscaler, out *ClusterAutoscaler, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_ClusterAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_ClusterAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_ClusterAutoscalerList(in ClusterAutoscalerList, out *ClusterAutoscalerList, c *conversion.Cloner) error { +func deepCopy_v1beta1_ClusterAutoscalerList(in ClusterAutoscalerList, out *ClusterAutoscalerList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -873,7 +873,7 @@ func deepCopy_v1alpha1_ClusterAutoscalerList(in ClusterAutoscalerList, out *Clus if in.Items != nil { out.Items = make([]ClusterAutoscaler, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_ClusterAutoscaler(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_ClusterAutoscaler(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -883,13 +883,13 @@ func deepCopy_v1alpha1_ClusterAutoscalerList(in ClusterAutoscalerList, out *Clus return nil } -func deepCopy_v1alpha1_ClusterAutoscalerSpec(in ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_ClusterAutoscalerSpec(in ClusterAutoscalerSpec, out *ClusterAutoscalerSpec, c *conversion.Cloner) error { out.MinNodes = in.MinNodes out.MaxNodes = in.MaxNodes if in.TargetUtilization != nil { out.TargetUtilization = make([]NodeUtilization, len(in.TargetUtilization)) for i := range in.TargetUtilization { - if err := deepCopy_v1alpha1_NodeUtilization(in.TargetUtilization[i], &out.TargetUtilization[i], c); err != nil { + if err := deepCopy_v1beta1_NodeUtilization(in.TargetUtilization[i], &out.TargetUtilization[i], c); err != nil { return err } } @@ -899,23 +899,23 @@ func deepCopy_v1alpha1_ClusterAutoscalerSpec(in ClusterAutoscalerSpec, out *Clus return nil } -func deepCopy_v1alpha1_DaemonSet(in DaemonSet, out *DaemonSet, c *conversion.Cloner) error { +func deepCopy_v1beta1_DaemonSet(in DaemonSet, out *DaemonSet, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_DaemonSetSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_DaemonSetSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_v1alpha1_DaemonSetStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_v1beta1_DaemonSetStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *conversion.Cloner) error { +func deepCopy_v1beta1_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -925,7 +925,7 @@ func deepCopy_v1alpha1_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *co if in.Items != nil { out.Items = make([]DaemonSet, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_DaemonSet(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_DaemonSet(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -935,7 +935,7 @@ func deepCopy_v1alpha1_DaemonSetList(in DaemonSetList, out *DaemonSetList, c *co return nil } -func deepCopy_v1alpha1_DaemonSetSpec(in DaemonSetSpec, out *DaemonSetSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_DaemonSetSpec(in DaemonSetSpec, out *DaemonSetSpec, c *conversion.Cloner) error { if in.Selector != nil { out.Selector = make(map[string]string) for key, val := range in.Selector { @@ -955,30 +955,30 @@ func deepCopy_v1alpha1_DaemonSetSpec(in DaemonSetSpec, out *DaemonSetSpec, c *co return nil } -func deepCopy_v1alpha1_DaemonSetStatus(in DaemonSetStatus, out *DaemonSetStatus, c *conversion.Cloner) error { +func deepCopy_v1beta1_DaemonSetStatus(in DaemonSetStatus, out *DaemonSetStatus, c *conversion.Cloner) error { out.CurrentNumberScheduled = in.CurrentNumberScheduled out.NumberMisscheduled = in.NumberMisscheduled out.DesiredNumberScheduled = in.DesiredNumberScheduled return nil } -func deepCopy_v1alpha1_Deployment(in Deployment, out *Deployment, c *conversion.Cloner) error { +func deepCopy_v1beta1_Deployment(in Deployment, out *Deployment, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_DeploymentSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_DeploymentSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_v1alpha1_DeploymentStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_v1beta1_DeploymentStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_DeploymentList(in DeploymentList, out *DeploymentList, c *conversion.Cloner) error { +func deepCopy_v1beta1_DeploymentList(in DeploymentList, out *DeploymentList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -988,7 +988,7 @@ func deepCopy_v1alpha1_DeploymentList(in DeploymentList, out *DeploymentList, c if in.Items != nil { out.Items = make([]Deployment, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_Deployment(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_Deployment(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -998,7 +998,7 @@ func deepCopy_v1alpha1_DeploymentList(in DeploymentList, out *DeploymentList, c return nil } -func deepCopy_v1alpha1_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c *conversion.Cloner) error { if in.Replicas != nil { out.Replicas = new(int) *out.Replicas = *in.Replicas @@ -1021,7 +1021,7 @@ func deepCopy_v1alpha1_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c } else { out.Template = nil } - if err := deepCopy_v1alpha1_DeploymentStrategy(in.Strategy, &out.Strategy, c); err != nil { + if err := deepCopy_v1beta1_DeploymentStrategy(in.Strategy, &out.Strategy, c); err != nil { return err } if in.UniqueLabelKey != nil { @@ -1033,17 +1033,17 @@ func deepCopy_v1alpha1_DeploymentSpec(in DeploymentSpec, out *DeploymentSpec, c return nil } -func deepCopy_v1alpha1_DeploymentStatus(in DeploymentStatus, out *DeploymentStatus, c *conversion.Cloner) error { +func deepCopy_v1beta1_DeploymentStatus(in DeploymentStatus, out *DeploymentStatus, c *conversion.Cloner) error { out.Replicas = in.Replicas out.UpdatedReplicas = in.UpdatedReplicas return nil } -func deepCopy_v1alpha1_DeploymentStrategy(in DeploymentStrategy, out *DeploymentStrategy, c *conversion.Cloner) error { +func deepCopy_v1beta1_DeploymentStrategy(in DeploymentStrategy, out *DeploymentStrategy, c *conversion.Cloner) error { out.Type = in.Type if in.RollingUpdate != nil { out.RollingUpdate = new(RollingUpdateDeployment) - if err := deepCopy_v1alpha1_RollingUpdateDeployment(*in.RollingUpdate, out.RollingUpdate, c); err != nil { + if err := deepCopy_v1beta1_RollingUpdateDeployment(*in.RollingUpdate, out.RollingUpdate, c); err != nil { return err } } else { @@ -1052,19 +1052,19 @@ func deepCopy_v1alpha1_DeploymentStrategy(in DeploymentStrategy, out *Deployment return nil } -func deepCopy_v1alpha1_HTTPIngressPath(in HTTPIngressPath, out *HTTPIngressPath, c *conversion.Cloner) error { +func deepCopy_v1beta1_HTTPIngressPath(in HTTPIngressPath, out *HTTPIngressPath, c *conversion.Cloner) error { out.Path = in.Path - if err := deepCopy_v1alpha1_IngressBackend(in.Backend, &out.Backend, c); err != nil { + if err := deepCopy_v1beta1_IngressBackend(in.Backend, &out.Backend, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIngressRuleValue, c *conversion.Cloner) error { +func deepCopy_v1beta1_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIngressRuleValue, c *conversion.Cloner) error { if in.Paths != nil { out.Paths = make([]HTTPIngressPath, len(in.Paths)) for i := range in.Paths { - if err := deepCopy_v1alpha1_HTTPIngressPath(in.Paths[i], &out.Paths[i], c); err != nil { + if err := deepCopy_v1beta1_HTTPIngressPath(in.Paths[i], &out.Paths[i], c); err != nil { return err } } @@ -1074,23 +1074,23 @@ func deepCopy_v1alpha1_HTTPIngressRuleValue(in HTTPIngressRuleValue, out *HTTPIn return nil } -func deepCopy_v1alpha1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error { +func deepCopy_v1beta1_HorizontalPodAutoscaler(in HorizontalPodAutoscaler, out *HorizontalPodAutoscaler, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_HorizontalPodAutoscalerSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_v1alpha1_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_v1beta1_HorizontalPodAutoscalerStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error { +func deepCopy_v1beta1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerList, out *HorizontalPodAutoscalerList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1100,7 +1100,7 @@ func deepCopy_v1alpha1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerLis if in.Items != nil { out.Items = make([]HorizontalPodAutoscaler, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_HorizontalPodAutoscaler(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_HorizontalPodAutoscaler(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1110,10 +1110,10 @@ func deepCopy_v1alpha1_HorizontalPodAutoscalerList(in HorizontalPodAutoscalerLis return nil } -func deepCopy_v1alpha1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpec, out *HorizontalPodAutoscalerSpec, c *conversion.Cloner) error { if in.ScaleRef != nil { out.ScaleRef = new(SubresourceReference) - if err := deepCopy_v1alpha1_SubresourceReference(*in.ScaleRef, out.ScaleRef, c); err != nil { + if err := deepCopy_v1beta1_SubresourceReference(*in.ScaleRef, out.ScaleRef, c); err != nil { return err } } else { @@ -1121,18 +1121,18 @@ func deepCopy_v1alpha1_HorizontalPodAutoscalerSpec(in HorizontalPodAutoscalerSpe } out.MinReplicas = in.MinReplicas out.MaxReplicas = in.MaxReplicas - if err := deepCopy_v1alpha1_ResourceConsumption(in.Target, &out.Target, c); err != nil { + if err := deepCopy_v1beta1_ResourceConsumption(in.Target, &out.Target, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error { +func deepCopy_v1beta1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerStatus, out *HorizontalPodAutoscalerStatus, c *conversion.Cloner) error { out.CurrentReplicas = in.CurrentReplicas out.DesiredReplicas = in.DesiredReplicas if in.CurrentConsumption != nil { out.CurrentConsumption = new(ResourceConsumption) - if err := deepCopy_v1alpha1_ResourceConsumption(*in.CurrentConsumption, out.CurrentConsumption, c); err != nil { + if err := deepCopy_v1beta1_ResourceConsumption(*in.CurrentConsumption, out.CurrentConsumption, c); err != nil { return err } } else { @@ -1149,23 +1149,23 @@ func deepCopy_v1alpha1_HorizontalPodAutoscalerStatus(in HorizontalPodAutoscalerS return nil } -func deepCopy_v1alpha1_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) error { +func deepCopy_v1beta1_Ingress(in Ingress, out *Ingress, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_IngressSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_IngressSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_v1alpha1_IngressStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_v1beta1_IngressStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_IngressBackend(in IngressBackend, out *IngressBackend, c *conversion.Cloner) error { +func deepCopy_v1beta1_IngressBackend(in IngressBackend, out *IngressBackend, c *conversion.Cloner) error { out.ServiceName = in.ServiceName if err := deepCopy_util_IntOrString(in.ServicePort, &out.ServicePort, c); err != nil { return err @@ -1173,7 +1173,7 @@ func deepCopy_v1alpha1_IngressBackend(in IngressBackend, out *IngressBackend, c return nil } -func deepCopy_v1alpha1_IngressList(in IngressList, out *IngressList, c *conversion.Cloner) error { +func deepCopy_v1beta1_IngressList(in IngressList, out *IngressList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1183,7 +1183,7 @@ func deepCopy_v1alpha1_IngressList(in IngressList, out *IngressList, c *conversi if in.Items != nil { out.Items = make([]Ingress, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_Ingress(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_Ingress(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1193,18 +1193,18 @@ func deepCopy_v1alpha1_IngressList(in IngressList, out *IngressList, c *conversi return nil } -func deepCopy_v1alpha1_IngressRule(in IngressRule, out *IngressRule, c *conversion.Cloner) error { +func deepCopy_v1beta1_IngressRule(in IngressRule, out *IngressRule, c *conversion.Cloner) error { out.Host = in.Host - if err := deepCopy_v1alpha1_IngressRuleValue(in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { + if err := deepCopy_v1beta1_IngressRuleValue(in.IngressRuleValue, &out.IngressRuleValue, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_IngressRuleValue(in IngressRuleValue, out *IngressRuleValue, c *conversion.Cloner) error { +func deepCopy_v1beta1_IngressRuleValue(in IngressRuleValue, out *IngressRuleValue, c *conversion.Cloner) error { if in.HTTP != nil { out.HTTP = new(HTTPIngressRuleValue) - if err := deepCopy_v1alpha1_HTTPIngressRuleValue(*in.HTTP, out.HTTP, c); err != nil { + if err := deepCopy_v1beta1_HTTPIngressRuleValue(*in.HTTP, out.HTTP, c); err != nil { return err } } else { @@ -1213,10 +1213,10 @@ func deepCopy_v1alpha1_IngressRuleValue(in IngressRuleValue, out *IngressRuleVal return nil } -func deepCopy_v1alpha1_IngressSpec(in IngressSpec, out *IngressSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_IngressSpec(in IngressSpec, out *IngressSpec, c *conversion.Cloner) error { if in.Backend != nil { out.Backend = new(IngressBackend) - if err := deepCopy_v1alpha1_IngressBackend(*in.Backend, out.Backend, c); err != nil { + if err := deepCopy_v1beta1_IngressBackend(*in.Backend, out.Backend, c); err != nil { return err } } else { @@ -1225,7 +1225,7 @@ func deepCopy_v1alpha1_IngressSpec(in IngressSpec, out *IngressSpec, c *conversi if in.Rules != nil { out.Rules = make([]IngressRule, len(in.Rules)) for i := range in.Rules { - if err := deepCopy_v1alpha1_IngressRule(in.Rules[i], &out.Rules[i], c); err != nil { + if err := deepCopy_v1beta1_IngressRule(in.Rules[i], &out.Rules[i], c); err != nil { return err } } @@ -1235,30 +1235,30 @@ func deepCopy_v1alpha1_IngressSpec(in IngressSpec, out *IngressSpec, c *conversi return nil } -func deepCopy_v1alpha1_IngressStatus(in IngressStatus, out *IngressStatus, c *conversion.Cloner) error { +func deepCopy_v1beta1_IngressStatus(in IngressStatus, out *IngressStatus, c *conversion.Cloner) error { if err := deepCopy_v1_LoadBalancerStatus(in.LoadBalancer, &out.LoadBalancer, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_Job(in Job, out *Job, c *conversion.Cloner) error { +func deepCopy_v1beta1_Job(in Job, out *Job, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_JobSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_JobSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_v1alpha1_JobStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_v1beta1_JobStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error { +func deepCopy_v1beta1_JobCondition(in JobCondition, out *JobCondition, c *conversion.Cloner) error { out.Type = in.Type out.Status = in.Status if err := deepCopy_unversioned_Time(in.LastProbeTime, &out.LastProbeTime, c); err != nil { @@ -1272,7 +1272,7 @@ func deepCopy_v1alpha1_JobCondition(in JobCondition, out *JobCondition, c *conve return nil } -func deepCopy_v1alpha1_JobList(in JobList, out *JobList, c *conversion.Cloner) error { +func deepCopy_v1beta1_JobList(in JobList, out *JobList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1282,7 +1282,7 @@ func deepCopy_v1alpha1_JobList(in JobList, out *JobList, c *conversion.Cloner) e if in.Items != nil { out.Items = make([]Job, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_Job(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_Job(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1292,7 +1292,7 @@ func deepCopy_v1alpha1_JobList(in JobList, out *JobList, c *conversion.Cloner) e return nil } -func deepCopy_v1alpha1_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) error { if in.Parallelism != nil { out.Parallelism = new(int) *out.Parallelism = *in.Parallelism @@ -1324,11 +1324,11 @@ func deepCopy_v1alpha1_JobSpec(in JobSpec, out *JobSpec, c *conversion.Cloner) e return nil } -func deepCopy_v1alpha1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error { +func deepCopy_v1beta1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Cloner) error { if in.Conditions != nil { out.Conditions = make([]JobCondition, len(in.Conditions)) for i := range in.Conditions { - if err := deepCopy_v1alpha1_JobCondition(in.Conditions[i], &out.Conditions[i], c); err != nil { + if err := deepCopy_v1beta1_JobCondition(in.Conditions[i], &out.Conditions[i], c); err != nil { return err } } @@ -1357,20 +1357,20 @@ func deepCopy_v1alpha1_JobStatus(in JobStatus, out *JobStatus, c *conversion.Clo return nil } -func deepCopy_v1alpha1_NodeUtilization(in NodeUtilization, out *NodeUtilization, c *conversion.Cloner) error { +func deepCopy_v1beta1_NodeUtilization(in NodeUtilization, out *NodeUtilization, c *conversion.Cloner) error { out.Resource = in.Resource out.Value = in.Value return nil } -func deepCopy_v1alpha1_ReplicationControllerDummy(in ReplicationControllerDummy, out *ReplicationControllerDummy, c *conversion.Cloner) error { +func deepCopy_v1beta1_ReplicationControllerDummy(in ReplicationControllerDummy, out *ReplicationControllerDummy, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_ResourceConsumption(in ResourceConsumption, out *ResourceConsumption, c *conversion.Cloner) error { +func deepCopy_v1beta1_ResourceConsumption(in ResourceConsumption, out *ResourceConsumption, c *conversion.Cloner) error { out.Resource = in.Resource if err := deepCopy_resource_Quantity(in.Quantity, &out.Quantity, c); err != nil { return err @@ -1378,7 +1378,7 @@ func deepCopy_v1alpha1_ResourceConsumption(in ResourceConsumption, out *Resource return nil } -func deepCopy_v1alpha1_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error { +func deepCopy_v1beta1_RollingUpdateDeployment(in RollingUpdateDeployment, out *RollingUpdateDeployment, c *conversion.Cloner) error { if in.MaxUnavailable != nil { out.MaxUnavailable = new(util.IntOrString) if err := deepCopy_util_IntOrString(*in.MaxUnavailable, out.MaxUnavailable, c); err != nil { @@ -1399,28 +1399,28 @@ func deepCopy_v1alpha1_RollingUpdateDeployment(in RollingUpdateDeployment, out * return nil } -func deepCopy_v1alpha1_Scale(in Scale, out *Scale, c *conversion.Cloner) error { +func deepCopy_v1beta1_Scale(in Scale, out *Scale, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } if err := deepCopy_v1_ObjectMeta(in.ObjectMeta, &out.ObjectMeta, c); err != nil { return err } - if err := deepCopy_v1alpha1_ScaleSpec(in.Spec, &out.Spec, c); err != nil { + if err := deepCopy_v1beta1_ScaleSpec(in.Spec, &out.Spec, c); err != nil { return err } - if err := deepCopy_v1alpha1_ScaleStatus(in.Status, &out.Status, c); err != nil { + if err := deepCopy_v1beta1_ScaleStatus(in.Status, &out.Status, c); err != nil { return err } return nil } -func deepCopy_v1alpha1_ScaleSpec(in ScaleSpec, out *ScaleSpec, c *conversion.Cloner) error { +func deepCopy_v1beta1_ScaleSpec(in ScaleSpec, out *ScaleSpec, c *conversion.Cloner) error { out.Replicas = in.Replicas return nil } -func deepCopy_v1alpha1_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversion.Cloner) error { +func deepCopy_v1beta1_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversion.Cloner) error { out.Replicas = in.Replicas if in.Selector != nil { out.Selector = make(map[string]string) @@ -1433,7 +1433,7 @@ func deepCopy_v1alpha1_ScaleStatus(in ScaleStatus, out *ScaleStatus, c *conversi return nil } -func deepCopy_v1alpha1_SubresourceReference(in SubresourceReference, out *SubresourceReference, c *conversion.Cloner) error { +func deepCopy_v1beta1_SubresourceReference(in SubresourceReference, out *SubresourceReference, c *conversion.Cloner) error { out.Kind = in.Kind out.Namespace = in.Namespace out.Name = in.Name @@ -1442,7 +1442,7 @@ func deepCopy_v1alpha1_SubresourceReference(in SubresourceReference, out *Subres return nil } -func deepCopy_v1alpha1_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyResource, c *conversion.Cloner) error { +func deepCopy_v1beta1_ThirdPartyResource(in ThirdPartyResource, out *ThirdPartyResource, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1453,7 +1453,7 @@ func deepCopy_v1alpha1_ThirdPartyResource(in ThirdPartyResource, out *ThirdParty if in.Versions != nil { out.Versions = make([]APIVersion, len(in.Versions)) for i := range in.Versions { - if err := deepCopy_v1alpha1_APIVersion(in.Versions[i], &out.Versions[i], c); err != nil { + if err := deepCopy_v1beta1_APIVersion(in.Versions[i], &out.Versions[i], c); err != nil { return err } } @@ -1463,7 +1463,7 @@ func deepCopy_v1alpha1_ThirdPartyResource(in ThirdPartyResource, out *ThirdParty return nil } -func deepCopy_v1alpha1_ThirdPartyResourceData(in ThirdPartyResourceData, out *ThirdPartyResourceData, c *conversion.Cloner) error { +func deepCopy_v1beta1_ThirdPartyResourceData(in ThirdPartyResourceData, out *ThirdPartyResourceData, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1481,7 +1481,7 @@ func deepCopy_v1alpha1_ThirdPartyResourceData(in ThirdPartyResourceData, out *Th return nil } -func deepCopy_v1alpha1_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, c *conversion.Cloner) error { +func deepCopy_v1beta1_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, out *ThirdPartyResourceDataList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1491,7 +1491,7 @@ func deepCopy_v1alpha1_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, if in.Items != nil { out.Items = make([]ThirdPartyResourceData, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_ThirdPartyResourceData(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_ThirdPartyResourceData(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1501,7 +1501,7 @@ func deepCopy_v1alpha1_ThirdPartyResourceDataList(in ThirdPartyResourceDataList, return nil } -func deepCopy_v1alpha1_ThirdPartyResourceList(in ThirdPartyResourceList, out *ThirdPartyResourceList, c *conversion.Cloner) error { +func deepCopy_v1beta1_ThirdPartyResourceList(in ThirdPartyResourceList, out *ThirdPartyResourceList, c *conversion.Cloner) error { if err := deepCopy_unversioned_TypeMeta(in.TypeMeta, &out.TypeMeta, c); err != nil { return err } @@ -1511,7 +1511,7 @@ func deepCopy_v1alpha1_ThirdPartyResourceList(in ThirdPartyResourceList, out *Th if in.Items != nil { out.Items = make([]ThirdPartyResource, len(in.Items)) for i := range in.Items { - if err := deepCopy_v1alpha1_ThirdPartyResource(in.Items[i], &out.Items[i], c); err != nil { + if err := deepCopy_v1beta1_ThirdPartyResource(in.Items[i], &out.Items[i], c); err != nil { return err } } @@ -1576,49 +1576,49 @@ func init() { deepCopy_v1_Volume, deepCopy_v1_VolumeMount, deepCopy_v1_VolumeSource, - deepCopy_v1alpha1_APIVersion, - deepCopy_v1alpha1_ClusterAutoscaler, - deepCopy_v1alpha1_ClusterAutoscalerList, - deepCopy_v1alpha1_ClusterAutoscalerSpec, - deepCopy_v1alpha1_DaemonSet, - deepCopy_v1alpha1_DaemonSetList, - deepCopy_v1alpha1_DaemonSetSpec, - deepCopy_v1alpha1_DaemonSetStatus, - deepCopy_v1alpha1_Deployment, - deepCopy_v1alpha1_DeploymentList, - deepCopy_v1alpha1_DeploymentSpec, - deepCopy_v1alpha1_DeploymentStatus, - deepCopy_v1alpha1_DeploymentStrategy, - deepCopy_v1alpha1_HTTPIngressPath, - deepCopy_v1alpha1_HTTPIngressRuleValue, - deepCopy_v1alpha1_HorizontalPodAutoscaler, - deepCopy_v1alpha1_HorizontalPodAutoscalerList, - deepCopy_v1alpha1_HorizontalPodAutoscalerSpec, - deepCopy_v1alpha1_HorizontalPodAutoscalerStatus, - deepCopy_v1alpha1_Ingress, - deepCopy_v1alpha1_IngressBackend, - deepCopy_v1alpha1_IngressList, - deepCopy_v1alpha1_IngressRule, - deepCopy_v1alpha1_IngressRuleValue, - deepCopy_v1alpha1_IngressSpec, - deepCopy_v1alpha1_IngressStatus, - deepCopy_v1alpha1_Job, - deepCopy_v1alpha1_JobCondition, - deepCopy_v1alpha1_JobList, - deepCopy_v1alpha1_JobSpec, - deepCopy_v1alpha1_JobStatus, - deepCopy_v1alpha1_NodeUtilization, - deepCopy_v1alpha1_ReplicationControllerDummy, - deepCopy_v1alpha1_ResourceConsumption, - deepCopy_v1alpha1_RollingUpdateDeployment, - deepCopy_v1alpha1_Scale, - deepCopy_v1alpha1_ScaleSpec, - deepCopy_v1alpha1_ScaleStatus, - deepCopy_v1alpha1_SubresourceReference, - deepCopy_v1alpha1_ThirdPartyResource, - deepCopy_v1alpha1_ThirdPartyResourceData, - deepCopy_v1alpha1_ThirdPartyResourceDataList, - deepCopy_v1alpha1_ThirdPartyResourceList, + deepCopy_v1beta1_APIVersion, + deepCopy_v1beta1_ClusterAutoscaler, + deepCopy_v1beta1_ClusterAutoscalerList, + deepCopy_v1beta1_ClusterAutoscalerSpec, + deepCopy_v1beta1_DaemonSet, + deepCopy_v1beta1_DaemonSetList, + deepCopy_v1beta1_DaemonSetSpec, + deepCopy_v1beta1_DaemonSetStatus, + deepCopy_v1beta1_Deployment, + deepCopy_v1beta1_DeploymentList, + deepCopy_v1beta1_DeploymentSpec, + deepCopy_v1beta1_DeploymentStatus, + deepCopy_v1beta1_DeploymentStrategy, + deepCopy_v1beta1_HTTPIngressPath, + deepCopy_v1beta1_HTTPIngressRuleValue, + deepCopy_v1beta1_HorizontalPodAutoscaler, + deepCopy_v1beta1_HorizontalPodAutoscalerList, + deepCopy_v1beta1_HorizontalPodAutoscalerSpec, + deepCopy_v1beta1_HorizontalPodAutoscalerStatus, + deepCopy_v1beta1_Ingress, + deepCopy_v1beta1_IngressBackend, + deepCopy_v1beta1_IngressList, + deepCopy_v1beta1_IngressRule, + deepCopy_v1beta1_IngressRuleValue, + deepCopy_v1beta1_IngressSpec, + deepCopy_v1beta1_IngressStatus, + deepCopy_v1beta1_Job, + deepCopy_v1beta1_JobCondition, + deepCopy_v1beta1_JobList, + deepCopy_v1beta1_JobSpec, + deepCopy_v1beta1_JobStatus, + deepCopy_v1beta1_NodeUtilization, + deepCopy_v1beta1_ReplicationControllerDummy, + deepCopy_v1beta1_ResourceConsumption, + deepCopy_v1beta1_RollingUpdateDeployment, + deepCopy_v1beta1_Scale, + deepCopy_v1beta1_ScaleSpec, + deepCopy_v1beta1_ScaleStatus, + deepCopy_v1beta1_SubresourceReference, + deepCopy_v1beta1_ThirdPartyResource, + deepCopy_v1beta1_ThirdPartyResourceData, + deepCopy_v1beta1_ThirdPartyResourceDataList, + deepCopy_v1beta1_ThirdPartyResourceList, deepCopy_util_IntOrString, ) if err != nil { diff --git a/pkg/apis/experimental/v1alpha1/defaults.go b/pkg/apis/extensions/v1beta1/defaults.go similarity index 98% rename from pkg/apis/experimental/v1alpha1/defaults.go rename to pkg/apis/extensions/v1beta1/defaults.go index cba446fb0f6..655e17310e4 100644 --- a/pkg/apis/experimental/v1alpha1/defaults.go +++ b/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) { diff --git a/pkg/apis/experimental/v1alpha1/defaults_test.go b/pkg/apis/extensions/v1beta1/defaults_test.go similarity index 99% rename from pkg/apis/experimental/v1alpha1/defaults_test.go rename to pkg/apis/extensions/v1beta1/defaults_test.go index dfb24895fa7..3800fabc2f5 100644 --- a/pkg/apis/experimental/v1alpha1/defaults_test.go +++ b/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" diff --git a/pkg/apis/experimental/v1alpha1/register.go b/pkg/apis/extensions/v1beta1/register.go similarity index 94% rename from pkg/apis/experimental/v1alpha1/register.go rename to pkg/apis/extensions/v1beta1/register.go index eef557bf95a..05c4b09c0af 100644 --- a/pkg/apis/experimental/v1alpha1/register.go +++ b/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{}, diff --git a/pkg/apis/experimental/v1alpha1/types.go b/pkg/apis/extensions/v1beta1/types.go similarity index 99% rename from pkg/apis/experimental/v1alpha1/types.go rename to pkg/apis/extensions/v1beta1/types.go index 9be962edc0d..2cdee797e55 100644 --- a/pkg/apis/experimental/v1alpha1/types.go +++ b/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" diff --git a/pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go b/pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go similarity index 99% rename from pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go rename to pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go index 92ed73e47f9..94949b060f8 100644 --- a/pkg/apis/experimental/v1alpha1/types_swagger_doc_generated.go +++ b/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 diff --git a/pkg/apis/experimental/validation/validation.go b/pkg/apis/extensions/validation/validation.go similarity index 87% rename from pkg/apis/experimental/validation/validation.go rename to pkg/apis/extensions/validation/validation.go index bd04b7a4a48..dd0835ac0f1 100644 --- a/pkg/apis/experimental/validation/validation.go +++ b/pkg/apis/extensions/validation/validation.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" apivalidation "k8s.io/kubernetes/pkg/api/validation" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util" errs "k8s.io/kubernetes/pkg/util/fielderrors" @@ -51,7 +51,7 @@ func ValidateHorizontalPodAutoscalerName(name string, prefix bool) (bool, string return apivalidation.ValidateReplicationControllerName(name, prefix) } -func validateHorizontalPodAutoscalerSpec(autoscaler experimental.HorizontalPodAutoscalerSpec) errs.ValidationErrorList { +func validateHorizontalPodAutoscalerSpec(autoscaler extensions.HorizontalPodAutoscalerSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if autoscaler.MinReplicas < 0 { allErrs = append(allErrs, errs.NewFieldInvalid("minReplicas", autoscaler.MinReplicas, isNegativeErrorMsg)) @@ -73,25 +73,25 @@ func validateHorizontalPodAutoscalerSpec(autoscaler experimental.HorizontalPodAu return allErrs } -func ValidateHorizontalPodAutoscaler(autoscaler *experimental.HorizontalPodAutoscaler) errs.ValidationErrorList { +func ValidateHorizontalPodAutoscaler(autoscaler *extensions.HorizontalPodAutoscaler) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&autoscaler.ObjectMeta, true, ValidateHorizontalPodAutoscalerName).Prefix("metadata")...) allErrs = append(allErrs, validateHorizontalPodAutoscalerSpec(autoscaler.Spec)...) return allErrs } -func ValidateHorizontalPodAutoscalerUpdate(newAutoscler, oldAutoscaler *experimental.HorizontalPodAutoscaler) errs.ValidationErrorList { +func ValidateHorizontalPodAutoscalerUpdate(newAutoscler, oldAutoscaler *extensions.HorizontalPodAutoscaler) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&newAutoscler.ObjectMeta, &oldAutoscaler.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, validateHorizontalPodAutoscalerSpec(newAutoscler.Spec)...) return allErrs } -func ValidateThirdPartyResourceUpdate(old, update *experimental.ThirdPartyResource) errs.ValidationErrorList { +func ValidateThirdPartyResourceUpdate(old, update *extensions.ThirdPartyResource) errs.ValidationErrorList { return ValidateThirdPartyResource(update) } -func ValidateThirdPartyResource(obj *experimental.ThirdPartyResource) errs.ValidationErrorList { +func ValidateThirdPartyResource(obj *extensions.ThirdPartyResource) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if len(obj.Name) == 0 { allErrs = append(allErrs, errs.NewFieldInvalid("name", obj.Name, "name must be non-empty")) @@ -111,7 +111,7 @@ func ValidateThirdPartyResource(obj *experimental.ThirdPartyResource) errs.Valid } // ValidateDaemonSet tests if required fields in the DaemonSet are set. -func ValidateDaemonSet(controller *experimental.DaemonSet) errs.ValidationErrorList { +func ValidateDaemonSet(controller *extensions.DaemonSet) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&controller.ObjectMeta, true, apivalidation.ValidateReplicationControllerName).Prefix("metadata")...) allErrs = append(allErrs, ValidateDaemonSetSpec(&controller.Spec).Prefix("spec")...) @@ -119,7 +119,7 @@ func ValidateDaemonSet(controller *experimental.DaemonSet) errs.ValidationErrorL } // ValidateDaemonSetUpdate tests if required fields in the DaemonSet are set. -func ValidateDaemonSetUpdate(oldController, controller *experimental.DaemonSet) errs.ValidationErrorList { +func ValidateDaemonSetUpdate(oldController, controller *extensions.DaemonSet) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&controller.ObjectMeta, &oldController.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, ValidateDaemonSetSpec(&controller.Spec).Prefix("spec")...) @@ -128,7 +128,7 @@ func ValidateDaemonSetUpdate(oldController, controller *experimental.DaemonSet) } // validateDaemonSetStatus validates a DaemonSetStatus -func validateDaemonSetStatus(status *experimental.DaemonSetStatus) errs.ValidationErrorList { +func validateDaemonSetStatus(status *extensions.DaemonSetStatus) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.CurrentNumberScheduled), "currentNumberScheduled")...) allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.NumberMisscheduled), "numberMisscheduled")...) @@ -137,7 +137,7 @@ func validateDaemonSetStatus(status *experimental.DaemonSetStatus) errs.Validati } // ValidateDaemonSetStatus validates tests if required fields in the DaemonSet Status section -func ValidateDaemonSetStatusUpdate(controller, oldController *experimental.DaemonSet) errs.ValidationErrorList { +func ValidateDaemonSetStatusUpdate(controller, oldController *extensions.DaemonSet) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&controller.ObjectMeta, &oldController.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, validateDaemonSetStatus(&controller.Status)...) @@ -160,7 +160,7 @@ func ValidateDaemonSetTemplateUpdate(oldPodTemplate, podTemplate *api.PodTemplat } // ValidateDaemonSetSpec tests if required fields in the DaemonSetSpec are set. -func ValidateDaemonSetSpec(spec *experimental.DaemonSetSpec) errs.ValidationErrorList { +func ValidateDaemonSetSpec(spec *extensions.DaemonSetSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} selector := labels.Set(spec.Selector).AsSelector() @@ -237,7 +237,7 @@ func IsNotMoreThan100Percent(intOrStringValue util.IntOrString, fieldName string return allErrs } -func ValidateRollingUpdateDeployment(rollingUpdate *experimental.RollingUpdateDeployment, fieldName string) errs.ValidationErrorList { +func ValidateRollingUpdateDeployment(rollingUpdate *extensions.RollingUpdateDeployment, fieldName string) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, ValidatePositiveIntOrPercent(rollingUpdate.MaxUnavailable, fieldName+"maxUnavailable")...) allErrs = append(allErrs, ValidatePositiveIntOrPercent(rollingUpdate.MaxSurge, fieldName+".maxSurge")...) @@ -251,22 +251,22 @@ func ValidateRollingUpdateDeployment(rollingUpdate *experimental.RollingUpdateDe return allErrs } -func ValidateDeploymentStrategy(strategy *experimental.DeploymentStrategy, fieldName string) errs.ValidationErrorList { +func ValidateDeploymentStrategy(strategy *extensions.DeploymentStrategy, fieldName string) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if strategy.RollingUpdate == nil { return allErrs } switch strategy.Type { - case experimental.RecreateDeploymentStrategyType: - allErrs = append(allErrs, errs.NewFieldForbidden("rollingUpdate", "rollingUpdate should be nil when strategy type is "+experimental.RecreateDeploymentStrategyType)) - case experimental.RollingUpdateDeploymentStrategyType: + case extensions.RecreateDeploymentStrategyType: + allErrs = append(allErrs, errs.NewFieldForbidden("rollingUpdate", "rollingUpdate should be nil when strategy type is "+extensions.RecreateDeploymentStrategyType)) + case extensions.RollingUpdateDeploymentStrategyType: allErrs = append(allErrs, ValidateRollingUpdateDeployment(strategy.RollingUpdate, "rollingUpdate")...) } return allErrs } // Validates given deployment spec. -func ValidateDeploymentSpec(spec *experimental.DeploymentSpec) errs.ValidationErrorList { +func ValidateDeploymentSpec(spec *extensions.DeploymentSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateNonEmptySelector(spec.Selector, "selector")...) allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(spec.Replicas), "replicas")...) @@ -276,25 +276,25 @@ func ValidateDeploymentSpec(spec *experimental.DeploymentSpec) errs.ValidationEr return allErrs } -func ValidateDeploymentUpdate(old, update *experimental.Deployment) errs.ValidationErrorList { +func ValidateDeploymentUpdate(old, update *extensions.Deployment) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&update.ObjectMeta, &old.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, ValidateDeploymentSpec(&update.Spec).Prefix("spec")...) return allErrs } -func ValidateDeployment(obj *experimental.Deployment) errs.ValidationErrorList { +func ValidateDeployment(obj *extensions.Deployment) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&obj.ObjectMeta, true, ValidateDeploymentName).Prefix("metadata")...) allErrs = append(allErrs, ValidateDeploymentSpec(&obj.Spec).Prefix("spec")...) return allErrs } -func ValidateThirdPartyResourceDataUpdate(old, update *experimental.ThirdPartyResourceData) errs.ValidationErrorList { +func ValidateThirdPartyResourceDataUpdate(old, update *extensions.ThirdPartyResourceData) errs.ValidationErrorList { return ValidateThirdPartyResourceData(update) } -func ValidateThirdPartyResourceData(obj *experimental.ThirdPartyResourceData) errs.ValidationErrorList { +func ValidateThirdPartyResourceData(obj *extensions.ThirdPartyResourceData) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if len(obj.Name) == 0 { allErrs = append(allErrs, errs.NewFieldInvalid("name", obj.Name, "name must be non-empty")) @@ -302,7 +302,7 @@ func ValidateThirdPartyResourceData(obj *experimental.ThirdPartyResourceData) er return allErrs } -func ValidateJob(job *experimental.Job) errs.ValidationErrorList { +func ValidateJob(job *extensions.Job) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} // Jobs and rcs have the same name validation allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&job.ObjectMeta, true, apivalidation.ValidateReplicationControllerName).Prefix("metadata")...) @@ -310,7 +310,7 @@ func ValidateJob(job *experimental.Job) errs.ValidationErrorList { return allErrs } -func ValidateJobSpec(spec *experimental.JobSpec) errs.ValidationErrorList { +func ValidateJobSpec(spec *extensions.JobSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if spec.Parallelism != nil && *spec.Parallelism < 0 { @@ -342,7 +342,7 @@ func ValidateJobSpec(spec *experimental.JobSpec) errs.ValidationErrorList { return allErrs } -func ValidateJobStatus(status *experimental.JobStatus) errs.ValidationErrorList { +func ValidateJobStatus(status *extensions.JobStatus) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.Active), "active")...) allErrs = append(allErrs, apivalidation.ValidatePositiveField(int64(status.Succeeded), "succeeded")...) @@ -350,21 +350,21 @@ func ValidateJobStatus(status *experimental.JobStatus) errs.ValidationErrorList return allErrs } -func ValidateJobUpdate(oldJob, job *experimental.Job) errs.ValidationErrorList { +func ValidateJobUpdate(oldJob, job *extensions.Job) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&oldJob.ObjectMeta, &job.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, ValidateJobSpecUpdate(oldJob.Spec, job.Spec).Prefix("spec")...) return allErrs } -func ValidateJobUpdateStatus(oldJob, job *experimental.Job) errs.ValidationErrorList { +func ValidateJobUpdateStatus(oldJob, job *extensions.Job) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&oldJob.ObjectMeta, &job.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, ValidateJobStatusUpdate(oldJob.Status, job.Status).Prefix("status")...) return allErrs } -func ValidateJobSpecUpdate(oldSpec, spec experimental.JobSpec) errs.ValidationErrorList { +func ValidateJobSpecUpdate(oldSpec, spec extensions.JobSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, ValidateJobSpec(&spec)...) if !api.Semantic.DeepEqual(oldSpec.Completions, spec.Completions) { @@ -379,14 +379,14 @@ func ValidateJobSpecUpdate(oldSpec, spec experimental.JobSpec) errs.ValidationEr return allErrs } -func ValidateJobStatusUpdate(oldStatus, status experimental.JobStatus) errs.ValidationErrorList { +func ValidateJobStatusUpdate(oldStatus, status extensions.JobStatus) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, ValidateJobStatus(&status)...) return allErrs } // ValidateIngress tests if required fields in the Ingress are set. -func ValidateIngress(ingress *experimental.Ingress) errs.ValidationErrorList { +func ValidateIngress(ingress *extensions.Ingress) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMeta(&ingress.ObjectMeta, true, ValidateIngressName).Prefix("metadata")...) allErrs = append(allErrs, ValidateIngressSpec(&ingress.Spec).Prefix("spec")...) @@ -399,7 +399,7 @@ func ValidateIngressName(name string, prefix bool) (bool, string) { } // ValidateIngressSpec tests if required fields in the IngressSpec are set. -func ValidateIngressSpec(spec *experimental.IngressSpec) errs.ValidationErrorList { +func ValidateIngressSpec(spec *extensions.IngressSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} // TODO: Is a default backend mandatory? if spec.Backend != nil { @@ -414,14 +414,14 @@ func ValidateIngressSpec(spec *experimental.IngressSpec) errs.ValidationErrorLis } // ValidateIngressUpdate tests if required fields in the Ingress are set. -func ValidateIngressUpdate(oldIngress, ingress *experimental.Ingress) errs.ValidationErrorList { +func ValidateIngressUpdate(oldIngress, ingress *extensions.Ingress) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} allErrs = append(allErrs, apivalidation.ValidateObjectMetaUpdate(&ingress.ObjectMeta, &oldIngress.ObjectMeta).Prefix("metadata")...) allErrs = append(allErrs, ValidateIngressSpec(&ingress.Spec).Prefix("spec")...) return allErrs } -func validateIngressRules(IngressRules []experimental.IngressRule) errs.ValidationErrorList { +func validateIngressRules(IngressRules []extensions.IngressRule) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if len(IngressRules) == 0 { return append(allErrs, errs.NewFieldRequired("IngressRules")) @@ -442,7 +442,7 @@ func validateIngressRules(IngressRules []experimental.IngressRule) errs.Validati return allErrs } -func validateIngressRuleValue(ingressRule *experimental.IngressRuleValue) errs.ValidationErrorList { +func validateIngressRuleValue(ingressRule *extensions.IngressRuleValue) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if ingressRule.HTTP != nil { allErrs = append(allErrs, validateHTTPIngressRuleValue(ingressRule.HTTP).Prefix("http")...) @@ -450,7 +450,7 @@ func validateIngressRuleValue(ingressRule *experimental.IngressRuleValue) errs.V return allErrs } -func validateHTTPIngressRuleValue(httpIngressRuleValue *experimental.HTTPIngressRuleValue) errs.ValidationErrorList { +func validateHTTPIngressRuleValue(httpIngressRuleValue *extensions.HTTPIngressRuleValue) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if len(httpIngressRuleValue.Paths) == 0 { allErrs = append(allErrs, errs.NewFieldRequired("paths")) @@ -480,7 +480,7 @@ func validateHTTPIngressRuleValue(httpIngressRuleValue *experimental.HTTPIngress } // validateIngressBackend tests if a given backend is valid. -func validateIngressBackend(backend *experimental.IngressBackend) errs.ValidationErrorList { +func validateIngressBackend(backend *extensions.IngressBackend) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} // All backends must reference a single local service by name, and a single service port by name or number. @@ -502,7 +502,7 @@ func validateIngressBackend(backend *experimental.IngressBackend) errs.Validatio return allErrs } -func validateClusterAutoscalerSpec(spec experimental.ClusterAutoscalerSpec) errs.ValidationErrorList { +func validateClusterAutoscalerSpec(spec extensions.ClusterAutoscalerSpec) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if spec.MinNodes < 0 { allErrs = append(allErrs, errs.NewFieldInvalid("minNodes", spec.MinNodes, `must be non-negative`)) @@ -527,7 +527,7 @@ func validateClusterAutoscalerSpec(spec experimental.ClusterAutoscalerSpec) errs return allErrs } -func ValidateClusterAutoscaler(autoscaler *experimental.ClusterAutoscaler) errs.ValidationErrorList { +func ValidateClusterAutoscaler(autoscaler *extensions.ClusterAutoscaler) errs.ValidationErrorList { allErrs := errs.ValidationErrorList{} if autoscaler.Name != "ClusterAutoscaler" { allErrs = append(allErrs, errs.NewFieldInvalid("name", autoscaler.Name, `name must be ClusterAutoscaler`)) diff --git a/pkg/apis/experimental/validation/validation_test.go b/pkg/apis/extensions/validation/validation_test.go similarity index 78% rename from pkg/apis/experimental/validation/validation_test.go rename to pkg/apis/extensions/validation/validation_test.go index 54620d0d217..51ef586d0e9 100644 --- a/pkg/apis/experimental/validation/validation_test.go +++ b/pkg/apis/extensions/validation/validation_test.go @@ -23,25 +23,25 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/util" errors "k8s.io/kubernetes/pkg/util/fielderrors" ) func TestValidateHorizontalPodAutoscaler(t *testing.T) { - successCases := []experimental.HorizontalPodAutoscaler{ + successCases := []extensions.HorizontalPodAutoscaler{ { ObjectMeta: api.ObjectMeta{ Name: "myautoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Subresource: "scale", }, MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, }, }, } @@ -51,19 +51,19 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { } } - errorCases := map[string]experimental.HorizontalPodAutoscaler{ + errorCases := map[string]extensions.HorizontalPodAutoscaler{ "must be non-negative": { ObjectMeta: api.ObjectMeta{ Name: "myautoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Subresource: "scale", }, MinReplicas: -1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, }, }, "must be bigger or equal to minReplicas": { @@ -71,13 +71,13 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { Name: "myautoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Subresource: "scale", }, MinReplicas: 7, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, }, }, "invalid value": { @@ -85,13 +85,13 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { Name: "myautoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Subresource: "scale", }, MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("-0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("-0.8")}, }, }, "resource not supported": { @@ -99,13 +99,13 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { Name: "myautoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Subresource: "scale", }, MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceName("NotSupportedResource"), Quantity: resource.MustParse("0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceName("NotSupportedResource"), Quantity: resource.MustParse("0.8")}, }, }, "required value": { @@ -113,10 +113,10 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { Name: "myautoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ + Spec: extensions.HorizontalPodAutoscalerSpec{ MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, }, }, } @@ -133,23 +133,23 @@ func TestValidateHorizontalPodAutoscaler(t *testing.T) { func TestValidateDaemonSetStatusUpdate(t *testing.T) { type dsUpdateTest struct { - old experimental.DaemonSet - update experimental.DaemonSet + old extensions.DaemonSet + update extensions.DaemonSet } successCases := []dsUpdateTest{ { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Status: experimental.DaemonSetStatus{ + Status: extensions.DaemonSetStatus{ CurrentNumberScheduled: 1, NumberMisscheduled: 2, DesiredNumberScheduled: 3, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Status: experimental.DaemonSetStatus{ + Status: extensions.DaemonSetStatus{ CurrentNumberScheduled: 1, NumberMisscheduled: 1, DesiredNumberScheduled: 3, @@ -168,17 +168,17 @@ func TestValidateDaemonSetStatusUpdate(t *testing.T) { errorCases := map[string]dsUpdateTest{ "negative values": { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Status: experimental.DaemonSetStatus{ + Status: extensions.DaemonSetStatus{ CurrentNumberScheduled: 1, NumberMisscheduled: 2, DesiredNumberScheduled: 3, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Status: experimental.DaemonSetStatus{ + Status: extensions.DaemonSetStatus{ CurrentNumberScheduled: -1, NumberMisscheduled: -1, DesiredNumberScheduled: -3, @@ -277,53 +277,53 @@ func TestValidateDaemonSetUpdate(t *testing.T) { } type dsUpdateTest struct { - old experimental.DaemonSet - update experimental.DaemonSet + old extensions.DaemonSet + update extensions.DaemonSet } successCases := []dsUpdateTest{ { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, }, { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector2, Template: &validPodTemplateAbc2.Template, }, }, }, { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateNodeSelector.Template, }, @@ -339,80 +339,80 @@ func TestValidateDaemonSetUpdate(t *testing.T) { } errorCases := map[string]dsUpdateTest{ "change daemon name": { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, }, "invalid selector": { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: invalidSelector, Template: &validPodTemplateAbc.Template, }, }, }, "invalid pod": { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &invalidPodTemplate.Template, }, }, }, "change container image": { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateDef.Template, }, }, }, "read-write volume": { - old: experimental.DaemonSet{ + old: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplateAbc.Template, }, }, - update: experimental.DaemonSet{ + update: extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &readWriteVolumePodTemplate.Template, }, @@ -452,17 +452,17 @@ func TestValidateDaemonSet(t *testing.T) { }, }, } - successCases := []experimental.DaemonSet{ + successCases := []extensions.DaemonSet{ { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplate.Template, }, }, { ObjectMeta: api.ObjectMeta{Name: "abc-123", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplate.Template, }, @@ -474,37 +474,37 @@ func TestValidateDaemonSet(t *testing.T) { } } - errorCases := map[string]experimental.DaemonSet{ + errorCases := map[string]extensions.DaemonSet{ "zero-length ID": { ObjectMeta: api.ObjectMeta{Name: "", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplate.Template, }, }, "missing-namespace": { ObjectMeta: api.ObjectMeta{Name: "abc-123"}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplate.Template, }, }, "empty selector": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Template: &validPodTemplate.Template, }, }, "selector_doesnt_match": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: map[string]string{"foo": "bar"}, Template: &validPodTemplate.Template, }, }, "invalid manifest": { ObjectMeta: api.ObjectMeta{Name: "abc", Namespace: api.NamespaceDefault}, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, }, }, @@ -516,7 +516,7 @@ func TestValidateDaemonSet(t *testing.T) { "NoUppercaseOrSpecialCharsLike=Equals": "bar", }, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplate.Template, }, @@ -529,7 +529,7 @@ func TestValidateDaemonSet(t *testing.T) { "NoUppercaseOrSpecialCharsLike=Equals": "bar", }, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Template: &invalidPodTemplate.Template, }, }, @@ -541,7 +541,7 @@ func TestValidateDaemonSet(t *testing.T) { "NoUppercaseOrSpecialCharsLike=Equals": "bar", }, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &validPodTemplate.Template, }, @@ -551,7 +551,7 @@ func TestValidateDaemonSet(t *testing.T) { Name: "abc-123", Namespace: api.NamespaceDefault, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &api.PodTemplateSpec{ Spec: api.PodSpec{ @@ -570,7 +570,7 @@ func TestValidateDaemonSet(t *testing.T) { Name: "abc-123", Namespace: api.NamespaceDefault, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: validSelector, Template: &api.PodTemplateSpec{ Spec: api.PodSpec{ @@ -607,13 +607,13 @@ func TestValidateDaemonSet(t *testing.T) { } } -func validDeployment() *experimental.Deployment { - return &experimental.Deployment{ +func validDeployment() *extensions.Deployment { + return &extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: "abc", Namespace: api.NamespaceDefault, }, - Spec: experimental.DeploymentSpec{ + Spec: extensions.DeploymentSpec{ Selector: map[string]string{ "name": "abc", }, @@ -643,7 +643,7 @@ func validDeployment() *experimental.Deployment { } func TestValidateDeployment(t *testing.T) { - successCases := []*experimental.Deployment{ + successCases := []*extensions.Deployment{ validDeployment(), } for _, successCase := range successCases { @@ -652,8 +652,8 @@ func TestValidateDeployment(t *testing.T) { } } - errorCases := map[string]*experimental.Deployment{} - errorCases["metadata.name: required value"] = &experimental.Deployment{ + errorCases := map[string]*extensions.Deployment{} + errorCases["metadata.name: required value"] = &extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Namespace: api.NamespaceDefault, }, @@ -677,17 +677,17 @@ func TestValidateDeployment(t *testing.T) { // rollingUpdate should be nil for recreate. invalidRecreateDeployment := validDeployment() - invalidRecreateDeployment.Spec.Strategy = experimental.DeploymentStrategy{ - Type: experimental.RecreateDeploymentStrategyType, - RollingUpdate: &experimental.RollingUpdateDeployment{}, + invalidRecreateDeployment.Spec.Strategy = extensions.DeploymentStrategy{ + Type: extensions.RecreateDeploymentStrategyType, + RollingUpdate: &extensions.RollingUpdateDeployment{}, } errorCases["rollingUpdate should be nil when strategy type is Recreate"] = invalidRecreateDeployment // MaxSurge should be in the form of 20%. invalidMaxSurgeDeployment := validDeployment() - invalidMaxSurgeDeployment.Spec.Strategy = experimental.DeploymentStrategy{ - Type: experimental.RollingUpdateDeploymentStrategyType, - RollingUpdate: &experimental.RollingUpdateDeployment{ + invalidMaxSurgeDeployment.Spec.Strategy = extensions.DeploymentStrategy{ + Type: extensions.RollingUpdateDeploymentStrategyType, + RollingUpdate: &extensions.RollingUpdateDeployment{ MaxSurge: util.NewIntOrStringFromString("20Percent"), }, } @@ -695,9 +695,9 @@ func TestValidateDeployment(t *testing.T) { // MaxSurge and MaxUnavailable cannot both be zero. invalidRollingUpdateDeployment := validDeployment() - invalidRollingUpdateDeployment.Spec.Strategy = experimental.DeploymentStrategy{ - Type: experimental.RollingUpdateDeploymentStrategyType, - RollingUpdate: &experimental.RollingUpdateDeployment{ + invalidRollingUpdateDeployment.Spec.Strategy = extensions.DeploymentStrategy{ + Type: extensions.RollingUpdateDeploymentStrategyType, + RollingUpdate: &extensions.RollingUpdateDeployment{ MaxSurge: util.NewIntOrStringFromString("0%"), MaxUnavailable: util.NewIntOrStringFromInt(0), }, @@ -706,9 +706,9 @@ func TestValidateDeployment(t *testing.T) { // MaxUnavailable should not be more than 100%. invalidMaxUnavailableDeployment := validDeployment() - invalidMaxUnavailableDeployment.Spec.Strategy = experimental.DeploymentStrategy{ - Type: experimental.RollingUpdateDeploymentStrategyType, - RollingUpdate: &experimental.RollingUpdateDeployment{ + invalidMaxUnavailableDeployment.Spec.Strategy = extensions.DeploymentStrategy{ + Type: extensions.RollingUpdateDeploymentStrategyType, + RollingUpdate: &extensions.RollingUpdateDeployment{ MaxUnavailable: util.NewIntOrStringFromString("110%"), }, } @@ -736,13 +736,13 @@ func TestValidateJob(t *testing.T) { Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}}, }, } - successCases := []experimental.Job{ + successCases := []extensions.Job{ { ObjectMeta: api.ObjectMeta{ Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, Template: &validPodTemplateSpec, }, @@ -754,13 +754,13 @@ func TestValidateJob(t *testing.T) { } } negative := -1 - errorCases := map[string]experimental.Job{ + errorCases := map[string]extensions.Job{ "spec.parallelism:must be non-negative": { ObjectMeta: api.ObjectMeta{ Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Parallelism: &negative, Selector: validSelector, Template: &validPodTemplateSpec, @@ -771,7 +771,7 @@ func TestValidateJob(t *testing.T) { Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Completions: &negative, Selector: validSelector, Template: &validPodTemplateSpec, @@ -782,7 +782,7 @@ func TestValidateJob(t *testing.T) { Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: map[string]string{}, Template: &validPodTemplateSpec, }, @@ -792,7 +792,7 @@ func TestValidateJob(t *testing.T) { Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, }, }, @@ -801,7 +801,7 @@ func TestValidateJob(t *testing.T) { Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, Template: &api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ @@ -820,7 +820,7 @@ func TestValidateJob(t *testing.T) { Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, Template: &api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ @@ -853,28 +853,28 @@ func TestValidateJob(t *testing.T) { type ingressRules map[string]string func TestValidateIngress(t *testing.T) { - defaultBackend := experimental.IngressBackend{ + defaultBackend := extensions.IngressBackend{ ServiceName: "default-backend", ServicePort: util.IntOrString{Kind: util.IntstrInt, IntVal: 80}, } - newValid := func() experimental.Ingress { - return experimental.Ingress{ + newValid := func() extensions.Ingress { + return extensions.Ingress{ ObjectMeta: api.ObjectMeta{ Name: "foo", Namespace: api.NamespaceDefault, }, - Spec: experimental.IngressSpec{ - Backend: &experimental.IngressBackend{ + Spec: extensions.IngressSpec{ + Backend: &extensions.IngressBackend{ ServiceName: "default-backend", ServicePort: util.IntOrString{Kind: util.IntstrInt, IntVal: 80}, }, - Rules: []experimental.IngressRule{ + Rules: []extensions.IngressRule{ { Host: "foo.bar.com", - IngressRuleValue: experimental.IngressRuleValue{ - HTTP: &experimental.HTTPIngressRuleValue{ - Paths: []experimental.HTTPIngressPath{ + IngressRuleValue: extensions.IngressRuleValue{ + HTTP: &extensions.HTTPIngressRuleValue{ + Paths: []extensions.HTTPIngressPath{ { Path: "/foo", Backend: defaultBackend, @@ -885,7 +885,7 @@ func TestValidateIngress(t *testing.T) { }, }, }, - Status: experimental.IngressStatus{ + Status: extensions.IngressStatus{ LoadBalancer: api.LoadBalancerStatus{ Ingress: []api.LoadBalancerIngress{ {IP: "127.0.0.1"}, @@ -899,21 +899,21 @@ func TestValidateIngress(t *testing.T) { invalidNameBackend := newValid() invalidNameBackend.Spec.Backend.ServiceName = "defaultBackend" noPortBackend := newValid() - noPortBackend.Spec.Backend = &experimental.IngressBackend{ServiceName: defaultBackend.ServiceName} + noPortBackend.Spec.Backend = &extensions.IngressBackend{ServiceName: defaultBackend.ServiceName} noForwardSlashPath := newValid() - noForwardSlashPath.Spec.Rules[0].IngressRuleValue.HTTP.Paths = []experimental.HTTPIngressPath{ + noForwardSlashPath.Spec.Rules[0].IngressRuleValue.HTTP.Paths = []extensions.HTTPIngressPath{ { Path: "invalid", Backend: defaultBackend, }, } noPaths := newValid() - noPaths.Spec.Rules[0].IngressRuleValue.HTTP.Paths = []experimental.HTTPIngressPath{} + noPaths.Spec.Rules[0].IngressRuleValue.HTTP.Paths = []extensions.HTTPIngressPath{} badHost := newValid() badHost.Spec.Rules[0].Host = "foobar:80" badRegexPath := newValid() badPathExpr := "/invalid[" - badRegexPath.Spec.Rules[0].IngressRuleValue.HTTP.Paths = []experimental.HTTPIngressPath{ + badRegexPath.Spec.Rules[0].IngressRuleValue.HTTP.Paths = []extensions.HTTPIngressPath{ { Path: badPathExpr, Backend: defaultBackend, @@ -926,7 +926,7 @@ func TestValidateIngress(t *testing.T) { badHostIP.Spec.Rules[0].Host = hostIP badHostIPErr := fmt.Sprintf("spec.rules.host: invalid value '%v'", hostIP) - errorCases := map[string]experimental.Ingress{ + errorCases := map[string]extensions.Ingress{ "spec.backend.serviceName: required value": servicelessBackend, "spec.backend.serviceName: invalid value": invalidNameBackend, "spec.backend.servicePort: invalid value": noPortBackend, @@ -952,18 +952,18 @@ func TestValidateIngress(t *testing.T) { } func TestValidateClusterAutoscaler(t *testing.T) { - successCases := []experimental.ClusterAutoscaler{ + successCases := []extensions.ClusterAutoscaler{ { ObjectMeta: api.ObjectMeta{ Name: "ClusterAutoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.ClusterAutoscalerSpec{ + Spec: extensions.ClusterAutoscalerSpec{ MinNodes: 1, MaxNodes: 5, - TargetUtilization: []experimental.NodeUtilization{ + TargetUtilization: []extensions.NodeUtilization{ { - Resource: experimental.CpuRequest, + Resource: extensions.CpuRequest, Value: 0.7, }, }, @@ -976,18 +976,18 @@ func TestValidateClusterAutoscaler(t *testing.T) { } } - errorCases := map[string]experimental.ClusterAutoscaler{ + errorCases := map[string]extensions.ClusterAutoscaler{ "name must be ClusterAutoscaler": { ObjectMeta: api.ObjectMeta{ Name: "TestClusterAutoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.ClusterAutoscalerSpec{ + Spec: extensions.ClusterAutoscalerSpec{ MinNodes: 1, MaxNodes: 5, - TargetUtilization: []experimental.NodeUtilization{ + TargetUtilization: []extensions.NodeUtilization{ { - Resource: experimental.CpuRequest, + Resource: extensions.CpuRequest, Value: 0.7, }, }, @@ -998,12 +998,12 @@ func TestValidateClusterAutoscaler(t *testing.T) { Name: "ClusterAutoscaler", Namespace: "test", }, - Spec: experimental.ClusterAutoscalerSpec{ + Spec: extensions.ClusterAutoscalerSpec{ MinNodes: 1, MaxNodes: 5, - TargetUtilization: []experimental.NodeUtilization{ + TargetUtilization: []extensions.NodeUtilization{ { - Resource: experimental.CpuRequest, + Resource: extensions.CpuRequest, Value: 0.7, }, }, @@ -1015,12 +1015,12 @@ func TestValidateClusterAutoscaler(t *testing.T) { Name: "ClusterAutoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.ClusterAutoscalerSpec{ + Spec: extensions.ClusterAutoscalerSpec{ MinNodes: -1, MaxNodes: 5, - TargetUtilization: []experimental.NodeUtilization{ + TargetUtilization: []extensions.NodeUtilization{ { - Resource: experimental.CpuRequest, + Resource: extensions.CpuRequest, Value: 0.7, }, }, @@ -1031,12 +1031,12 @@ func TestValidateClusterAutoscaler(t *testing.T) { Name: "ClusterAutoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.ClusterAutoscalerSpec{ + Spec: extensions.ClusterAutoscalerSpec{ MinNodes: 10, MaxNodes: 5, - TargetUtilization: []experimental.NodeUtilization{ + TargetUtilization: []extensions.NodeUtilization{ { - Resource: experimental.CpuRequest, + Resource: extensions.CpuRequest, Value: 0.7, }, }, @@ -1047,10 +1047,10 @@ func TestValidateClusterAutoscaler(t *testing.T) { Name: "ClusterAutoscaler", Namespace: api.NamespaceDefault, }, - Spec: experimental.ClusterAutoscalerSpec{ + Spec: extensions.ClusterAutoscalerSpec{ MinNodes: 1, MaxNodes: 5, - TargetUtilization: []experimental.NodeUtilization{}, + TargetUtilization: []extensions.NodeUtilization{}, }, }, } diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index 12014d2126c..f516528e2bc 100644 --- a/pkg/apiserver/apiserver.go +++ b/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). diff --git a/pkg/apiserver/handlers_test.go b/pkg/apiserver/handlers_test.go index 18763aac360..029684e7dc7 100644 --- a/pkg/apiserver/handlers_test.go +++ b/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() diff --git a/pkg/client/cache/listers.go b/pkg/client/cache/listers.go index 284d713b75a..060e74e7f78 100644 --- a/pkg/client/cache/listers.go +++ b/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 } diff --git a/pkg/client/cache/listers_test.go b/pkg/client/cache/listers_test.go index aa05582cd56..43f82aab6c0 100644 --- a/pkg/client/cache/listers_test.go +++ b/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", diff --git a/pkg/client/unversioned/client_test.go b/pkg/client/unversioned/client_test.go index 61b13fc44d2..5eec4ffca8a 100644 --- a/pkg/client/unversioned/client_test.go +++ b/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) } diff --git a/pkg/client/unversioned/conditions.go b/pkg/client/unversioned/conditions.go index b0df788d2fa..2ab51766ed6 100644 --- a/pkg/client/unversioned/conditions.go +++ b/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) diff --git a/pkg/client/unversioned/daemon_sets.go b/pkg/client/unversioned/daemon_sets.go index eb15bf2f2ad..56cc0d8f084 100644 --- a/pkg/client/unversioned/daemon_sets.go +++ b/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 } diff --git a/pkg/client/unversioned/daemon_sets_test.go b/pkg/client/unversioned/daemon_sets_test.go index b80eca8074a..1cfd8bbedfc 100644 --- a/pkg/client/unversioned/daemon_sets_test.go +++ b/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{}, }, }, diff --git a/pkg/client/unversioned/deployment.go b/pkg/client/unversioned/deployment.go index a4e2924858a..eed4482ad82 100644 --- a/pkg/client/unversioned/deployment.go +++ b/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 } diff --git a/pkg/client/unversioned/deployment_test.go b/pkg/client/unversioned/deployment_test.go index 6d41c18248b..0a94a5f8c9c 100644 --- a/pkg/client/unversioned/deployment_test.go +++ b/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}, diff --git a/pkg/client/unversioned/experimental.go b/pkg/client/unversioned/experimental.go index f93b42f00bd..03d90d033a2 100644 --- a/pkg/client/unversioned/experimental.go +++ b/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 { diff --git a/pkg/client/unversioned/helper.go b/pkg/client/unversioned/helper.go index db903cd9f4c..d3ccd30d19b 100644 --- a/pkg/client/unversioned/helper.go +++ b/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 diff --git a/pkg/client/unversioned/horizontalpodautoscaler.go b/pkg/client/unversioned/horizontalpodautoscaler.go index 94f8030b64a..a2c5150d2ed 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler.go +++ b/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 } diff --git a/pkg/client/unversioned/horizontalpodautoscaler_test.go b/pkg/client/unversioned/horizontalpodautoscaler_test.go index 020defc813a..60abbdea38a 100644 --- a/pkg/client/unversioned/horizontalpodautoscaler_test.go +++ b/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}, } diff --git a/pkg/client/unversioned/import_known_versions.go b/pkg/client/unversioned/import_known_versions.go index ded32975213..e0549772e29 100644 --- a/pkg/client/unversioned/import_known_versions.go +++ b/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" ) diff --git a/pkg/client/unversioned/ingress.go b/pkg/client/unversioned/ingress.go index b0dd6e61331..884f2ea8c4a 100644 --- a/pkg/client/unversioned/ingress.go +++ b/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 } diff --git a/pkg/client/unversioned/ingress_test.go b/pkg/client/unversioned/ingress_test.go index 0fd194baff7..9df5ccd4b6e 100644 --- a/pkg/client/unversioned/ingress_test.go +++ b/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{}, }, }, }, diff --git a/pkg/client/unversioned/jobs.go b/pkg/client/unversioned/jobs.go index 22ab6610e90..40b66e2b9cb 100644 --- a/pkg/client/unversioned/jobs.go +++ b/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 } diff --git a/pkg/client/unversioned/jobs_test.go b/pkg/client/unversioned/jobs_test.go index ed79450227d..439b6673a6f 100644 --- a/pkg/client/unversioned/jobs_test.go +++ b/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{}, }, }, diff --git a/pkg/client/unversioned/scale.go b/pkg/client/unversioned/scale.go index 8b664eb6750..486a0213578 100644 --- a/pkg/client/unversioned/scale.go +++ b/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). diff --git a/pkg/client/unversioned/testclient/fake_daemon_sets.go b/pkg/client/unversioned/testclient/fake_daemon_sets.go index 5b40af9ba57..b11bce0ac4c 100644 --- a/pkg/client/unversioned/testclient/fake_daemon_sets.go +++ b/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 } diff --git a/pkg/client/unversioned/testclient/fake_deployments.go b/pkg/client/unversioned/testclient/fake_deployments.go index 9433a385805..6febc129827 100644 --- a/pkg/client/unversioned/testclient/fake_deployments.go +++ b/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 } diff --git a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go b/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go index c7c92027686..9a0051f1794 100644 --- a/pkg/client/unversioned/testclient/fake_horizontal_pod_autoscalers.go +++ b/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 } diff --git a/pkg/client/unversioned/testclient/fake_ingress.go b/pkg/client/unversioned/testclient/fake_ingress.go index 478fb9392d1..30be16ffb83 100644 --- a/pkg/client/unversioned/testclient/fake_ingress.go +++ b/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 } diff --git a/pkg/client/unversioned/testclient/fake_jobs.go b/pkg/client/unversioned/testclient/fake_jobs.go index 63a43903fa2..6bd1e71802a 100644 --- a/pkg/client/unversioned/testclient/fake_jobs.go +++ b/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 } diff --git a/pkg/client/unversioned/testclient/fake_scales.go b/pkg/client/unversioned/testclient/fake_scales.go index 9c29f61e4f0..53ff5f87df3 100644 --- a/pkg/client/unversioned/testclient/fake_scales.go +++ b/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 } diff --git a/pkg/controller/daemon/controller.go b/pkg/controller/daemon/controller.go index 6873e10d301..ed4ac29fe26 100644 --- a/pkg/controller/daemon/controller.go +++ b/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] } diff --git a/pkg/controller/daemon/controller_test.go b/pkg/controller/daemon/controller_test.go index bbbc3c79465..56adeb531b7 100644 --- a/pkg/controller/daemon/controller_test.go +++ b/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.") diff --git a/pkg/controller/deployment/deployment_controller.go b/pkg/controller/deployment/deployment_controller.go index aae11ac5fe7..c854ef28925 100644 --- a/pkg/controller/deployment/deployment_controller.go +++ b/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) } diff --git a/pkg/controller/deployment/deployment_controller_test.go b/pkg/controller/deployment/deployment_controller_test.go index 591ac142427..e1359f00e20 100644 --- a/pkg/controller/deployment/deployment_controller_test.go +++ b/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" diff --git a/pkg/controller/job/controller.go b/pkg/controller/job/controller.go index 86c5d5006be..16f79ea0fef 100644 --- a/pkg/controller/job/controller.go +++ b/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] } diff --git a/pkg/controller/job/controller_test.go b/pkg/controller/job/controller_test.go index 77e06e4fafc..d73b61603bf 100644 --- a/pkg/controller/job/controller_test.go +++ b/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: ¶llelism, 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) } diff --git a/pkg/controller/persistentvolume/types.go b/pkg/controller/persistentvolume/types.go index 9d015fbf70f..adf1e289b63 100644 --- a/pkg/controller/persistentvolume/types.go +++ b/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. diff --git a/pkg/controller/podautoscaler/horizontal.go b/pkg/controller/podautoscaler/horizontal.go index dbe82caeed7..a1228943643 100644 --- a/pkg/controller/podautoscaler/horizontal.go +++ b/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, diff --git a/pkg/controller/podautoscaler/horizontal_test.go b/pkg/controller/podautoscaler/horizontal_test.go index 17de187a695..4b96a675878 100644 --- a/pkg/controller/podautoscaler/horizontal_test.go +++ b/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) diff --git a/pkg/controller/podautoscaler/metrics/metrics_client.go b/pkg/controller/podautoscaler/metrics/metrics_client.go index 1460a049429..68497f2b768 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client.go +++ b/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) diff --git a/pkg/controller/podautoscaler/metrics/metrics_client_test.go b/pkg/controller/podautoscaler/metrics/metrics_client_test.go index 478d2a65699..86dd1d02046 100644 --- a/pkg/controller/podautoscaler/metrics/metrics_client_test.go +++ b/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 diff --git a/pkg/conversion/unversioned_test.go b/pkg/conversion/unversioned_test.go index 3a4a1c22083..a637ee09fe7 100644 --- a/pkg/conversion/unversioned_test.go +++ b/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) diff --git a/pkg/kubectl/cmd/util/factory.go b/pkg/kubectl/cmd/util/factory.go index ea41a5f1769..5bfdd44c09b 100644 --- a/pkg/kubectl/cmd/util/factory.go +++ b/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") } diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index 141df607322..17e74ba9e9a 100644 --- a/pkg/kubectl/describe.go +++ b/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) { diff --git a/pkg/kubectl/describe_test.go b/pkg/kubectl/describe_test.go index dedc3089592..01476ec71f8 100644 --- a/pkg/kubectl/describe_test.go +++ b/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{}, }, }) diff --git a/pkg/kubectl/resource_printer.go b/pkg/kubectl/resource_printer.go index 30c7acf716f..b90384090d1 100644 --- a/pkg/kubectl/resource_printer.go +++ b/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 diff --git a/pkg/kubectl/resource_printer_test.go b/pkg/kubectl/resource_printer_test.go index 8da7c6db8f5..817f093ab97 100644 --- a/pkg/kubectl/resource_printer_test.go +++ b/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, }, diff --git a/pkg/kubectl/scale.go b/pkg/kubectl/scale.go index 98ca4c74193..f6f10c3028e 100644 --- a/pkg/kubectl/scale.go +++ b/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"} } diff --git a/pkg/kubectl/scale_test.go b/pkg/kubectl/scale_test.go index 21015010c76..cea39a90509 100644 --- a/pkg/kubectl/scale_test.go +++ b/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, }, }, diff --git a/pkg/kubectl/stop_test.go b/pkg/kubectl/stop_test.go index 3e6a85e1885..c640d7712da 100644 --- a/pkg/kubectl/stop_test.go +++ b/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"}}, }, diff --git a/pkg/master/import_known_versions.go b/pkg/master/import_known_versions.go index af2c9052e21..210e8cc2eac 100644 --- a/pkg/master/import_known_versions.go +++ b/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" ) diff --git a/pkg/master/master.go b/pkg/master/master.go index 6cd65bf677b..439f04609b9 100644 --- a/pkg/master/master.go +++ b/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, diff --git a/pkg/master/master_test.go b/pkg/master/master_test.go index 022d577f93f..f00f76b9de0 100644 --- a/pkg/master/master_test.go +++ b/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) } diff --git a/pkg/master/thirdparty_controller.go b/pkg/master/thirdparty_controller.go index f2e5ab4a912..806de9f45f4 100644 --- a/pkg/master/thirdparty_controller.go +++ b/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" diff --git a/pkg/master/thirdparty_controller_test.go b/pkg/master/thirdparty_controller_test.go index 4fe37584065..47f618a7e42 100644 --- a/pkg/master/thirdparty_controller_test.go +++ b/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" ) diff --git a/pkg/registry/daemonset/etcd/etcd.go b/pkg/registry/daemonset/etcd/etcd.go index 8811be623fa..a65e311ca49 100644 --- a/pkg/registry/daemonset/etcd/etcd.go +++ b/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. diff --git a/pkg/registry/daemonset/etcd/etcd_test.go b/pkg/registry/daemonset/etcd/etcd_test.go index 798cace9fc3..c86b4d7bb98 100755 --- a/pkg/registry/daemonset/etcd/etcd_test.go +++ b/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 }, diff --git a/pkg/registry/daemonset/strategy.go b/pkg/registry/daemonset/strategy.go index 924ecadd3c9..3d03802fc80 100644 --- a/pkg/registry/daemonset/strategy.go +++ b/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)) } diff --git a/pkg/registry/deployment/etcd/etcd.go b/pkg/registry/deployment/etcd/etcd.go index ddb576a51d5..ce349607767 100644 --- a/pkg/registry/deployment/etcd/etcd.go +++ b/pkg/registry/deployment/etcd/etcd.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/errors" "k8s.io/kubernetes/pkg/api/rest" - "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/deployment" @@ -56,9 +56,9 @@ type REST struct { func NewREST(s storage.Interface) *REST { prefix := "/deployments" store := &etcdgeneric.Etcd{ - NewFunc: func() runtime.Object { return &experimental.Deployment{} }, + NewFunc: func() runtime.Object { return &extensions.Deployment{} }, // NewListFunc returns an object capable of storing results of an etcd list. - NewListFunc: func() runtime.Object { return &experimental.DeploymentList{} }, + NewListFunc: func() runtime.Object { return &extensions.DeploymentList{} }, // 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 { @@ -71,7 +71,7 @@ func NewREST(s storage.Interface) *REST { }, // Retrieve the name field of a deployment. ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*experimental.Deployment).Name, nil + return obj.(*extensions.Deployment).Name, nil }, // Used to match objects based on labels/fields for list. PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { @@ -99,7 +99,7 @@ var _ = rest.Patcher(&ScaleREST{}) // New creates a new Scale object func (r *ScaleREST) New() runtime.Object { - return &experimental.Scale{} + return &extensions.Scale{} } func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { @@ -107,16 +107,16 @@ func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { if err != nil { return nil, errors.NewNotFound("scale", name) } - return &experimental.Scale{ + return &extensions.Scale{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: deployment.Namespace, CreationTimestamp: deployment.CreationTimestamp, }, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: deployment.Spec.Replicas, }, - Status: experimental.ScaleStatus{ + Status: extensions.ScaleStatus{ Replicas: deployment.Status.Replicas, Selector: deployment.Spec.Selector, }, @@ -127,7 +127,7 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, if obj == nil { return nil, false, errors.NewBadRequest(fmt.Sprintf("nil update passed to Scale")) } - scale, ok := obj.(*experimental.Scale) + scale, ok := obj.(*extensions.Scale) if !ok { return nil, false, errors.NewBadRequest(fmt.Sprintf("wrong object passed to Scale update: %v", obj)) } @@ -140,16 +140,16 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, if err != nil { return nil, false, errors.NewConflict("scale", scale.Name, err) } - return &experimental.Scale{ + return &extensions.Scale{ ObjectMeta: api.ObjectMeta{ Name: deployment.Name, Namespace: deployment.Namespace, CreationTimestamp: deployment.CreationTimestamp, }, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: deployment.Spec.Replicas, }, - Status: experimental.ScaleStatus{ + Status: extensions.ScaleStatus{ Replicas: deployment.Status.Replicas, Selector: deployment.Spec.Selector, }, diff --git a/pkg/registry/deployment/etcd/etcd_test.go b/pkg/registry/deployment/etcd/etcd_test.go index 23d57cb623f..a81124969bd 100755 --- a/pkg/registry/deployment/etcd/etcd_test.go +++ b/pkg/registry/deployment/etcd/etcd_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" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -32,7 +32,7 @@ import ( ) func newStorage(t *testing.T) (*DeploymentStorage, *tools.FakeEtcdClient) { - etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "experimental") + etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "extensions") deploymentStorage := NewStorage(etcdStorage) return &deploymentStorage, fakeClient } @@ -40,13 +40,13 @@ func newStorage(t *testing.T) (*DeploymentStorage, *tools.FakeEtcdClient) { var namespace = "foo-namespace" var name = "foo-deployment" -func validNewDeployment() *experimental.Deployment { - return &experimental.Deployment{ +func validNewDeployment() *extensions.Deployment { + return &extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: namespace, }, - Spec: experimental.DeploymentSpec{ + Spec: extensions.DeploymentSpec{ Selector: map[string]string{"a": "b"}, Template: &api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ @@ -67,7 +67,7 @@ func validNewDeployment() *experimental.Deployment { UniqueLabelKey: "my-label", Replicas: 7, }, - Status: experimental.DeploymentStatus{ + Status: extensions.DeploymentStatus{ Replicas: 5, }, } @@ -75,13 +75,13 @@ func validNewDeployment() *experimental.Deployment { var validDeployment = *validNewDeployment() -func validNewScale() *experimental.Scale { - return &experimental.Scale{ +func validNewScale() *extensions.Scale { + return &extensions.Scale{ ObjectMeta: api.ObjectMeta{Name: name, Namespace: namespace}, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: validDeployment.Spec.Replicas, }, - Status: experimental.ScaleStatus{ + Status: extensions.ScaleStatus{ Replicas: validDeployment.Status.Replicas, Selector: validDeployment.Spec.Template.Labels, }, @@ -99,8 +99,8 @@ func TestCreate(t *testing.T) { // valid deployment, // invalid (invalid selector) - &experimental.Deployment{ - Spec: experimental.DeploymentSpec{ + &extensions.Deployment{ + Spec: extensions.DeploymentSpec{ Selector: map[string]string{}, Template: validDeployment.Spec.Template, }, @@ -116,28 +116,28 @@ func TestUpdate(t *testing.T) { validNewDeployment(), // updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Deployment) + object := obj.(*extensions.Deployment) object.Spec.Template.Spec.NodeSelector = map[string]string{"c": "d"} return object }, // invalid updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Deployment) + object := obj.(*extensions.Deployment) object.UID = "newUID" return object }, func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Deployment) + object := obj.(*extensions.Deployment) object.Name = "" return object }, func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Deployment) + object := obj.(*extensions.Deployment) object.Spec.Template.Spec.RestartPolicy = api.RestartPolicyOnFailure return object }, func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Deployment) + object := obj.(*extensions.Deployment) object.Spec.Selector = map[string]string{} return object }, @@ -191,13 +191,13 @@ func TestScaleGet(t *testing.T) { ctx := api.WithNamespace(api.NewContext(), namespace) key := etcdtest.AddPrefix("/deployments/" + namespace + "/" + name) - if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Experimental.Codec(), &validDeployment), 0); err != nil { + if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Extensions.Codec(), &validDeployment), 0); err != nil { t.Fatalf("unexpected error: %v", err) } expect := &validScale obj, err := storage.Scale.Get(ctx, name) - scale := obj.(*experimental.Scale) + scale := obj.(*extensions.Scale) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -211,13 +211,13 @@ func TestScaleUpdate(t *testing.T) { ctx := api.WithNamespace(api.NewContext(), namespace) key := etcdtest.AddPrefix("/deployments/" + namespace + "/" + name) - if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Experimental.Codec(), &validDeployment), 0); err != nil { + if _, err := fakeClient.Set(key, runtime.EncodeOrDie(testapi.Extensions.Codec(), &validDeployment), 0); err != nil { t.Fatalf("unexpected error: %v", err) } replicas := 12 - update := experimental.Scale{ + update := extensions.Scale{ ObjectMeta: api.ObjectMeta{Name: name, Namespace: namespace}, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: replicas, }, } @@ -230,8 +230,8 @@ func TestScaleUpdate(t *testing.T) { t.Fatalf("unexpected error: %v", err) } - var deployment experimental.Deployment - testapi.Experimental.Codec().DecodeInto([]byte(response.Node.Value), &deployment) + var deployment extensions.Deployment + testapi.Extensions.Codec().DecodeInto([]byte(response.Node.Value), &deployment) if deployment.Spec.Replicas != replicas { t.Errorf("wrong replicas count expected: %d got: %d", replicas, deployment.Spec.Replicas) } diff --git a/pkg/registry/deployment/registry.go b/pkg/registry/deployment/registry.go index fcf324ce2ae..12e76a25a92 100644 --- a/pkg/registry/deployment/registry.go +++ b/pkg/registry/deployment/registry.go @@ -21,17 +21,17 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" ) // Registry is an interface for things that know how to store Deployments. type Registry interface { - ListDeployments(ctx api.Context, label labels.Selector, field fields.Selector) (*experimental.DeploymentList, error) - GetDeployment(ctx api.Context, deploymentID string) (*experimental.Deployment, error) - CreateDeployment(ctx api.Context, deployment *experimental.Deployment) (*experimental.Deployment, error) - UpdateDeployment(ctx api.Context, deployment *experimental.Deployment) (*experimental.Deployment, error) + ListDeployments(ctx api.Context, label labels.Selector, field fields.Selector) (*extensions.DeploymentList, error) + GetDeployment(ctx api.Context, deploymentID string) (*extensions.Deployment, error) + CreateDeployment(ctx api.Context, deployment *extensions.Deployment) (*extensions.Deployment, error) + UpdateDeployment(ctx api.Context, deployment *extensions.Deployment) (*extensions.Deployment, error) DeleteDeployment(ctx api.Context, deploymentID string) error } @@ -46,7 +46,7 @@ func NewRegistry(s rest.StandardStorage) Registry { } // List obtains a list of Deployments that match selector. -func (s *storage) ListDeployments(ctx api.Context, label labels.Selector, field fields.Selector) (*experimental.DeploymentList, error) { +func (s *storage) ListDeployments(ctx api.Context, label labels.Selector, field fields.Selector) (*extensions.DeploymentList, error) { if !field.Empty() { return nil, fmt.Errorf("field selector not supported yet") } @@ -54,31 +54,31 @@ func (s *storage) ListDeployments(ctx api.Context, label labels.Selector, field if err != nil { return nil, err } - return obj.(*experimental.DeploymentList), err + return obj.(*extensions.DeploymentList), err } -func (s *storage) GetDeployment(ctx api.Context, deploymentID string) (*experimental.Deployment, error) { +func (s *storage) GetDeployment(ctx api.Context, deploymentID string) (*extensions.Deployment, error) { obj, err := s.Get(ctx, deploymentID) if err != nil { return nil, err } - return obj.(*experimental.Deployment), nil + return obj.(*extensions.Deployment), nil } -func (s *storage) CreateDeployment(ctx api.Context, deployment *experimental.Deployment) (*experimental.Deployment, error) { +func (s *storage) CreateDeployment(ctx api.Context, deployment *extensions.Deployment) (*extensions.Deployment, error) { obj, err := s.Create(ctx, deployment) if err != nil { return nil, err } - return obj.(*experimental.Deployment), nil + return obj.(*extensions.Deployment), nil } -func (s *storage) UpdateDeployment(ctx api.Context, deployment *experimental.Deployment) (*experimental.Deployment, error) { +func (s *storage) UpdateDeployment(ctx api.Context, deployment *extensions.Deployment) (*extensions.Deployment, error) { obj, _, err := s.Update(ctx, deployment) if err != nil { return nil, err } - return obj.(*experimental.Deployment), nil + return obj.(*extensions.Deployment), nil } func (s *storage) DeleteDeployment(ctx api.Context, deploymentID string) error { diff --git a/pkg/registry/deployment/strategy.go b/pkg/registry/deployment/strategy.go index c865927f751..01b651c08da 100644 --- a/pkg/registry/deployment/strategy.go +++ b/pkg/registry/deployment/strategy.go @@ -20,8 +20,8 @@ import ( "fmt" "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" @@ -50,7 +50,7 @@ func (deploymentStrategy) PrepareForCreate(obj runtime.Object) { // Validate validates a new deployment. func (deploymentStrategy) Validate(ctx api.Context, obj runtime.Object) errs.ValidationErrorList { - deployment := obj.(*experimental.Deployment) + deployment := obj.(*extensions.Deployment) return validation.ValidateDeployment(deployment) } @@ -65,7 +65,7 @@ func (deploymentStrategy) PrepareForUpdate(obj, old runtime.Object) { // ValidateUpdate is the default update validation for an end user. func (deploymentStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) errs.ValidationErrorList { - return validation.ValidateDeploymentUpdate(old.(*experimental.Deployment), obj.(*experimental.Deployment)) + return validation.ValidateDeploymentUpdate(old.(*extensions.Deployment), obj.(*extensions.Deployment)) } func (deploymentStrategy) AllowUnconditionalUpdate() bool { @@ -73,7 +73,7 @@ func (deploymentStrategy) AllowUnconditionalUpdate() bool { } // DeploymentToSelectableFields returns a field set that represents the object. -func DeploymentToSelectableFields(deployment *experimental.Deployment) fields.Set { +func DeploymentToSelectableFields(deployment *extensions.Deployment) fields.Set { return fields.Set{ "metadata.name": deployment.Name, } @@ -87,7 +87,7 @@ func MatchDeployment(label labels.Selector, field fields.Selector) generic.Match Label: label, Field: field, GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) { - deployment, ok := obj.(*experimental.Deployment) + deployment, ok := obj.(*extensions.Deployment) if !ok { return nil, nil, fmt.Errorf("given object is not a deployment.") } diff --git a/pkg/registry/experimental/controller/etcd/etcd.go b/pkg/registry/experimental/controller/etcd/etcd.go index 37bbf42a1f7..fc4cfe8161d 100644 --- a/pkg/registry/experimental/controller/etcd/etcd.go +++ b/pkg/registry/experimental/controller/etcd/etcd.go @@ -28,7 +28,7 @@ import ( "k8s.io/kubernetes/pkg/registry/controller" "k8s.io/kubernetes/pkg/registry/controller/etcd" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" ) // Container includes dummy storage for RC pods and experimental storage for Scale. @@ -57,7 +57,7 @@ var _ = rest.Patcher(&ScaleREST{}) // New creates a new Scale object func (r *ScaleREST) New() runtime.Object { - return &experimental.Scale{} + return &extensions.Scale{} } func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { @@ -65,16 +65,16 @@ func (r *ScaleREST) Get(ctx api.Context, name string) (runtime.Object, error) { if err != nil { return nil, errors.NewNotFound("scale", name) } - return &experimental.Scale{ + return &extensions.Scale{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: rc.Namespace, CreationTimestamp: rc.CreationTimestamp, }, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: rc.Spec.Replicas, }, - Status: experimental.ScaleStatus{ + Status: extensions.ScaleStatus{ Replicas: rc.Status.Replicas, Selector: rc.Spec.Selector, }, @@ -85,7 +85,7 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, if obj == nil { return nil, false, errors.NewBadRequest(fmt.Sprintf("nil update passed to Scale")) } - scale, ok := obj.(*experimental.Scale) + scale, ok := obj.(*extensions.Scale) if !ok { return nil, false, errors.NewBadRequest(fmt.Sprintf("wrong object passed to Scale update: %v", obj)) } @@ -98,16 +98,16 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, if err != nil { return nil, false, errors.NewConflict("scale", scale.Name, err) } - return &experimental.Scale{ + return &extensions.Scale{ ObjectMeta: api.ObjectMeta{ Name: rc.Name, Namespace: rc.Namespace, CreationTimestamp: rc.CreationTimestamp, }, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: rc.Spec.Replicas, }, - Status: experimental.ScaleStatus{ + Status: extensions.ScaleStatus{ Replicas: rc.Status.Replicas, Selector: rc.Spec.Selector, }, @@ -118,5 +118,5 @@ func (r *ScaleREST) Update(ctx api.Context, obj runtime.Object) (runtime.Object, type RcREST struct{} func (r *RcREST) New() runtime.Object { - return &experimental.ReplicationControllerDummy{} + return &extensions.ReplicationControllerDummy{} } diff --git a/pkg/registry/experimental/controller/etcd/etcd_test.go b/pkg/registry/experimental/controller/etcd/etcd_test.go index c4b600cd7af..f1732ece806 100644 --- a/pkg/registry/experimental/controller/etcd/etcd_test.go +++ b/pkg/registry/experimental/controller/etcd/etcd_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/registry/registrytest" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/tools" @@ -66,12 +66,12 @@ var validController = api.ReplicationController{ Spec: validControllerSpec, } -var validScale = experimental.Scale{ +var validScale = extensions.Scale{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test"}, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: validReplicas, }, - Status: experimental.ScaleStatus{ + Status: extensions.ScaleStatus{ Replicas: 0, Selector: validPodTemplate.Template.Labels, }, @@ -88,7 +88,7 @@ func TestGet(t *testing.T) { expect := &validScale obj, err := storage.Get(ctx, "foo") - scale := obj.(*experimental.Scale) + scale := obj.(*extensions.Scale) if err != nil { t.Fatalf("unexpected error: %v", err) } @@ -106,9 +106,9 @@ func TestUpdate(t *testing.T) { t.Fatalf("unexpected error: %v", err) } replicas := 12 - update := experimental.Scale{ + update := extensions.Scale{ ObjectMeta: api.ObjectMeta{Name: "foo", Namespace: "test"}, - Spec: experimental.ScaleSpec{ + Spec: extensions.ScaleSpec{ Replicas: replicas, }, } @@ -122,7 +122,7 @@ func TestUpdate(t *testing.T) { } var controller api.ReplicationController - testapi.Experimental.Codec().DecodeInto([]byte(response.Node.Value), &controller) + testapi.Extensions.Codec().DecodeInto([]byte(response.Node.Value), &controller) if controller.Spec.Replicas != replicas { t.Errorf("wrong replicas count expected: %d got: %d", replicas, controller.Spec.Replicas) } diff --git a/pkg/registry/horizontalpodautoscaler/etcd/etcd.go b/pkg/registry/horizontalpodautoscaler/etcd/etcd.go index b620cfe9d89..557416e8d29 100644 --- a/pkg/registry/horizontalpodautoscaler/etcd/etcd.go +++ b/pkg/registry/horizontalpodautoscaler/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/generic" @@ -36,9 +36,9 @@ type REST struct { func NewREST(s storage.Interface) *REST { prefix := "/horizontalpodautoscalers" store := &etcdgeneric.Etcd{ - NewFunc: func() runtime.Object { return &experimental.HorizontalPodAutoscaler{} }, + NewFunc: func() runtime.Object { return &extensions.HorizontalPodAutoscaler{} }, // NewListFunc returns an object capable of storing results of an etcd list. - NewListFunc: func() runtime.Object { return &experimental.HorizontalPodAutoscalerList{} }, + NewListFunc: func() runtime.Object { return &extensions.HorizontalPodAutoscalerList{} }, // 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 { @@ -51,7 +51,7 @@ func NewREST(s storage.Interface) *REST { }, // Retrieve the name field of an autoscaler ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*experimental.HorizontalPodAutoscaler).Name, nil + return obj.(*extensions.HorizontalPodAutoscaler).Name, nil }, // Used to match objects based on labels/fields for list PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { diff --git a/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go b/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go index 2354f708777..0d5644f5a71 100644 --- a/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go +++ b/pkg/registry/horizontalpodautoscaler/etcd/etcd_test.go @@ -21,9 +21,9 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/apis/experimental" - // Ensure that experimental/v1alpha1 package is initialized. - _ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1" + "k8s.io/kubernetes/pkg/apis/extensions" + // Ensure that extensions/v1beta1 package is initialized. + _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -32,23 +32,23 @@ import ( ) func newStorage(t *testing.T) (*REST, *tools.FakeEtcdClient) { - etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "experimental") + etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "extensions") return NewREST(etcdStorage), fakeClient } -func validNewHorizontalPodAutoscaler(name string) *experimental.HorizontalPodAutoscaler { - return &experimental.HorizontalPodAutoscaler{ +func validNewHorizontalPodAutoscaler(name string) *extensions.HorizontalPodAutoscaler { + return &extensions.HorizontalPodAutoscaler{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Subresource: "scale", }, MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse("0.8")}, }, } } @@ -62,7 +62,7 @@ func TestCreate(t *testing.T) { // valid autoscaler, // invalid - &experimental.HorizontalPodAutoscaler{}, + &extensions.HorizontalPodAutoscaler{}, ) } @@ -74,7 +74,7 @@ func TestUpdate(t *testing.T) { validNewHorizontalPodAutoscaler("foo"), // updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.HorizontalPodAutoscaler) + object := obj.(*extensions.HorizontalPodAutoscaler) object.Spec.MaxReplicas = object.Spec.MaxReplicas + 1 return object }, diff --git a/pkg/registry/horizontalpodautoscaler/strategy.go b/pkg/registry/horizontalpodautoscaler/strategy.go index 88aa5c8f54c..e5da945dbe3 100644 --- a/pkg/registry/horizontalpodautoscaler/strategy.go +++ b/pkg/registry/horizontalpodautoscaler/strategy.go @@ -20,8 +20,8 @@ import ( "fmt" "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,12 +46,12 @@ func (autoscalerStrategy) NamespaceScoped() bool { // PrepareForCreate clears fields that are not allowed to be set by end users on creation. func (autoscalerStrategy) PrepareForCreate(obj runtime.Object) { - _ = obj.(*experimental.HorizontalPodAutoscaler) + _ = obj.(*extensions.HorizontalPodAutoscaler) } // Validate validates a new autoscaler. func (autoscalerStrategy) Validate(ctx api.Context, obj runtime.Object) errs.ValidationErrorList { - autoscaler := obj.(*experimental.HorizontalPodAutoscaler) + autoscaler := obj.(*extensions.HorizontalPodAutoscaler) return validation.ValidateHorizontalPodAutoscaler(autoscaler) } @@ -62,19 +62,19 @@ func (autoscalerStrategy) AllowCreateOnUpdate() bool { // PrepareForUpdate clears fields that are not allowed to be set by end users on update. func (autoscalerStrategy) PrepareForUpdate(obj, old runtime.Object) { - _ = obj.(*experimental.HorizontalPodAutoscaler) + _ = obj.(*extensions.HorizontalPodAutoscaler) } // ValidateUpdate is the default update validation for an end user. func (autoscalerStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) errs.ValidationErrorList { - return validation.ValidateHorizontalPodAutoscalerUpdate(obj.(*experimental.HorizontalPodAutoscaler), old.(*experimental.HorizontalPodAutoscaler)) + return validation.ValidateHorizontalPodAutoscalerUpdate(obj.(*extensions.HorizontalPodAutoscaler), old.(*extensions.HorizontalPodAutoscaler)) } func (autoscalerStrategy) AllowUnconditionalUpdate() bool { return true } -func AutoscalerToSelectableFields(limitRange *experimental.HorizontalPodAutoscaler) fields.Set { +func AutoscalerToSelectableFields(limitRange *extensions.HorizontalPodAutoscaler) fields.Set { return fields.Set{} } @@ -83,7 +83,7 @@ func MatchAutoscaler(label labels.Selector, field fields.Selector) generic.Match Label: label, Field: field, GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) { - hpa, ok := obj.(*experimental.HorizontalPodAutoscaler) + hpa, ok := obj.(*extensions.HorizontalPodAutoscaler) if !ok { return nil, nil, fmt.Errorf("given object is not a horizontal pod autoscaler.") } diff --git a/pkg/registry/ingress/etcd/etcd.go b/pkg/registry/ingress/etcd/etcd.go index 5614bec2e11..b9f3c61650c 100644 --- a/pkg/registry/ingress/etcd/etcd.go +++ b/pkg/registry/ingress/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/generic" @@ -40,10 +40,10 @@ type REST struct { // NewREST returns a RESTStorage object that will work against replication controllers. func NewREST(s storage.Interface) *REST { store := &etcdgeneric.Etcd{ - NewFunc: func() runtime.Object { return &experimental.Ingress{} }, + NewFunc: func() runtime.Object { return &extensions.Ingress{} }, // NewListFunc returns an object capable of storing results of an etcd list. - NewListFunc: func() runtime.Object { return &experimental.IngressList{} }, + NewListFunc: func() runtime.Object { return &extensions.IngressList{} }, // Produces a ingress 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 { @@ -56,7 +56,7 @@ func NewREST(s storage.Interface) *REST { }, // Retrieve the name field of a replication controller ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*experimental.Ingress).Name, nil + return obj.(*extensions.Ingress).Name, nil }, // Used to match objects based on labels/fields for list and watch PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { diff --git a/pkg/registry/ingress/etcd/etcd_test.go b/pkg/registry/ingress/etcd/etcd_test.go index 6efaf0481ab..b5ecd92b380 100755 --- a/pkg/registry/ingress/etcd/etcd_test.go +++ b/pkg/registry/ingress/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" @@ -30,7 +30,7 @@ import ( ) func newStorage(t *testing.T) (*REST, *tools.FakeEtcdClient) { - etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "experimental") + etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "extensions") ingressStorage := NewREST(etcdStorage) return ingressStorage, fakeClient } @@ -48,12 +48,12 @@ var ( type IngressRuleValues map[string]string -func toHTTPIngressPaths(pathMap map[string]string) []experimental.HTTPIngressPath { - httpPaths := []experimental.HTTPIngressPath{} +func toHTTPIngressPaths(pathMap map[string]string) []extensions.HTTPIngressPath { + httpPaths := []extensions.HTTPIngressPath{} for path, backend := range pathMap { - httpPaths = append(httpPaths, experimental.HTTPIngressPath{ + httpPaths = append(httpPaths, extensions.HTTPIngressPath{ Path: path, - Backend: experimental.IngressBackend{ + Backend: extensions.IngressBackend{ ServiceName: backend, ServicePort: defaultBackendPort, }, @@ -62,13 +62,13 @@ func toHTTPIngressPaths(pathMap map[string]string) []experimental.HTTPIngressPat return httpPaths } -func toIngressRules(hostRules map[string]IngressRuleValues) []experimental.IngressRule { - rules := []experimental.IngressRule{} +func toIngressRules(hostRules map[string]IngressRuleValues) []extensions.IngressRule { + rules := []extensions.IngressRule{} for host, pathMap := range hostRules { - rules = append(rules, experimental.IngressRule{ + rules = append(rules, extensions.IngressRule{ Host: host, - IngressRuleValue: experimental.IngressRuleValue{ - HTTP: &experimental.HTTPIngressRuleValue{ + IngressRuleValue: extensions.IngressRuleValue{ + HTTP: &extensions.HTTPIngressRuleValue{ Paths: toHTTPIngressPaths(pathMap), }, }, @@ -77,14 +77,14 @@ func toIngressRules(hostRules map[string]IngressRuleValues) []experimental.Ingre return rules } -func newIngress(pathMap map[string]string) *experimental.Ingress { - return &experimental.Ingress{ +func newIngress(pathMap map[string]string) *extensions.Ingress { + return &extensions.Ingress{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: namespace, }, - Spec: experimental.IngressSpec{ - Backend: &experimental.IngressBackend{ + Spec: extensions.IngressSpec{ + Backend: &extensions.IngressBackend{ ServiceName: defaultBackendName, ServicePort: defaultBackendPort, }, @@ -92,7 +92,7 @@ func newIngress(pathMap map[string]string) *experimental.Ingress { defaultHostname: pathMap, }), }, - Status: experimental.IngressStatus{ + Status: extensions.IngressStatus{ LoadBalancer: api.LoadBalancerStatus{ Ingress: []api.LoadBalancerIngress{ {IP: defaultLoadBalancer}, @@ -102,7 +102,7 @@ func newIngress(pathMap map[string]string) *experimental.Ingress { } } -func validIngress() *experimental.Ingress { +func validIngress() *extensions.Ingress { return newIngress(defaultPathMap) } @@ -111,8 +111,8 @@ func TestCreate(t *testing.T) { test := registrytest.New(t, fakeClient, storage.Etcd) ingress := validIngress() noDefaultBackendAndRules := validIngress() - noDefaultBackendAndRules.Spec.Backend = &experimental.IngressBackend{} - noDefaultBackendAndRules.Spec.Rules = []experimental.IngressRule{} + noDefaultBackendAndRules.Spec.Backend = &extensions.IngressBackend{} + noDefaultBackendAndRules.Spec.Rules = []extensions.IngressRule{} badPath := validIngress() badPath.Spec.Rules = toIngressRules(map[string]IngressRuleValues{ "foo.bar.com": {"/invalid[": "svc"}}) @@ -132,7 +132,7 @@ func TestUpdate(t *testing.T) { validIngress(), // updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Ingress) + object := obj.(*extensions.Ingress) object.Spec.Rules = toIngressRules(map[string]IngressRuleValues{ "bar.foo.com": {"/bar": defaultBackendName}, }) @@ -140,19 +140,19 @@ func TestUpdate(t *testing.T) { }, // invalid updateFunc: ObjeceMeta is not to be tampered with. func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Ingress) + object := obj.(*extensions.Ingress) object.UID = "newUID" return object }, func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Ingress) + object := obj.(*extensions.Ingress) object.Name = "" return object }, func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Ingress) + object := obj.(*extensions.Ingress) object.Spec.Rules = toIngressRules(map[string]IngressRuleValues{ "foo.bar.com": {"/invalid[": "svc"}}) return object diff --git a/pkg/registry/ingress/strategy.go b/pkg/registry/ingress/strategy.go index d547d08ba65..6bad71419de 100644 --- a/pkg/registry/ingress/strategy.go +++ b/pkg/registry/ingress/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 (ingressStrategy) NamespaceScoped() bool { // PrepareForCreate clears the status of an Ingress before creation. func (ingressStrategy) PrepareForCreate(obj runtime.Object) { - ingress := obj.(*experimental.Ingress) - ingress.Status = experimental.IngressStatus{} + ingress := obj.(*extensions.Ingress) + ingress.Status = extensions.IngressStatus{} ingress.Generation = 1 } // PrepareForUpdate clears fields that are not allowed to be set by end users on update. func (ingressStrategy) PrepareForUpdate(obj, old runtime.Object) { - newIngress := obj.(*experimental.Ingress) - oldIngress := old.(*experimental.Ingress) + newIngress := obj.(*extensions.Ingress) + oldIngress := old.(*extensions.Ingress) //TODO: Clear Ingress status once we have a sub-resource. // Any changes to the spec increment the generation number, any changes to the @@ -69,7 +69,7 @@ func (ingressStrategy) PrepareForUpdate(obj, old runtime.Object) { // Validate validates a new Ingress. func (ingressStrategy) Validate(ctx api.Context, obj runtime.Object) fielderrors.ValidationErrorList { - ingress := obj.(*experimental.Ingress) + ingress := obj.(*extensions.Ingress) err := validation.ValidateIngress(ingress) return err } @@ -81,8 +81,8 @@ func (ingressStrategy) AllowCreateOnUpdate() bool { // ValidateUpdate is the default update validation for an end user. func (ingressStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList { - validationErrorList := validation.ValidateIngress(obj.(*experimental.Ingress)) - updateErrorList := validation.ValidateIngressUpdate(old.(*experimental.Ingress), obj.(*experimental.Ingress)) + validationErrorList := validation.ValidateIngress(obj.(*extensions.Ingress)) + updateErrorList := validation.ValidateIngressUpdate(old.(*extensions.Ingress), obj.(*extensions.Ingress)) return append(validationErrorList, updateErrorList...) } @@ -92,7 +92,7 @@ func (ingressStrategy) AllowUnconditionalUpdate() bool { } // IngressToSelectableFields returns a label set that represents the object. -func IngressToSelectableFields(ingress *experimental.Ingress) fields.Set { +func IngressToSelectableFields(ingress *extensions.Ingress) fields.Set { return fields.Set{ "metadata.name": ingress.Name, } @@ -106,7 +106,7 @@ func MatchIngress(label labels.Selector, field fields.Selector) generic.Matcher Label: label, Field: field, GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) { - ingress, ok := obj.(*experimental.Ingress) + ingress, ok := obj.(*extensions.Ingress) if !ok { return nil, nil, fmt.Errorf("Given object is not an Ingress.") } diff --git a/pkg/registry/job/etcd/etcd.go b/pkg/registry/job/etcd/etcd.go index 32020218456..1ea6c6cc28d 100644 --- a/pkg/registry/job/etcd/etcd.go +++ b/pkg/registry/job/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/generic" @@ -40,10 +40,10 @@ var jobPrefix = "/jobs" // NewREST returns a RESTStorage object that will work against Jobs. func NewREST(s storage.Interface) (*REST, *StatusREST) { store := &etcdgeneric.Etcd{ - NewFunc: func() runtime.Object { return &experimental.Job{} }, + NewFunc: func() runtime.Object { return &extensions.Job{} }, // NewListFunc returns an object capable of storing results of an etcd list. - NewListFunc: func() runtime.Object { return &experimental.JobList{} }, + NewListFunc: func() runtime.Object { return &extensions.JobList{} }, // 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 { @@ -56,7 +56,7 @@ func NewREST(s storage.Interface) (*REST, *StatusREST) { }, // Retrieve the name field of a job ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*experimental.Job).Name, nil + return obj.(*extensions.Job).Name, nil }, // Used to match objects based on labels/fields for list and watch PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { @@ -85,7 +85,7 @@ type StatusREST struct { } func (r *StatusREST) New() runtime.Object { - return &experimental.Job{} + return &extensions.Job{} } // Update alters the status subset of an object. diff --git a/pkg/registry/job/etcd/etcd_test.go b/pkg/registry/job/etcd/etcd_test.go index 70585e8099e..51119695ce4 100644 --- a/pkg/registry/job/etcd/etcd_test.go +++ b/pkg/registry/job/etcd/etcd_test.go @@ -20,9 +20,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/experimental" - // Ensure that experimental/v1alpha1 package is initialized. - _ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1" + "k8s.io/kubernetes/pkg/apis/extensions" + // Ensure that extensions/v1beta1 package is initialized. + _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -31,20 +31,20 @@ 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 validNewJob() *experimental.Job { +func validNewJob() *extensions.Job { completions := 1 parallelism := 1 - return &experimental.Job{ + return &extensions.Job{ ObjectMeta: api.ObjectMeta{ Name: "foo", Namespace: "default", }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Completions: &completions, Parallelism: ¶llelism, Selector: map[string]string{"a": "b"}, @@ -77,8 +77,8 @@ func TestCreate(t *testing.T) { // valid validJob, // invalid (empty selector) - &experimental.Job{ - Spec: experimental.JobSpec{ + &extensions.Job{ + Spec: extensions.JobSpec{ Completions: validJob.Spec.Completions, Selector: map[string]string{}, Template: validJob.Spec.Template, @@ -96,18 +96,18 @@ func TestUpdate(t *testing.T) { validNewJob(), // updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Job) + object := obj.(*extensions.Job) object.Spec.Parallelism = &two return object }, // invalid updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Job) + object := obj.(*extensions.Job) object.Spec.Selector = map[string]string{} return object }, func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.Job) + object := obj.(*extensions.Job) object.Spec.Completions = &two return object }, diff --git a/pkg/registry/job/registry.go b/pkg/registry/job/registry.go index de6e892157d..fb36dfa5512 100644 --- a/pkg/registry/job/registry.go +++ b/pkg/registry/job/registry.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "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" @@ -30,15 +30,15 @@ import ( // Registry is an interface for things that know how to store Jobs. type Registry interface { // ListJobs obtains a list of Jobs having labels and fields which match selector. - ListJobs(ctx api.Context, label labels.Selector, field fields.Selector) (*experimental.JobList, error) + ListJobs(ctx api.Context, label labels.Selector, field fields.Selector) (*extensions.JobList, error) // WatchJobs watch for new/changed/deleted Jobs. WatchJobs(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) // GetJobs gets a specific Job. - GetJob(ctx api.Context, name string) (*experimental.Job, error) + GetJob(ctx api.Context, name string) (*extensions.Job, error) // CreateJob creates a Job based on a specification. - CreateJob(ctx api.Context, job *experimental.Job) (*experimental.Job, error) + CreateJob(ctx api.Context, job *extensions.Job) (*extensions.Job, error) // UpdateJob updates an existing Job. - UpdateJob(ctx api.Context, job *experimental.Job) (*experimental.Job, error) + UpdateJob(ctx api.Context, job *extensions.Job) (*extensions.Job, error) // DeleteJob deletes an existing Job. DeleteJob(ctx api.Context, name string) error } @@ -54,7 +54,7 @@ func NewRegistry(s rest.StandardStorage) Registry { return &storage{s} } -func (s *storage) ListJobs(ctx api.Context, label labels.Selector, field fields.Selector) (*experimental.JobList, error) { +func (s *storage) ListJobs(ctx api.Context, label labels.Selector, field fields.Selector) (*extensions.JobList, error) { if !field.Empty() { return nil, fmt.Errorf("field selector not supported yet") } @@ -62,35 +62,35 @@ func (s *storage) ListJobs(ctx api.Context, label labels.Selector, field fields. if err != nil { return nil, err } - return obj.(*experimental.JobList), err + return obj.(*extensions.JobList), err } func (s *storage) WatchJobs(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) { return s.Watch(ctx, label, field, resourceVersion) } -func (s *storage) GetJob(ctx api.Context, name string) (*experimental.Job, error) { +func (s *storage) GetJob(ctx api.Context, name string) (*extensions.Job, error) { obj, err := s.Get(ctx, name) if err != nil { return nil, err } - return obj.(*experimental.Job), nil + return obj.(*extensions.Job), nil } -func (s *storage) CreateJob(ctx api.Context, job *experimental.Job) (*experimental.Job, error) { +func (s *storage) CreateJob(ctx api.Context, job *extensions.Job) (*extensions.Job, error) { obj, err := s.Create(ctx, job) if err != nil { return nil, err } - return obj.(*experimental.Job), nil + return obj.(*extensions.Job), nil } -func (s *storage) UpdateJob(ctx api.Context, job *experimental.Job) (*experimental.Job, error) { +func (s *storage) UpdateJob(ctx api.Context, job *extensions.Job) (*extensions.Job, error) { obj, _, err := s.Update(ctx, job) if err != nil { return nil, err } - return obj.(*experimental.Job), nil + return obj.(*extensions.Job), nil } func (s *storage) DeleteJob(ctx api.Context, name string) error { diff --git a/pkg/registry/job/strategy.go b/pkg/registry/job/strategy.go index ae9fb5c504b..b6221db434b 100644 --- a/pkg/registry/job/strategy.go +++ b/pkg/registry/job/strategy.go @@ -21,8 +21,8 @@ import ( "strconv" "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,20 +46,20 @@ func (jobStrategy) NamespaceScoped() bool { // PrepareForCreate clears the status of a job before creation. func (jobStrategy) PrepareForCreate(obj runtime.Object) { - job := obj.(*experimental.Job) - job.Status = experimental.JobStatus{} + job := obj.(*extensions.Job) + job.Status = extensions.JobStatus{} } // PrepareForUpdate clears fields that are not allowed to be set by end users on update. func (jobStrategy) PrepareForUpdate(obj, old runtime.Object) { - newJob := obj.(*experimental.Job) - oldJob := old.(*experimental.Job) + newJob := obj.(*extensions.Job) + oldJob := old.(*extensions.Job) newJob.Status = oldJob.Status } // Validate validates a new job. func (jobStrategy) Validate(ctx api.Context, obj runtime.Object) fielderrors.ValidationErrorList { - job := obj.(*experimental.Job) + job := obj.(*extensions.Job) return validation.ValidateJob(job) } @@ -74,8 +74,8 @@ func (jobStrategy) AllowCreateOnUpdate() bool { // ValidateUpdate is the default update validation for an end user. func (jobStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList { - validationErrorList := validation.ValidateJob(obj.(*experimental.Job)) - updateErrorList := validation.ValidateJobUpdate(old.(*experimental.Job), obj.(*experimental.Job)) + validationErrorList := validation.ValidateJob(obj.(*extensions.Job)) + updateErrorList := validation.ValidateJobUpdate(old.(*extensions.Job), obj.(*extensions.Job)) return append(validationErrorList, updateErrorList...) } @@ -86,17 +86,17 @@ type jobStatusStrategy struct { var StatusStrategy = jobStatusStrategy{Strategy} func (jobStatusStrategy) PrepareForUpdate(obj, old runtime.Object) { - newJob := obj.(*experimental.Job) - oldJob := old.(*experimental.Job) + newJob := obj.(*extensions.Job) + oldJob := old.(*extensions.Job) newJob.Spec = oldJob.Spec } func (jobStatusStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList { - return validation.ValidateJobUpdateStatus(obj.(*experimental.Job), old.(*experimental.Job)) + return validation.ValidateJobUpdateStatus(obj.(*extensions.Job), old.(*extensions.Job)) } // JobSelectableFields returns a field set that represents the object for matching purposes. -func JobToSelectableFields(job *experimental.Job) fields.Set { +func JobToSelectableFields(job *extensions.Job) fields.Set { return fields.Set{ "metadata.name": job.Name, "status.successful": strconv.Itoa(job.Status.Succeeded), @@ -111,7 +111,7 @@ func MatchJob(label labels.Selector, field fields.Selector) generic.Matcher { Label: label, Field: field, GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) { - job, ok := obj.(*experimental.Job) + job, ok := obj.(*extensions.Job) if !ok { return nil, nil, fmt.Errorf("Given object is not a job.") } diff --git a/pkg/registry/job/strategy_test.go b/pkg/registry/job/strategy_test.go index f73fabc867f..e5ca69bc5e3 100644 --- a/pkg/registry/job/strategy_test.go +++ b/pkg/registry/job/strategy_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" ) func TestJobStrategy(t *testing.T) { @@ -43,16 +43,16 @@ func TestJobStrategy(t *testing.T) { Containers: []api.Container{{Name: "abc", Image: "image", ImagePullPolicy: "IfNotPresent"}}, }, } - job := &experimental.Job{ + job := &extensions.Job{ ObjectMeta: api.ObjectMeta{ Name: "myjob", Namespace: api.NamespaceDefault, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, Template: &validPodTemplateSpec, }, - Status: experimental.JobStatus{ + Status: extensions.JobStatus{ Active: 11, }, } @@ -66,12 +66,12 @@ func TestJobStrategy(t *testing.T) { t.Errorf("Unexpected error validating %v", errs) } parallelism := 10 - updatedJob := &experimental.Job{ + updatedJob := &extensions.Job{ ObjectMeta: api.ObjectMeta{Name: "bar", ResourceVersion: "4"}, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Parallelism: ¶llelism, }, - Status: experimental.JobStatus{ + Status: extensions.JobStatus{ Active: 11, }, } @@ -108,33 +108,33 @@ func TestJobStatusStrategy(t *testing.T) { } oldParallelism := 10 newParallelism := 11 - oldJob := &experimental.Job{ + oldJob := &extensions.Job{ ObjectMeta: api.ObjectMeta{ Name: "myjob", Namespace: api.NamespaceDefault, ResourceVersion: "10", }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, Template: &validPodTemplateSpec, Parallelism: &oldParallelism, }, - Status: experimental.JobStatus{ + Status: extensions.JobStatus{ Active: 11, }, } - newJob := &experimental.Job{ + newJob := &extensions.Job{ ObjectMeta: api.ObjectMeta{ Name: "myjob", Namespace: api.NamespaceDefault, ResourceVersion: "9", }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Selector: validSelector, Template: &validPodTemplateSpec, Parallelism: &newParallelism, }, - Status: experimental.JobStatus{ + Status: extensions.JobStatus{ Active: 12, }, } diff --git a/pkg/registry/registrytest/etcd.go b/pkg/registry/registrytest/etcd.go index c22a393dd1b..9072a4918d1 100644 --- a/pkg/registry/registrytest/etcd.go +++ b/pkg/registry/registrytest/etcd.go @@ -163,8 +163,8 @@ func getCodec(obj runtime.Object) (runtime.Codec, error) { var codec runtime.Codec if api.Scheme.Recognizes(testapi.Default.GroupAndVersion(), kind) { codec = testapi.Default.Codec() - } else if api.Scheme.Recognizes(testapi.Experimental.GroupAndVersion(), kind) { - codec = testapi.Experimental.Codec() + } else if api.Scheme.Recognizes(testapi.Extensions.GroupAndVersion(), kind) { + codec = testapi.Extensions.Codec() } else { return nil, fmt.Errorf("unexpected kind: %v", kind) } diff --git a/pkg/registry/thirdpartyresource/etcd/etcd.go b/pkg/registry/thirdpartyresource/etcd/etcd.go index 087a32938e8..6501d8e8eb9 100644 --- a/pkg/registry/thirdpartyresource/etcd/etcd.go +++ b/pkg/registry/thirdpartyresource/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/generic" @@ -38,8 +38,8 @@ func NewREST(s storage.Interface) *REST { prefix := "/thirdpartyresources" store := &etcdgeneric.Etcd{ - NewFunc: func() runtime.Object { return &experimental.ThirdPartyResource{} }, - NewListFunc: func() runtime.Object { return &experimental.ThirdPartyResourceList{} }, + NewFunc: func() runtime.Object { return &extensions.ThirdPartyResource{} }, + NewListFunc: func() runtime.Object { return &extensions.ThirdPartyResourceList{} }, KeyRootFunc: func(ctx api.Context) string { return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix) }, @@ -47,7 +47,7 @@ func NewREST(s storage.Interface) *REST { return etcdgeneric.NamespaceKeyFunc(ctx, prefix, id) }, ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*experimental.ThirdPartyResource).Name, nil + return obj.(*extensions.ThirdPartyResource).Name, nil }, PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { return thirdpartyresource.Matcher(label, field) diff --git a/pkg/registry/thirdpartyresource/etcd/etcd_test.go b/pkg/registry/thirdpartyresource/etcd/etcd_test.go index d42e69e4578..63dce6c12f3 100644 --- a/pkg/registry/thirdpartyresource/etcd/etcd_test.go +++ b/pkg/registry/thirdpartyresource/etcd/etcd_test.go @@ -20,9 +20,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/experimental" - // Ensure that experimental/v1alpha1 package is initialized. - _ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1" + "k8s.io/kubernetes/pkg/apis/extensions" + // Ensure that extensions/v1beta1 package is initialized. + _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -31,17 +31,17 @@ import ( ) func newStorage(t *testing.T) (*REST, *tools.FakeEtcdClient) { - etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "experimental") + etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "extensions") return NewREST(etcdStorage), fakeClient } -func validNewThirdPartyResource(name string) *experimental.ThirdPartyResource { - return &experimental.ThirdPartyResource{ +func validNewThirdPartyResource(name string) *extensions.ThirdPartyResource { + return &extensions.ThirdPartyResource{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, }, - Versions: []experimental.APIVersion{ + Versions: []extensions.APIVersion{ { Name: "stable/v1", }, @@ -58,7 +58,7 @@ func TestCreate(t *testing.T) { // valid rsrc, // invalid - &experimental.ThirdPartyResource{}, + &extensions.ThirdPartyResource{}, ) } @@ -70,7 +70,7 @@ func TestUpdate(t *testing.T) { validNewThirdPartyResource("foo"), // updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.ThirdPartyResource) + object := obj.(*extensions.ThirdPartyResource) object.Description = "new description" return object }, diff --git a/pkg/registry/thirdpartyresource/strategy.go b/pkg/registry/thirdpartyresource/strategy.go index 733a1ea56de..fff669ea21e 100644 --- a/pkg/registry/thirdpartyresource/strategy.go +++ b/pkg/registry/thirdpartyresource/strategy.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "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" @@ -52,7 +52,7 @@ func (strategy) PrepareForCreate(obj runtime.Object) { } func (strategy) Validate(ctx api.Context, obj runtime.Object) fielderrors.ValidationErrorList { - return validation.ValidateThirdPartyResource(obj.(*experimental.ThirdPartyResource)) + return validation.ValidateThirdPartyResource(obj.(*extensions.ThirdPartyResource)) } func (strategy) AllowCreateOnUpdate() bool { @@ -63,7 +63,7 @@ func (strategy) PrepareForUpdate(obj, old runtime.Object) { } func (strategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList { - return validation.ValidateThirdPartyResourceUpdate(old.(*experimental.ThirdPartyResource), obj.(*experimental.ThirdPartyResource)) + return validation.ValidateThirdPartyResourceUpdate(old.(*extensions.ThirdPartyResource), obj.(*extensions.ThirdPartyResource)) } func (strategy) AllowUnconditionalUpdate() bool { @@ -73,7 +73,7 @@ func (strategy) AllowUnconditionalUpdate() bool { // Matcher returns a generic matcher for a given label and field selector. func Matcher(label labels.Selector, field fields.Selector) generic.Matcher { return generic.MatcherFunc(func(obj runtime.Object) (bool, error) { - sa, ok := obj.(*experimental.ThirdPartyResource) + sa, ok := obj.(*extensions.ThirdPartyResource) if !ok { return false, fmt.Errorf("not a ThirdPartyResource") } @@ -83,6 +83,6 @@ func Matcher(label labels.Selector, field fields.Selector) generic.Matcher { } // SelectableFields returns a label set that can be used for filter selection -func SelectableFields(obj *experimental.ThirdPartyResource) labels.Set { +func SelectableFields(obj *extensions.ThirdPartyResource) labels.Set { return labels.Set{} } diff --git a/pkg/registry/thirdpartyresourcedata/codec.go b/pkg/registry/thirdpartyresourcedata/codec.go index 065971f1512..c7eb8fd55ee 100644 --- a/pkg/registry/thirdpartyresourcedata/codec.go +++ b/pkg/registry/thirdpartyresourcedata/codec.go @@ -27,7 +27,7 @@ import ( "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/unversioned" apiutil "k8s.io/kubernetes/pkg/api/util" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" "k8s.io/kubernetes/pkg/runtime" ) @@ -59,7 +59,7 @@ func (t *thirdPartyResourceDataMapper) RESTMapping(kind string, groupVersions .. if kind != "ThirdPartyResourceData" { return nil, fmt.Errorf("unknown kind %s expected %s", kind, t.kind) } - mapping, err := t.mapper.RESTMapping("ThirdPartyResourceData", latest.GroupOrDie("experimental").GroupVersion) + mapping, err := t.mapper.RESTMapping("ThirdPartyResourceData", latest.GroupOrDie("extensions").GroupVersion) if err != nil { return nil, err } @@ -105,7 +105,7 @@ func NewCodec(codec runtime.Codec, kind string) runtime.Codec { return &thirdPartyResourceDataCodec{codec, kind} } -func (t *thirdPartyResourceDataCodec) populate(objIn *experimental.ThirdPartyResourceData, data []byte) error { +func (t *thirdPartyResourceDataCodec) populate(objIn *extensions.ThirdPartyResourceData, data []byte) error { var obj interface{} if err := json.Unmarshal(data, &obj); err != nil { fmt.Printf("Invalid JSON:\n%s\n", string(data)) @@ -118,7 +118,7 @@ func (t *thirdPartyResourceDataCodec) populate(objIn *experimental.ThirdPartyRes return t.populateFromObject(objIn, mapObj, data) } -func (t *thirdPartyResourceDataCodec) populateFromObject(objIn *experimental.ThirdPartyResourceData, mapObj map[string]interface{}, data []byte) error { +func (t *thirdPartyResourceDataCodec) populateFromObject(objIn *extensions.ThirdPartyResourceData, mapObj map[string]interface{}, data []byte) error { typeMeta := unversioned.TypeMeta{} if err := json.Unmarshal(data, &typeMeta); err != nil { return err @@ -146,7 +146,7 @@ func (t *thirdPartyResourceDataCodec) populateFromObject(objIn *experimental.Thi } func (t *thirdPartyResourceDataCodec) Decode(data []byte) (runtime.Object, error) { - result := &experimental.ThirdPartyResourceData{} + result := &extensions.ThirdPartyResourceData{} if err := t.populate(result, data); err != nil { return nil, err } @@ -167,7 +167,7 @@ func (t *thirdPartyResourceDataCodec) DecodeToVersion(data []byte, version strin } func (t *thirdPartyResourceDataCodec) DecodeInto(data []byte, obj runtime.Object) error { - thirdParty, ok := obj.(*experimental.ThirdPartyResourceData) + thirdParty, ok := obj.(*extensions.ThirdPartyResourceData) if !ok { return fmt.Errorf("unexpected object: %#v", obj) } @@ -175,7 +175,7 @@ func (t *thirdPartyResourceDataCodec) DecodeInto(data []byte, obj runtime.Object } func (t *thirdPartyResourceDataCodec) DecodeIntoWithSpecifiedVersionKind(data []byte, obj runtime.Object, version, kind string) error { - thirdParty, ok := obj.(*experimental.ThirdPartyResourceData) + thirdParty, ok := obj.(*extensions.ThirdPartyResourceData) if !ok { return fmt.Errorf("unexpected object: %#v", obj) } @@ -226,7 +226,7 @@ const template = `{ "items": [ %s ] }` -func encodeToJSON(obj *experimental.ThirdPartyResourceData, stream io.Writer) error { +func encodeToJSON(obj *extensions.ThirdPartyResourceData, stream io.Writer) error { var objOut interface{} if err := json.Unmarshal(obj.Data, &objOut); err != nil { return err @@ -250,9 +250,9 @@ func (t *thirdPartyResourceDataCodec) Encode(obj runtime.Object) ([]byte, error) func (t *thirdPartyResourceDataCodec) EncodeToStream(obj runtime.Object, stream io.Writer) (err error) { switch obj := obj.(type) { - case *experimental.ThirdPartyResourceData: + case *extensions.ThirdPartyResourceData: return encodeToJSON(obj, stream) - case *experimental.ThirdPartyResourceDataList: + case *extensions.ThirdPartyResourceDataList: // TODO: There must be a better way to do this... dataStrings := make([]string, len(obj.Items)) for ix := range obj.Items { @@ -288,12 +288,12 @@ func (t *thirdPartyResourceDataCreator) New(groupVersion, kind string) (out runt if apiutil.GetGroupVersion(t.group, t.version) != groupVersion { return nil, fmt.Errorf("unknown version %s for kind %s", groupVersion, kind) } - return &experimental.ThirdPartyResourceData{}, nil + return &extensions.ThirdPartyResourceData{}, nil case "ThirdPartyResourceDataList": if apiutil.GetGroupVersion(t.group, t.version) != groupVersion { return nil, fmt.Errorf("unknown version %s for kind %s", groupVersion, kind) } - return &experimental.ThirdPartyResourceDataList{}, nil + return &extensions.ThirdPartyResourceDataList{}, nil default: return t.delegate.New(groupVersion, kind) } diff --git a/pkg/registry/thirdpartyresourcedata/codec_test.go b/pkg/registry/thirdpartyresourcedata/codec_test.go index f092f93c585..a83dad36cbf 100644 --- a/pkg/registry/thirdpartyresourcedata/codec_test.go +++ b/pkg/registry/thirdpartyresourcedata/codec_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" "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" ) @@ -103,7 +103,7 @@ func TestCodec(t *testing.T) { } continue } - rsrcObj, ok := obj.(*experimental.ThirdPartyResourceData) + rsrcObj, ok := obj.(*extensions.ThirdPartyResourceData) if !ok { t.Errorf("[%s] unexpected object: %v", test.name, obj) continue @@ -149,7 +149,7 @@ func TestCreater(t *testing.T) { name: "valid ThirdPartyResourceData creation", version: "creater group/creater version", kind: "ThirdPartyResourceData", - expectedObj: &experimental.ThirdPartyResourceData{}, + expectedObj: &extensions.ThirdPartyResourceData{}, expectErr: false, }, { diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go b/pkg/registry/thirdpartyresourcedata/etcd/etcd.go index c6f1ecf8a13..8f06635ff41 100644 --- a/pkg/registry/thirdpartyresourcedata/etcd/etcd.go +++ b/pkg/registry/thirdpartyresourcedata/etcd/etcd.go @@ -20,7 +20,7 @@ import ( "strings" "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/generic" @@ -40,8 +40,8 @@ func NewREST(s storage.Interface, group, kind string) *REST { prefix := "/ThirdPartyResourceData/" + group + "/" + strings.ToLower(kind) + "s" store := &etcdgeneric.Etcd{ - NewFunc: func() runtime.Object { return &experimental.ThirdPartyResourceData{} }, - NewListFunc: func() runtime.Object { return &experimental.ThirdPartyResourceDataList{} }, + NewFunc: func() runtime.Object { return &extensions.ThirdPartyResourceData{} }, + NewListFunc: func() runtime.Object { return &extensions.ThirdPartyResourceDataList{} }, KeyRootFunc: func(ctx api.Context) string { return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix) }, @@ -49,7 +49,7 @@ func NewREST(s storage.Interface, group, kind string) *REST { return etcdgeneric.NamespaceKeyFunc(ctx, prefix, id) }, ObjectNameFunc: func(obj runtime.Object) (string, error) { - return obj.(*experimental.ThirdPartyResourceData).Name, nil + return obj.(*extensions.ThirdPartyResourceData).Name, nil }, PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher { return thirdpartyresourcedata.Matcher(label, field) diff --git a/pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go b/pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go index b62624bb134..fc2291507d9 100644 --- a/pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go +++ b/pkg/registry/thirdpartyresourcedata/etcd/etcd_test.go @@ -20,9 +20,9 @@ import ( "testing" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/experimental" - // Ensure that experimental/v1alpha1 package is initialized. - _ "k8s.io/kubernetes/pkg/apis/experimental/v1alpha1" + "k8s.io/kubernetes/pkg/apis/extensions" + // Ensure that extensions/v1beta1 package is initialized. + _ "k8s.io/kubernetes/pkg/apis/extensions/v1beta1" "k8s.io/kubernetes/pkg/fields" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/registry/registrytest" @@ -31,12 +31,12 @@ import ( ) func newStorage(t *testing.T) (*REST, *tools.FakeEtcdClient) { - etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "experimental") + etcdStorage, fakeClient := registrytest.NewEtcdStorage(t, "extensions") return NewREST(etcdStorage, "foo", "bar"), fakeClient } -func validNewThirdPartyResourceData(name string) *experimental.ThirdPartyResourceData { - return &experimental.ThirdPartyResourceData{ +func validNewThirdPartyResourceData(name string) *extensions.ThirdPartyResourceData { + return &extensions.ThirdPartyResourceData{ ObjectMeta: api.ObjectMeta{ Name: name, Namespace: api.NamespaceDefault, @@ -54,7 +54,7 @@ func TestCreate(t *testing.T) { // valid rsrc, // invalid - &experimental.ThirdPartyResourceData{}, + &extensions.ThirdPartyResourceData{}, ) } @@ -66,7 +66,7 @@ func TestUpdate(t *testing.T) { validNewThirdPartyResourceData("foo"), // updateFunc func(obj runtime.Object) runtime.Object { - object := obj.(*experimental.ThirdPartyResourceData) + object := obj.(*extensions.ThirdPartyResourceData) object.Data = []byte("new description") return object }, diff --git a/pkg/registry/thirdpartyresourcedata/registry.go b/pkg/registry/thirdpartyresourcedata/registry.go index a1ae201453e..d80aa0718e7 100644 --- a/pkg/registry/thirdpartyresourcedata/registry.go +++ b/pkg/registry/thirdpartyresourcedata/registry.go @@ -19,7 +19,7 @@ package thirdpartyresourcedata import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "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" @@ -28,15 +28,15 @@ import ( // Registry is an interface implemented by things that know how to store ThirdPartyResourceData objects. type Registry interface { // ListThirdPartyResourceData obtains a list of ThirdPartyResourceData having labels which match selector. - ListThirdPartyResourceData(ctx api.Context, selector labels.Selector) (*experimental.ThirdPartyResourceDataList, error) + ListThirdPartyResourceData(ctx api.Context, selector labels.Selector) (*extensions.ThirdPartyResourceDataList, error) // Watch for new/changed/deleted ThirdPartyResourceData WatchThirdPartyResourceData(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) // Get a specific ThirdPartyResourceData - GetThirdPartyResourceData(ctx api.Context, name string) (*experimental.ThirdPartyResourceData, error) + GetThirdPartyResourceData(ctx api.Context, name string) (*extensions.ThirdPartyResourceData, error) // Create a ThirdPartyResourceData based on a specification. - CreateThirdPartyResourceData(ctx api.Context, resource *experimental.ThirdPartyResourceData) (*experimental.ThirdPartyResourceData, error) + CreateThirdPartyResourceData(ctx api.Context, resource *extensions.ThirdPartyResourceData) (*extensions.ThirdPartyResourceData, error) // Update an existing ThirdPartyResourceData - UpdateThirdPartyResourceData(ctx api.Context, resource *experimental.ThirdPartyResourceData) (*experimental.ThirdPartyResourceData, error) + UpdateThirdPartyResourceData(ctx api.Context, resource *extensions.ThirdPartyResourceData) (*extensions.ThirdPartyResourceData, error) // Delete an existing ThirdPartyResourceData DeleteThirdPartyResourceData(ctx api.Context, name string) error } @@ -52,34 +52,34 @@ func NewRegistry(s rest.StandardStorage) Registry { return &storage{s} } -func (s *storage) ListThirdPartyResourceData(ctx api.Context, label labels.Selector) (*experimental.ThirdPartyResourceDataList, error) { +func (s *storage) ListThirdPartyResourceData(ctx api.Context, label labels.Selector) (*extensions.ThirdPartyResourceDataList, error) { obj, err := s.List(ctx, label, fields.Everything()) if err != nil { return nil, err } - return obj.(*experimental.ThirdPartyResourceDataList), nil + return obj.(*extensions.ThirdPartyResourceDataList), nil } func (s *storage) WatchThirdPartyResourceData(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) { return s.Watch(ctx, label, field, resourceVersion) } -func (s *storage) GetThirdPartyResourceData(ctx api.Context, name string) (*experimental.ThirdPartyResourceData, error) { +func (s *storage) GetThirdPartyResourceData(ctx api.Context, name string) (*extensions.ThirdPartyResourceData, error) { obj, err := s.Get(ctx, name) if err != nil { return nil, err } - return obj.(*experimental.ThirdPartyResourceData), nil + return obj.(*extensions.ThirdPartyResourceData), nil } -func (s *storage) CreateThirdPartyResourceData(ctx api.Context, ThirdPartyResourceData *experimental.ThirdPartyResourceData) (*experimental.ThirdPartyResourceData, error) { +func (s *storage) CreateThirdPartyResourceData(ctx api.Context, ThirdPartyResourceData *extensions.ThirdPartyResourceData) (*extensions.ThirdPartyResourceData, error) { obj, err := s.Create(ctx, ThirdPartyResourceData) - return obj.(*experimental.ThirdPartyResourceData), err + return obj.(*extensions.ThirdPartyResourceData), err } -func (s *storage) UpdateThirdPartyResourceData(ctx api.Context, ThirdPartyResourceData *experimental.ThirdPartyResourceData) (*experimental.ThirdPartyResourceData, error) { +func (s *storage) UpdateThirdPartyResourceData(ctx api.Context, ThirdPartyResourceData *extensions.ThirdPartyResourceData) (*extensions.ThirdPartyResourceData, error) { obj, _, err := s.Update(ctx, ThirdPartyResourceData) - return obj.(*experimental.ThirdPartyResourceData), err + return obj.(*extensions.ThirdPartyResourceData), err } func (s *storage) DeleteThirdPartyResourceData(ctx api.Context, name string) error { diff --git a/pkg/registry/thirdpartyresourcedata/strategy.go b/pkg/registry/thirdpartyresourcedata/strategy.go index d1e09fb6c49..05932374c66 100644 --- a/pkg/registry/thirdpartyresourcedata/strategy.go +++ b/pkg/registry/thirdpartyresourcedata/strategy.go @@ -21,8 +21,8 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/rest" - "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" @@ -52,7 +52,7 @@ func (strategy) PrepareForCreate(obj runtime.Object) { } func (strategy) Validate(ctx api.Context, obj runtime.Object) fielderrors.ValidationErrorList { - return validation.ValidateThirdPartyResourceData(obj.(*experimental.ThirdPartyResourceData)) + return validation.ValidateThirdPartyResourceData(obj.(*extensions.ThirdPartyResourceData)) } func (strategy) AllowCreateOnUpdate() bool { @@ -63,7 +63,7 @@ func (strategy) PrepareForUpdate(obj, old runtime.Object) { } func (strategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList { - return validation.ValidateThirdPartyResourceDataUpdate(old.(*experimental.ThirdPartyResourceData), obj.(*experimental.ThirdPartyResourceData)) + return validation.ValidateThirdPartyResourceDataUpdate(old.(*extensions.ThirdPartyResourceData), obj.(*extensions.ThirdPartyResourceData)) } func (strategy) AllowUnconditionalUpdate() bool { @@ -73,7 +73,7 @@ func (strategy) AllowUnconditionalUpdate() bool { // Matcher returns a generic matcher for a given label and field selector. func Matcher(label labels.Selector, field fields.Selector) generic.Matcher { return generic.MatcherFunc(func(obj runtime.Object) (bool, error) { - sa, ok := obj.(*experimental.ThirdPartyResourceData) + sa, ok := obj.(*extensions.ThirdPartyResourceData) if !ok { return false, fmt.Errorf("not a ThirdPartyResourceData") } @@ -83,6 +83,6 @@ func Matcher(label labels.Selector, field fields.Selector) generic.Matcher { } // SelectableFields returns a label set that can be used for filter selection -func SelectableFields(obj *experimental.ThirdPartyResourceData) labels.Set { +func SelectableFields(obj *extensions.ThirdPartyResourceData) labels.Set { return labels.Set{} } diff --git a/pkg/registry/thirdpartyresourcedata/util.go b/pkg/registry/thirdpartyresourcedata/util.go index db62f6282ab..482dadb1eff 100644 --- a/pkg/registry/thirdpartyresourcedata/util.go +++ b/pkg/registry/thirdpartyresourcedata/util.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" ) func convertToCamelCase(input string) string { @@ -40,7 +40,7 @@ func convertToCamelCase(input string) string { return result } -func ExtractApiGroupAndKind(rsrc *experimental.ThirdPartyResource) (kind string, group string, err error) { +func ExtractApiGroupAndKind(rsrc *extensions.ThirdPartyResource) (kind string, group string, err error) { parts := strings.Split(rsrc.Name, ".") if len(parts) < 3 { return "", "", fmt.Errorf("unexpectedly short resource name: %s, expected at least ..", rsrc.Name) diff --git a/pkg/registry/thirdpartyresourcedata/util_test.go b/pkg/registry/thirdpartyresourcedata/util_test.go index 977e717997b..a18722c1797 100644 --- a/pkg/registry/thirdpartyresourcedata/util_test.go +++ b/pkg/registry/thirdpartyresourcedata/util_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" ) func TestExtractAPIGroupAndKind(t *testing.T) { @@ -47,7 +47,7 @@ func TestExtractAPIGroupAndKind(t *testing.T) { } for _, test := range tests { - kind, group, err := ExtractApiGroupAndKind(&experimental.ThirdPartyResource{ObjectMeta: api.ObjectMeta{Name: test.input}}) + kind, group, err := ExtractApiGroupAndKind(&extensions.ThirdPartyResource{ObjectMeta: api.ObjectMeta{Name: test.input}}) if err != nil && !test.expectErr { t.Errorf("unexpected error: %v", err) continue diff --git a/pkg/util/deployment/deployment.go b/pkg/util/deployment/deployment.go index 84e0dc8cf1c..3598d43529c 100644 --- a/pkg/util/deployment/deployment.go +++ b/pkg/util/deployment/deployment.go @@ -21,7 +21,7 @@ import ( "hash/adler32" "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/fields" "k8s.io/kubernetes/pkg/labels" @@ -29,7 +29,7 @@ import ( ) // Returns the old RCs targetted by the given Deployment. -func GetOldRCs(deployment experimental.Deployment, c client.Interface) ([]*api.ReplicationController, error) { +func GetOldRCs(deployment extensions.Deployment, c client.Interface) ([]*api.ReplicationController, error) { namespace := deployment.ObjectMeta.Namespace // 1. Find all pods whose labels match deployment.Spec.Selector podList, err := c.Pods(namespace).List(labels.SelectorFromSet(deployment.Spec.Selector), fields.Everything()) @@ -65,7 +65,7 @@ func GetOldRCs(deployment experimental.Deployment, c client.Interface) ([]*api.R // Returns an RC that matches the intent of the given deployment. // Returns nil if the new RC doesnt exist yet. -func GetNewRC(deployment experimental.Deployment, c client.Interface) (*api.ReplicationController, error) { +func GetNewRC(deployment extensions.Deployment, c client.Interface) (*api.ReplicationController, error) { namespace := deployment.ObjectMeta.Namespace rcList, err := c.ReplicationControllers(namespace).List(labels.Everything()) if err != nil { @@ -84,7 +84,7 @@ func GetNewRC(deployment experimental.Deployment, c client.Interface) (*api.Repl } // Returns the desired PodTemplateSpec for the new RC corresponding to the given RC. -func GetNewRCTemplate(deployment experimental.Deployment) *api.PodTemplateSpec { +func GetNewRCTemplate(deployment extensions.Deployment) *api.PodTemplateSpec { // newRC will have the same template as in deployment spec, plus a unique label in some cases. newRCTemplate := &api.PodTemplateSpec{ ObjectMeta: deployment.Spec.Template.ObjectMeta, diff --git a/shippable.yml b/shippable.yml index fa57384baff..c96dfb53780 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,7 +6,7 @@ matrix: include: - go: 1.4 env: - - KUBE_TEST_API_VERSIONS=v1,experimental/v1alpha1 KUBE_TEST_ETCD_PREFIXES=registry + - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=registry - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults" - CI_NAME="shippable" - CI_BUILD_NUMBER="$BUILD_NUMBER" @@ -17,7 +17,7 @@ matrix: - secure: hfh1Kwl2XYUlJCn4dtKSG0C9yXl5TtksVOY74OeqolvDAdVj4sc+GJD3Bywsp91CJe8YMEnkt9rN0WGI+gPVMcjTmZ9tMUxKiNNBP8m5oLRFbdgKOkNuXjpjpFHHWGAnNhMmh9vjI+ehADo+QIpU1fGxd3yO4tmIJ1qoK3QqvUrOZ1RwUubRXoeVn3xy3LK5yg4vP5ruitbNeWMw/RZZ7D6czvqvEfCgV6b4mdNDRMiqlUJNkaTRc3em1APXr30yagDV3a7hXLq3HdlyFwvF+9pmB4AKhQctyjPN4zvvPd0/gJXq3ZHXSlZXOZBMPXHlSS5pizfSInNszyZyrP3+/w== - go: 1.3 env: - - KUBE_TEST_API_VERSIONS=v1,experimental/v1alpha1 KUBE_TEST_ETCD_PREFIXES=kubernetes.io/registry + - KUBE_TEST_API_VERSIONS=v1,extensions/v1beta1 KUBE_TEST_ETCD_PREFIXES=kubernetes.io/registry - KUBE_JUNIT_REPORT_DIR="${SHIPPABLE_REPO_DIR}/shippable/testresults" - CI_NAME="shippable" - CI_BUILD_NUMBER="$BUILD_NUMBER" diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index c7739a62919..78455f7c426 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -25,7 +25,7 @@ import ( "k8s.io/kubernetes/pkg/api" apierrs "k8s.io/kubernetes/pkg/api/errors" "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/fields" "k8s.io/kubernetes/pkg/kubectl" @@ -74,11 +74,11 @@ var _ = Describe("Daemon set", func() { label := map[string]string{daemonsetNameLabel: dsName} Logf("Creating simple daemon set %s", dsName) - _, err := c.DaemonSets(ns).Create(&experimental.DaemonSet{ + _, err := c.DaemonSets(ns).Create(&extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{ Name: dsName, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Template: &api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ Labels: label, @@ -129,11 +129,11 @@ var _ = Describe("Daemon set", func() { complexLabel := map[string]string{daemonsetNameLabel: dsName} nodeSelector := map[string]string{daemonsetColorLabel: "blue"} Logf("Creating daemon with a node selector %s", dsName) - _, err := c.DaemonSets(ns).Create(&experimental.DaemonSet{ + _, err := c.DaemonSets(ns).Create(&extensions.DaemonSet{ ObjectMeta: api.ObjectMeta{ Name: dsName, }, - Spec: experimental.DaemonSetSpec{ + Spec: extensions.DaemonSetSpec{ Selector: complexLabel, Template: &api.PodTemplateSpec{ ObjectMeta: api.ObjectMeta{ diff --git a/test/e2e/deployment.go b/test/e2e/deployment.go index 0187e69d8bc..984c125447d 100644 --- a/test/e2e/deployment.go +++ b/test/e2e/deployment.go @@ -19,7 +19,7 @@ package e2e import ( "fmt" "k8s.io/kubernetes/pkg/api" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" deploymentUtil "k8s.io/kubernetes/pkg/util/deployment" . "github.com/onsi/ginkgo" @@ -46,11 +46,11 @@ func testNewDeployment(f *Framework) { deploymentName := "nginx-deployment" podLabels := map[string]string{"name": "nginx"} Logf("Creating simple deployment %s", deploymentName) - _, err := c.Deployments(ns).Create(&experimental.Deployment{ + _, err := c.Deployments(ns).Create(&extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: deploymentName, }, - Spec: experimental.DeploymentSpec{ + Spec: extensions.DeploymentSpec{ Replicas: 1, Selector: podLabels, UniqueLabelKey: "deployment.kubernetes.io/podTemplateHash", @@ -139,11 +139,11 @@ func testRollingUpdateDeployment(f *Framework) { // Create a deployment to delete nginx pods and instead bring up redis pods. deploymentName := "redis-deployment" Logf("Creating deployment %s", deploymentName) - newDeployment := experimental.Deployment{ + newDeployment := extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: deploymentName, }, - Spec: experimental.DeploymentSpec{ + Spec: extensions.DeploymentSpec{ Replicas: 3, Selector: deploymentPodLabels, UniqueLabelKey: "deployment.kubernetes.io/podTemplateHash", @@ -220,11 +220,11 @@ func testRollingUpdateDeploymentEvents(f *Framework) { // Create a deployment to delete nginx pods and instead bring up redis pods. deploymentName := "redis-deployment" Logf("Creating deployment %s", deploymentName) - newDeployment := experimental.Deployment{ + newDeployment := extensions.Deployment{ ObjectMeta: api.ObjectMeta{ Name: deploymentName, }, - Spec: experimental.DeploymentSpec{ + Spec: extensions.DeploymentSpec{ Replicas: 1, Selector: deploymentPodLabels, UniqueLabelKey: "deployment.kubernetes.io/podTemplateHash", diff --git a/test/e2e/horizontal_pod_autoscaling.go b/test/e2e/horizontal_pod_autoscaling.go index 00fab36279a..896e28a9547 100644 --- a/test/e2e/horizontal_pod_autoscaling.go +++ b/test/e2e/horizontal_pod_autoscaling.go @@ -19,7 +19,7 @@ package e2e import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/apis/experimental" + "k8s.io/kubernetes/pkg/apis/extensions" . "github.com/onsi/ginkgo" ) @@ -152,13 +152,13 @@ var _ = Describe("Horizontal pod autoscaling", func() { }) func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) { - hpa := &experimental.HorizontalPodAutoscaler{ + hpa := &extensions.HorizontalPodAutoscaler{ ObjectMeta: api.ObjectMeta{ Name: rc.name, Namespace: rc.framework.Namespace.Name, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Kind: kind, Name: rc.name, Namespace: rc.framework.Namespace.Name, @@ -166,7 +166,7 @@ func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) { }, MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(cpu)}, + Target: extensions.ResourceConsumption{Resource: api.ResourceCPU, Quantity: resource.MustParse(cpu)}, }, } _, errHPA := rc.framework.Client.Experimental().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa) @@ -175,13 +175,13 @@ func createCPUHorizontalPodAutoscaler(rc *ResourceConsumer, cpu string) { // argument memory is in megabytes func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) { - hpa := &experimental.HorizontalPodAutoscaler{ + hpa := &extensions.HorizontalPodAutoscaler{ ObjectMeta: api.ObjectMeta{ Name: rc.name, Namespace: rc.framework.Namespace.Name, }, - Spec: experimental.HorizontalPodAutoscalerSpec{ - ScaleRef: &experimental.SubresourceReference{ + Spec: extensions.HorizontalPodAutoscalerSpec{ + ScaleRef: &extensions.SubresourceReference{ Kind: kind, Name: rc.name, Namespace: rc.framework.Namespace.Name, @@ -189,7 +189,7 @@ func createMemoryHorizontalPodAutoscaler(rc *ResourceConsumer, memory string) { }, MinReplicas: 1, MaxReplicas: 5, - Target: experimental.ResourceConsumption{Resource: api.ResourceMemory, Quantity: resource.MustParse(memory + "M")}, + Target: extensions.ResourceConsumption{Resource: api.ResourceMemory, Quantity: resource.MustParse(memory + "M")}, }, } _, errHPA := rc.framework.Client.Experimental().HorizontalPodAutoscalers(rc.framework.Namespace.Name).Create(hpa) diff --git a/test/e2e/job.go b/test/e2e/job.go index 62f5acc9dfb..712202a39b9 100644 --- a/test/e2e/job.go +++ b/test/e2e/job.go @@ -21,7 +21,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/fields" "k8s.io/kubernetes/pkg/kubectl" @@ -183,12 +183,12 @@ var _ = Describe("Job", func() { }) // newTestJob returns a job which does one of several testing behaviors. -func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, completions int) *experimental.Job { - job := &experimental.Job{ +func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, completions int) *extensions.Job { + job := &extensions.Job{ ObjectMeta: api.ObjectMeta{ Name: name, }, - Spec: experimental.JobSpec{ + Spec: extensions.JobSpec{ Parallelism: ¶llelism, Completions: &completions, Template: &api.PodTemplateSpec{ @@ -223,7 +223,7 @@ func newTestJob(behavior, name string, rPol api.RestartPolicy, parallelism, comp return job } -func createJob(c *client.Client, ns string, job *experimental.Job) (*experimental.Job, error) { +func createJob(c *client.Client, ns string, job *extensions.Job) (*extensions.Job, error) { return c.Experimental().Jobs(ns).Create(job) } diff --git a/test/integration/auth_test.go b/test/integration/auth_test.go index 6df5651aa0d..2ed14a6039e 100644 --- a/test/integration/auth_test.go +++ b/test/integration/auth_test.go @@ -852,7 +852,7 @@ func TestAuthorizationAttributeDetermination(t *testing.T) { expectedAttributes authorizer.Attributes }{ "prefix/version/resource": {"GET", "/api/v1/pods", authorizer.AttributesRecord{APIGroup: "", Resource: "pods"}}, - "prefix/group/version/resource": {"GET", "/apis/experimental/v1/pods", authorizer.AttributesRecord{APIGroup: "experimental", Resource: "pods"}}, + "prefix/group/version/resource": {"GET", "/apis/extensions/v1/pods", authorizer.AttributesRecord{APIGroup: "extensions", Resource: "pods"}}, } currentAuthorizationAttributesIndex := 0 diff --git a/test/integration/framework/master_utils.go b/test/integration/framework/master_utils.go index e6fd83c6c74..c34a7de846d 100644 --- a/test/integration/framework/master_utils.go +++ b/test/integration/framework/master_utils.go @@ -131,14 +131,14 @@ func startMasterOrDie(masterConfig *master.Config) (*master.Master, *httptest.Se if err != nil { glog.Fatalf("Failed to create etcd storage for master %v", err) } - expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("experimental").InterfacesFor, latest.GroupOrDie("experimental").GroupVersion, etcdtest.PathPrefix()) - storageVersions["experimental"] = latest.GroupOrDie("experimental").GroupVersion + expEtcdStorage, err := master.NewEtcdStorage(etcdClient, latest.GroupOrDie("extensions").InterfacesFor, latest.GroupOrDie("extensions").GroupVersion, etcdtest.PathPrefix()) + storageVersions["extensions"] = latest.GroupOrDie("extensions").GroupVersion if err != nil { glog.Fatalf("Failed to create etcd storage for master %v", err) } storageDestinations := master.NewStorageDestinations() storageDestinations.AddAPIGroup("", etcdStorage) - storageDestinations.AddAPIGroup("experimental", expEtcdStorage) + storageDestinations.AddAPIGroup("extensions", expEtcdStorage) masterConfig = &master.Config{ StorageDestinations: storageDestinations, @@ -275,14 +275,14 @@ func RunAMaster(t *testing.T) (*master.Master, *httptest.Server) { if err != nil { t.Fatalf("unexpected error: %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 { t.Fatalf("unexpected error: %v", err) } storageDestinations := master.NewStorageDestinations() storageDestinations.AddAPIGroup("", etcdStorage) - storageDestinations.AddAPIGroup("experimental", expEtcdStorage) + storageDestinations.AddAPIGroup("extensions", expEtcdStorage) m := master.New(&master.Config{ StorageDestinations: storageDestinations, diff --git a/test/integration/kubectl_test.go b/test/integration/kubectl_test.go index c747e080d50..0847ba3fb9e 100644 --- a/test/integration/kubectl_test.go +++ b/test/integration/kubectl_test.go @@ -38,8 +38,8 @@ func TestKubectlValidation(t *testing.T) { // The following test the experimental api. // TOOD: Replace with something more robust. These may move. - {`{"apiVersion": "experimental/v1alpha1", "kind": "DaemonSet"}`, false}, - {`{"apiVersion": "experimental/v1alpha1", "kind": "Job"}`, false}, + {`{"apiVersion": "extensions/v1beta1", "kind": "DaemonSet"}`, false}, + {`{"apiVersion": "extensions/v1beta1", "kind": "Job"}`, false}, {`{"apiVersion": "vNotAVersion", "kind": "Job"}`, true}, } components := framework.NewMasterComponents(&framework.Config{}) diff --git a/test/integration/master_test.go b/test/integration/master_test.go index 8925dfbfcba..80c4c4ec500 100644 --- a/test/integration/master_test.go +++ b/test/integration/master_test.go @@ -29,7 +29,7 @@ func TestExperimentalPrefix(t *testing.T) { _, s := framework.RunAMaster(t) defer s.Close() - resp, err := http.Get(s.URL + "/apis/experimental/") + resp, err := http.Get(s.URL + "/apis/extensions/") if err != nil { t.Fatalf("unexpected error getting experimental prefix: %v", err) }