diff --git a/cmd/kube-apiserver/app/apiextensions.go b/cmd/kube-apiserver/app/apiextensions.go index 211c2096629..75ef8a8cd89 100644 --- a/cmd/kube-apiserver/app/apiextensions.go +++ b/cmd/kube-apiserver/app/apiextensions.go @@ -47,7 +47,7 @@ func createAPIExtensionsConfig(kubeAPIServerConfig genericapiserver.Config, comm // copy the etcd options so we don't mutate originals. etcdOptions := *commandOptions.Etcd - etcdOptions.StorageConfig.Codec = apiextensionsapiserver.Codecs.LegacyCodec(schema.GroupVersion{Group: "apiextensions.k8s.io", Version: "v1alpha1"}) + etcdOptions.StorageConfig.Codec = apiextensionsapiserver.Codecs.LegacyCodec(schema.GroupVersion{Group: "apiextensions.k8s.io", Version: "v1beta1"}) etcdOptions.StorageConfig.Copier = apiextensionsapiserver.Scheme genericConfig.RESTOptionsGetter = &genericoptions.SimpleRestOptionsFactory{Options: etcdOptions} diff --git a/hack/.linted_packages b/hack/.linted_packages index 6bb1374b3d7..f0f818422d9 100644 --- a/hack/.linted_packages +++ b/hack/.linted_packages @@ -436,12 +436,12 @@ staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/validation staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions -staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1 +staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1 staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion/apiextensions/internalversion staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/internalversion -staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1 +staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1 staging/src/k8s.io/kube-apiextensions-server/test/integration staging/src/k8s.io/metrics/pkg/apis/custom_metrics/install staging/src/k8s.io/metrics/pkg/apis/metrics/install diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index df17b1a38dc..87fc834188b 100644 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -1322,7 +1322,7 @@ run_crd_tests() { kubectl "${kube_flags_with_token[@]}" create -f - << __EOF__ { "kind": "CustomResourceDefinition", - "apiVersion": "apiextensions.k8s.io/v1alpha1", + "apiVersion": "apiextensions.k8s.io/v1beta1", "metadata": { "name": "foos.company.com" }, @@ -1343,7 +1343,7 @@ __EOF__ kubectl "${kube_flags_with_token[@]}" create -f - << __EOF__ { "kind": "CustomResourceDefinition", - "apiVersion": "apiextensions.k8s.io/v1alpha1", + "apiVersion": "apiextensions.k8s.io/v1beta1", "metadata": { "name": "bars.company.com" }, diff --git a/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml b/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml index 8011eee8fa8..86205f9dbfe 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml +++ b/staging/src/k8s.io/kube-apiextensions-server/artifacts/customresource-01/noxu-resource-definition.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1alpha1 +apiVersion: apiextensions.k8s.io/v1beta1 kind: CustomResourceDefinition metadata: name: noxus.mygroup.example.com diff --git a/staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh b/staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh index 23f60f40043..2784f1b4f47 100755 --- a/staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh +++ b/staging/src/k8s.io/kube-apiextensions-server/hack/update-codegen.sh @@ -47,20 +47,20 @@ PREFIX=k8s.io/kube-apiextensions-server/pkg/apis INPUT_BASE="--input-base ${PREFIX}" INPUT_APIS=( apiextensions/ -apiextensions/v1alpha1 +apiextensions/v1beta1 ) INPUT="--input ${INPUT_APIS[@]}" CLIENTSET_PATH="--clientset-path k8s.io/kube-apiextensions-server/pkg/client/clientset" ${CLIENTGEN} ${INPUT_BASE} ${INPUT} ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor -${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1alpha1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor +${CLIENTGEN} --clientset-name="clientset" ${INPUT_BASE} --input apiextensions/v1beta1 ${CLIENTSET_PATH} --output-base ${KUBE_ROOT}/vendor echo "Building lister-gen" listergen="${PWD}/lister-gen" go build -o "${listergen}" ./cmd/libs/go2idl/lister-gen -LISTER_INPUT="--input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" +LISTER_INPUT="--input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" LISTER_PATH="--output-package k8s.io/kube-apiextensions-server/pkg/client/listers" ${listergen} ${LISTER_INPUT} ${LISTER_PATH} --output-base ${KUBE_ROOT}/vendor @@ -71,7 +71,7 @@ go build -o "${informergen}" ./cmd/libs/go2idl/informer-gen ${informergen} \ --output-base ${KUBE_ROOT}/vendor \ - --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1 \ + --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions --input-dirs k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1 \ --versioned-clientset-package k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset \ --internal-clientset-package k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset \ --listers-package k8s.io/kube-apiextensions-server/pkg/client/listers \ diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD index a13b2b1dd6e..cbfb0dad5fb 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/BUILD @@ -30,6 +30,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go index 1efb0cebeae..f568d22dad9 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install/install.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // Install registers the API group and adds types to a scheme @@ -31,12 +31,12 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r &announced.GroupMetaFactoryArgs{ GroupName: apiextensions.GroupName, RootScopedKinds: sets.NewString("CustomResourceDefinition"), - VersionPreferenceOrder: []string{v1alpha1.SchemeGroupVersion.Version}, + VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version}, ImportPrefix: "k8s.io/kube-apiextensions-server/pkg/apis/apiextension", AddInternalObjectsToScheme: apiextensions.AddToScheme, }, announced.VersionToSchemeFunc{ - v1alpha1.SchemeGroupVersion.Version: v1alpha1.AddToScheme, + v1beta1.SchemeGroupVersion.Version: v1beta1.AddToScheme, }, ).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil { panic(err) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/zz_generated.conversion.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/zz_generated.conversion.go deleted file mode 100644 index 53b5569b6ca..00000000000 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/zz_generated.conversion.go +++ /dev/null @@ -1,225 +0,0 @@ -// +build !ignore_autogenerated - -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This file was autogenerated by conversion-gen. Do not edit it manually! - -package v1alpha1 - -import ( - conversion "k8s.io/apimachinery/pkg/conversion" - runtime "k8s.io/apimachinery/pkg/runtime" - apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" - unsafe "unsafe" -) - -func init() { - SchemeBuilder.Register(RegisterConversions) -} - -// RegisterConversions adds conversion functions to the given scheme. -// Public to allow building arbitrary schemes. -func RegisterConversions(scheme *runtime.Scheme) error { - return scheme.AddGeneratedConversionFuncs( - Convert_v1alpha1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition, - Convert_apiextensions_CustomResourceDefinition_To_v1alpha1_CustomResourceDefinition, - Convert_v1alpha1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition, - Convert_apiextensions_CustomResourceDefinitionCondition_To_v1alpha1_CustomResourceDefinitionCondition, - Convert_v1alpha1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList, - Convert_apiextensions_CustomResourceDefinitionList_To_v1alpha1_CustomResourceDefinitionList, - Convert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames, - Convert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames, - Convert_v1alpha1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec, - Convert_apiextensions_CustomResourceDefinitionSpec_To_v1alpha1_CustomResourceDefinitionSpec, - Convert_v1alpha1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus, - Convert_apiextensions_CustomResourceDefinitionStatus_To_v1alpha1_CustomResourceDefinitionStatus, - ) -} - -func autoConvert_v1alpha1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_v1alpha1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_v1alpha1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition is an autogenerated conversion function. -func Convert_v1alpha1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { - return autoConvert_v1alpha1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in, out, s) -} - -func autoConvert_apiextensions_CustomResourceDefinition_To_v1alpha1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { - out.ObjectMeta = in.ObjectMeta - if err := Convert_apiextensions_CustomResourceDefinitionSpec_To_v1alpha1_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { - return err - } - if err := Convert_apiextensions_CustomResourceDefinitionStatus_To_v1alpha1_CustomResourceDefinitionStatus(&in.Status, &out.Status, s); err != nil { - return err - } - return nil -} - -// Convert_apiextensions_CustomResourceDefinition_To_v1alpha1_CustomResourceDefinition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinition_To_v1alpha1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { - return autoConvert_apiextensions_CustomResourceDefinition_To_v1alpha1_CustomResourceDefinition(in, out, s) -} - -func autoConvert_v1alpha1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { - out.Type = apiextensions.CustomResourceDefinitionConditionType(in.Type) - out.Status = apiextensions.ConditionStatus(in.Status) - out.LastTransitionTime = in.LastTransitionTime - out.Reason = in.Reason - out.Message = in.Message - return nil -} - -// Convert_v1alpha1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition is an autogenerated conversion function. -func Convert_v1alpha1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { - return autoConvert_v1alpha1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in, out, s) -} - -func autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1alpha1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { - out.Type = CustomResourceDefinitionConditionType(in.Type) - out.Status = ConditionStatus(in.Status) - out.LastTransitionTime = in.LastTransitionTime - out.Reason = in.Reason - out.Message = in.Message - return nil -} - -// Convert_apiextensions_CustomResourceDefinitionCondition_To_v1alpha1_CustomResourceDefinitionCondition is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionCondition_To_v1alpha1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { - return autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1alpha1_CustomResourceDefinitionCondition(in, out, s) -} - -func autoConvert_v1alpha1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - out.Items = *(*[]apiextensions.CustomResourceDefinition)(unsafe.Pointer(&in.Items)) - return nil -} - -// Convert_v1alpha1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList is an autogenerated conversion function. -func Convert_v1alpha1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { - return autoConvert_v1alpha1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in, out, s) -} - -func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1alpha1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { - out.ListMeta = in.ListMeta - if in.Items == nil { - out.Items = make([]CustomResourceDefinition, 0) - } else { - out.Items = *(*[]CustomResourceDefinition)(unsafe.Pointer(&in.Items)) - } - return nil -} - -// Convert_apiextensions_CustomResourceDefinitionList_To_v1alpha1_CustomResourceDefinitionList is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionList_To_v1alpha1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { - return autoConvert_apiextensions_CustomResourceDefinitionList_To_v1alpha1_CustomResourceDefinitionList(in, out, s) -} - -func autoConvert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { - out.Plural = in.Plural - out.Singular = in.Singular - out.ShortNames = *(*[]string)(unsafe.Pointer(&in.ShortNames)) - out.Kind = in.Kind - out.ListKind = in.ListKind - return nil -} - -// Convert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames is an autogenerated conversion function. -func Convert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { - return autoConvert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in, out, s) -} - -func autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { - out.Plural = in.Plural - out.Singular = in.Singular - out.ShortNames = *(*[]string)(unsafe.Pointer(&in.ShortNames)) - out.Kind = in.Kind - out.ListKind = in.ListKind - return nil -} - -// Convert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { - return autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames(in, out, s) -} - -func autoConvert_v1alpha1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { - out.Group = in.Group - out.Version = in.Version - if err := Convert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { - return err - } - out.Scope = apiextensions.ResourceScope(in.Scope) - return nil -} - -// Convert_v1alpha1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec is an autogenerated conversion function. -func Convert_v1alpha1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { - return autoConvert_v1alpha1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in, out, s) -} - -func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1alpha1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { - out.Group = in.Group - out.Version = in.Version - if err := Convert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { - return err - } - out.Scope = ResourceScope(in.Scope) - return nil -} - -// Convert_apiextensions_CustomResourceDefinitionSpec_To_v1alpha1_CustomResourceDefinitionSpec is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1alpha1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { - return autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1alpha1_CustomResourceDefinitionSpec(in, out, s) -} - -func autoConvert_v1alpha1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { - out.Conditions = *(*[]apiextensions.CustomResourceDefinitionCondition)(unsafe.Pointer(&in.Conditions)) - if err := Convert_v1alpha1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(&in.AcceptedNames, &out.AcceptedNames, s); err != nil { - return err - } - return nil -} - -// Convert_v1alpha1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus is an autogenerated conversion function. -func Convert_v1alpha1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { - return autoConvert_v1alpha1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in, out, s) -} - -func autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1alpha1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { - if in.Conditions == nil { - out.Conditions = make([]CustomResourceDefinitionCondition, 0) - } else { - out.Conditions = *(*[]CustomResourceDefinitionCondition)(unsafe.Pointer(&in.Conditions)) - } - if err := Convert_apiextensions_CustomResourceDefinitionNames_To_v1alpha1_CustomResourceDefinitionNames(&in.AcceptedNames, &out.AcceptedNames, s); err != nil { - return err - } - return nil -} - -// Convert_apiextensions_CustomResourceDefinitionStatus_To_v1alpha1_CustomResourceDefinitionStatus is an autogenerated conversion function. -func Convert_apiextensions_CustomResourceDefinitionStatus_To_v1alpha1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { - return autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1alpha1_CustomResourceDefinitionStatus(in, out, s) -} diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/BUILD similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/BUILD rename to staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/BUILD diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/defaults.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/defaults.go similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/defaults.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/defaults.go index 50a4e2ac28d..edffaed55f0 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/defaults.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/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 ( "strings" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/doc.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go similarity index 84% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/doc.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go index c5d447effd0..6cf6a3d3ec0 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/doc.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/doc.go @@ -18,6 +18,6 @@ limitations under the License. // +k8s:conversion-gen=k8s.io/kubernetes/vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions // +k8s:defaulter-gen=TypeMeta -// Package v1alpha1 is the v1alpha1 version of the API. +// Package v1beta1 is the v1beta1 version of the API. // +groupName=apiextensions.k8s.io -package v1alpha1 // import "k8s.io/apiextension-server/pkg/apis/apiextensions/v1alpha1" +package v1beta1 // import "k8s.io/apiextension-server/pkg/apis/apiextensions/v1beta1" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/register.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/register.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/register.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/register.go index 45aa6e659eb..7eda9b53214 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/register.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/register.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -25,7 +25,7 @@ import ( const GroupName = "apiextensions.k8s.io" // SchemeGroupVersion is group version used to register these objects -var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1alpha1"} +var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"} // Kind takes an unqualified kind and returns back a Group qualified GroupKind func Kind(kind string) schema.GroupKind { diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/types.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/types.go similarity index 99% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/types.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/types.go index 0d6fb7e027d..a9a93c37f9f 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/types.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/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 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go new file mode 100644 index 00000000000..137523f391d --- /dev/null +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.conversion.go @@ -0,0 +1,225 @@ +// +build !ignore_autogenerated + +/* +Copyright 2017 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +// This file was autogenerated by conversion-gen. Do not edit it manually! + +package v1beta1 + +import ( + conversion "k8s.io/apimachinery/pkg/conversion" + runtime "k8s.io/apimachinery/pkg/runtime" + apiextensions "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" + unsafe "unsafe" +) + +func init() { + SchemeBuilder.Register(RegisterConversions) +} + +// RegisterConversions adds conversion functions to the given scheme. +// Public to allow building arbitrary schemes. +func RegisterConversions(scheme *runtime.Scheme) error { + return scheme.AddGeneratedConversionFuncs( + Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition, + Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition, + Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition, + Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition, + Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList, + Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList, + Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames, + Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames, + Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec, + Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec, + Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus, + Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus, + ) +} + +func autoConvert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition is an autogenerated conversion function. +func Convert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in *CustomResourceDefinition, out *apiextensions.CustomResourceDefinition, s conversion.Scope) error { + return autoConvert_v1beta1_CustomResourceDefinition_To_apiextensions_CustomResourceDefinition(in, out, s) +} + +func autoConvert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { + out.ObjectMeta = in.ObjectMeta + if err := Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(&in.Spec, &out.Spec, s); err != nil { + return err + } + if err := Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(&in.Status, &out.Status, s); err != nil { + return err + } + return nil +} + +// Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition is an autogenerated conversion function. +func Convert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in *apiextensions.CustomResourceDefinition, out *CustomResourceDefinition, s conversion.Scope) error { + return autoConvert_apiextensions_CustomResourceDefinition_To_v1beta1_CustomResourceDefinition(in, out, s) +} + +func autoConvert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { + out.Type = apiextensions.CustomResourceDefinitionConditionType(in.Type) + out.Status = apiextensions.ConditionStatus(in.Status) + out.LastTransitionTime = in.LastTransitionTime + out.Reason = in.Reason + out.Message = in.Message + return nil +} + +// Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition is an autogenerated conversion function. +func Convert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in *CustomResourceDefinitionCondition, out *apiextensions.CustomResourceDefinitionCondition, s conversion.Scope) error { + return autoConvert_v1beta1_CustomResourceDefinitionCondition_To_apiextensions_CustomResourceDefinitionCondition(in, out, s) +} + +func autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { + out.Type = CustomResourceDefinitionConditionType(in.Type) + out.Status = ConditionStatus(in.Status) + out.LastTransitionTime = in.LastTransitionTime + out.Reason = in.Reason + out.Message = in.Message + return nil +} + +// Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition is an autogenerated conversion function. +func Convert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in *apiextensions.CustomResourceDefinitionCondition, out *CustomResourceDefinitionCondition, s conversion.Scope) error { + return autoConvert_apiextensions_CustomResourceDefinitionCondition_To_v1beta1_CustomResourceDefinitionCondition(in, out, s) +} + +func autoConvert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + out.Items = *(*[]apiextensions.CustomResourceDefinition)(unsafe.Pointer(&in.Items)) + return nil +} + +// Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList is an autogenerated conversion function. +func Convert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in *CustomResourceDefinitionList, out *apiextensions.CustomResourceDefinitionList, s conversion.Scope) error { + return autoConvert_v1beta1_CustomResourceDefinitionList_To_apiextensions_CustomResourceDefinitionList(in, out, s) +} + +func autoConvert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { + out.ListMeta = in.ListMeta + if in.Items == nil { + out.Items = make([]CustomResourceDefinition, 0) + } else { + out.Items = *(*[]CustomResourceDefinition)(unsafe.Pointer(&in.Items)) + } + return nil +} + +// Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList is an autogenerated conversion function. +func Convert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in *apiextensions.CustomResourceDefinitionList, out *CustomResourceDefinitionList, s conversion.Scope) error { + return autoConvert_apiextensions_CustomResourceDefinitionList_To_v1beta1_CustomResourceDefinitionList(in, out, s) +} + +func autoConvert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { + out.Plural = in.Plural + out.Singular = in.Singular + out.ShortNames = *(*[]string)(unsafe.Pointer(&in.ShortNames)) + out.Kind = in.Kind + out.ListKind = in.ListKind + return nil +} + +// Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames is an autogenerated conversion function. +func Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in *CustomResourceDefinitionNames, out *apiextensions.CustomResourceDefinitionNames, s conversion.Scope) error { + return autoConvert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(in, out, s) +} + +func autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { + out.Plural = in.Plural + out.Singular = in.Singular + out.ShortNames = *(*[]string)(unsafe.Pointer(&in.ShortNames)) + out.Kind = in.Kind + out.ListKind = in.ListKind + return nil +} + +// Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames is an autogenerated conversion function. +func Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in *apiextensions.CustomResourceDefinitionNames, out *CustomResourceDefinitionNames, s conversion.Scope) error { + return autoConvert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(in, out, s) +} + +func autoConvert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { + out.Group = in.Group + out.Version = in.Version + if err := Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { + return err + } + out.Scope = apiextensions.ResourceScope(in.Scope) + return nil +} + +// Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec is an autogenerated conversion function. +func Convert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in *CustomResourceDefinitionSpec, out *apiextensions.CustomResourceDefinitionSpec, s conversion.Scope) error { + return autoConvert_v1beta1_CustomResourceDefinitionSpec_To_apiextensions_CustomResourceDefinitionSpec(in, out, s) +} + +func autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { + out.Group = in.Group + out.Version = in.Version + if err := Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(&in.Names, &out.Names, s); err != nil { + return err + } + out.Scope = ResourceScope(in.Scope) + return nil +} + +// Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec is an autogenerated conversion function. +func Convert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in *apiextensions.CustomResourceDefinitionSpec, out *CustomResourceDefinitionSpec, s conversion.Scope) error { + return autoConvert_apiextensions_CustomResourceDefinitionSpec_To_v1beta1_CustomResourceDefinitionSpec(in, out, s) +} + +func autoConvert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { + out.Conditions = *(*[]apiextensions.CustomResourceDefinitionCondition)(unsafe.Pointer(&in.Conditions)) + if err := Convert_v1beta1_CustomResourceDefinitionNames_To_apiextensions_CustomResourceDefinitionNames(&in.AcceptedNames, &out.AcceptedNames, s); err != nil { + return err + } + return nil +} + +// Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus is an autogenerated conversion function. +func Convert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in *CustomResourceDefinitionStatus, out *apiextensions.CustomResourceDefinitionStatus, s conversion.Scope) error { + return autoConvert_v1beta1_CustomResourceDefinitionStatus_To_apiextensions_CustomResourceDefinitionStatus(in, out, s) +} + +func autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { + if in.Conditions == nil { + out.Conditions = make([]CustomResourceDefinitionCondition, 0) + } else { + out.Conditions = *(*[]CustomResourceDefinitionCondition)(unsafe.Pointer(&in.Conditions)) + } + if err := Convert_apiextensions_CustomResourceDefinitionNames_To_v1beta1_CustomResourceDefinitionNames(&in.AcceptedNames, &out.AcceptedNames, s); err != nil { + return err + } + return nil +} + +// Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus is an autogenerated conversion function. +func Convert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in *apiextensions.CustomResourceDefinitionStatus, out *CustomResourceDefinitionStatus, s conversion.Scope) error { + return autoConvert_apiextensions_CustomResourceDefinitionStatus_To_v1beta1_CustomResourceDefinitionStatus(in, out, s) +} diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go similarity index 64% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/zz_generated.deepcopy.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go index edfa95b5ef7..5291372c340 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1/zz_generated.deepcopy.go @@ -18,7 +18,7 @@ limitations under the License. // This file was autogenerated by deepcopy-gen. Do not edit it manually! -package v1alpha1 +package v1beta1 import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -35,17 +35,17 @@ func init() { // to allow building arbitrary schemes. func RegisterDeepCopies(scheme *runtime.Scheme) error { return scheme.AddGeneratedDeepCopyFuncs( - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CustomResourceDefinition, InType: reflect.TypeOf(&CustomResourceDefinition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CustomResourceDefinitionCondition, InType: reflect.TypeOf(&CustomResourceDefinitionCondition{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CustomResourceDefinitionList, InType: reflect.TypeOf(&CustomResourceDefinitionList{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CustomResourceDefinitionNames, InType: reflect.TypeOf(&CustomResourceDefinitionNames{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CustomResourceDefinitionSpec, InType: reflect.TypeOf(&CustomResourceDefinitionSpec{})}, - conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1alpha1_CustomResourceDefinitionStatus, InType: reflect.TypeOf(&CustomResourceDefinitionStatus{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomResourceDefinition, InType: reflect.TypeOf(&CustomResourceDefinition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomResourceDefinitionCondition, InType: reflect.TypeOf(&CustomResourceDefinitionCondition{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomResourceDefinitionList, InType: reflect.TypeOf(&CustomResourceDefinitionList{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomResourceDefinitionNames, InType: reflect.TypeOf(&CustomResourceDefinitionNames{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomResourceDefinitionSpec, InType: reflect.TypeOf(&CustomResourceDefinitionSpec{})}, + conversion.GeneratedDeepCopyFunc{Fn: DeepCopy_v1beta1_CustomResourceDefinitionStatus, InType: reflect.TypeOf(&CustomResourceDefinitionStatus{})}, ) } -// DeepCopy_v1alpha1_CustomResourceDefinition is an autogenerated deepcopy function. -func DeepCopy_v1alpha1_CustomResourceDefinition(in interface{}, out interface{}, c *conversion.Cloner) error { +// DeepCopy_v1beta1_CustomResourceDefinition is an autogenerated deepcopy function. +func DeepCopy_v1beta1_CustomResourceDefinition(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*CustomResourceDefinition) out := out.(*CustomResourceDefinition) @@ -69,8 +69,8 @@ func DeepCopy_v1alpha1_CustomResourceDefinition(in interface{}, out interface{}, } } -// DeepCopy_v1alpha1_CustomResourceDefinitionCondition is an autogenerated deepcopy function. -func DeepCopy_v1alpha1_CustomResourceDefinitionCondition(in interface{}, out interface{}, c *conversion.Cloner) error { +// DeepCopy_v1beta1_CustomResourceDefinitionCondition is an autogenerated deepcopy function. +func DeepCopy_v1beta1_CustomResourceDefinitionCondition(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*CustomResourceDefinitionCondition) out := out.(*CustomResourceDefinitionCondition) @@ -80,8 +80,8 @@ func DeepCopy_v1alpha1_CustomResourceDefinitionCondition(in interface{}, out int } } -// DeepCopy_v1alpha1_CustomResourceDefinitionList is an autogenerated deepcopy function. -func DeepCopy_v1alpha1_CustomResourceDefinitionList(in interface{}, out interface{}, c *conversion.Cloner) error { +// DeepCopy_v1beta1_CustomResourceDefinitionList is an autogenerated deepcopy function. +func DeepCopy_v1beta1_CustomResourceDefinitionList(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*CustomResourceDefinitionList) out := out.(*CustomResourceDefinitionList) @@ -101,8 +101,8 @@ func DeepCopy_v1alpha1_CustomResourceDefinitionList(in interface{}, out interfac } } -// DeepCopy_v1alpha1_CustomResourceDefinitionNames is an autogenerated deepcopy function. -func DeepCopy_v1alpha1_CustomResourceDefinitionNames(in interface{}, out interface{}, c *conversion.Cloner) error { +// DeepCopy_v1beta1_CustomResourceDefinitionNames is an autogenerated deepcopy function. +func DeepCopy_v1beta1_CustomResourceDefinitionNames(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*CustomResourceDefinitionNames) out := out.(*CustomResourceDefinitionNames) @@ -116,8 +116,8 @@ func DeepCopy_v1alpha1_CustomResourceDefinitionNames(in interface{}, out interfa } } -// DeepCopy_v1alpha1_CustomResourceDefinitionSpec is an autogenerated deepcopy function. -func DeepCopy_v1alpha1_CustomResourceDefinitionSpec(in interface{}, out interface{}, c *conversion.Cloner) error { +// DeepCopy_v1beta1_CustomResourceDefinitionSpec is an autogenerated deepcopy function. +func DeepCopy_v1beta1_CustomResourceDefinitionSpec(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*CustomResourceDefinitionSpec) out := out.(*CustomResourceDefinitionSpec) @@ -131,8 +131,8 @@ func DeepCopy_v1alpha1_CustomResourceDefinitionSpec(in interface{}, out interfac } } -// DeepCopy_v1alpha1_CustomResourceDefinitionStatus is an autogenerated deepcopy function. -func DeepCopy_v1alpha1_CustomResourceDefinitionStatus(in interface{}, out interface{}, c *conversion.Cloner) error { +// DeepCopy_v1beta1_CustomResourceDefinitionStatus is an autogenerated deepcopy function. +func DeepCopy_v1beta1_CustomResourceDefinitionStatus(in interface{}, out interface{}, c *conversion.Cloner) error { { in := in.(*CustomResourceDefinitionStatus) out := out.(*CustomResourceDefinitionStatus) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD index 7bcbf18de77..41702b8e5b6 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/BUILD @@ -47,7 +47,7 @@ go_library( "//vendor/k8s.io/client-go/util/workqueue:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions:go_default_library", diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go index 56a6ec4954b..5c8d1799ce5 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/apiserver/apiserver.go @@ -38,7 +38,7 @@ import ( "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions" "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/install" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" "k8s.io/kube-apiextensions-server/pkg/client/clientset/internalclientset" internalinformers "k8s.io/kube-apiextensions-server/pkg/client/informers/internalversion" "k8s.io/kube-apiextensions-server/pkg/controller/finalizer" @@ -121,12 +121,12 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) } apiGroupInfo := genericapiserver.NewDefaultAPIGroupInfo(apiextensions.GroupName, registry, Scheme, metav1.ParameterCodec, Codecs) - apiGroupInfo.GroupMeta.GroupVersion = v1alpha1.SchemeGroupVersion + apiGroupInfo.GroupMeta.GroupVersion = v1beta1.SchemeGroupVersion customResourceDefintionStorage := customresourcedefinition.NewREST(Scheme, c.GenericConfig.RESTOptionsGetter) - v1alpha1storage := map[string]rest.Storage{} - v1alpha1storage["customresourcedefinitions"] = customResourceDefintionStorage - v1alpha1storage["customresourcedefinitions/status"] = customresourcedefinition.NewStatusREST(Scheme, customResourceDefintionStorage) - apiGroupInfo.VersionedResourcesStorageMap["v1alpha1"] = v1alpha1storage + v1beta1storage := map[string]rest.Storage{} + v1beta1storage["customresourcedefinitions"] = customResourceDefintionStorage + v1beta1storage["customresourcedefinitions/status"] = customresourcedefinition.NewStatusREST(Scheme, customResourceDefintionStorage) + apiGroupInfo.VersionedResourcesStorageMap["v1beta1"] = v1beta1storage if err := s.GenericAPIServer.InstallAPIGroup(&apiGroupInfo); err != nil { return nil, err diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD index 7123a33a2ea..2c05f71234c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/BUILD @@ -19,6 +19,6 @@ go_library( "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/util/flowcontrol:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go index ff053821409..7a2f136c15d 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/clientset.go @@ -21,38 +21,38 @@ import ( discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" ) type Interface interface { Discovery() discovery.DiscoveryInterface - ApiextensionsV1alpha1() apiextensionsv1alpha1.ApiextensionsV1alpha1Interface + ApiextensionsV1beta1() apiextensionsv1beta1.ApiextensionsV1beta1Interface // Deprecated: please explicitly pick a version if possible. - Apiextensions() apiextensionsv1alpha1.ApiextensionsV1alpha1Interface + Apiextensions() apiextensionsv1beta1.ApiextensionsV1beta1Interface } // Clientset contains the clients for groups. Each group has exactly one // version included in a Clientset. type Clientset struct { *discovery.DiscoveryClient - *apiextensionsv1alpha1.ApiextensionsV1alpha1Client + *apiextensionsv1beta1.ApiextensionsV1beta1Client } -// ApiextensionsV1alpha1 retrieves the ApiextensionsV1alpha1Client -func (c *Clientset) ApiextensionsV1alpha1() apiextensionsv1alpha1.ApiextensionsV1alpha1Interface { +// ApiextensionsV1beta1 retrieves the ApiextensionsV1beta1Client +func (c *Clientset) ApiextensionsV1beta1() apiextensionsv1beta1.ApiextensionsV1beta1Interface { if c == nil { return nil } - return c.ApiextensionsV1alpha1Client + return c.ApiextensionsV1beta1Client } // Deprecated: Apiextensions retrieves the default version of ApiextensionsClient. // Please explicitly pick a version. -func (c *Clientset) Apiextensions() apiextensionsv1alpha1.ApiextensionsV1alpha1Interface { +func (c *Clientset) Apiextensions() apiextensionsv1beta1.ApiextensionsV1beta1Interface { if c == nil { return nil } - return c.ApiextensionsV1alpha1Client + return c.ApiextensionsV1beta1Client } // Discovery retrieves the DiscoveryClient @@ -71,7 +71,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { } var cs Clientset var err error - cs.ApiextensionsV1alpha1Client, err = apiextensionsv1alpha1.NewForConfig(&configShallowCopy) + cs.ApiextensionsV1beta1Client, err = apiextensionsv1beta1.NewForConfig(&configShallowCopy) if err != nil { return nil, err } @@ -88,7 +88,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) { // panics if there is an error in the config. func NewForConfigOrDie(c *rest.Config) *Clientset { var cs Clientset - cs.ApiextensionsV1alpha1Client = apiextensionsv1alpha1.NewForConfigOrDie(c) + cs.ApiextensionsV1beta1Client = apiextensionsv1beta1.NewForConfigOrDie(c) cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c) return &cs @@ -97,7 +97,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset { // New creates a new Clientset for the given RESTClient. func New(c rest.Interface) *Clientset { var cs Clientset - cs.ApiextensionsV1alpha1Client = apiextensionsv1alpha1.New(c) + cs.ApiextensionsV1beta1Client = apiextensionsv1beta1.New(c) cs.DiscoveryClient = discovery.NewDiscoveryClient(c) return &cs diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD index cd82496d120..3e999e1d64f 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/BUILD @@ -24,9 +24,9 @@ go_library( "//vendor/k8s.io/client-go/discovery:go_default_library", "//vendor/k8s.io/client-go/discovery/fake:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go index 2689ae594fd..ef5a1d86077 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/clientset_generated.go @@ -23,8 +23,8 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1" - fakeapiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" + fakeapiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. @@ -60,12 +60,12 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface { var _ clientset.Interface = &Clientset{} -// ApiextensionsV1alpha1 retrieves the ApiextensionsV1alpha1Client -func (c *Clientset) ApiextensionsV1alpha1() apiextensionsv1alpha1.ApiextensionsV1alpha1Interface { - return &fakeapiextensionsv1alpha1.FakeApiextensionsV1alpha1{Fake: &c.Fake} +// ApiextensionsV1beta1 retrieves the ApiextensionsV1beta1Client +func (c *Clientset) ApiextensionsV1beta1() apiextensionsv1beta1.ApiextensionsV1beta1Interface { + return &fakeapiextensionsv1beta1.FakeApiextensionsV1beta1{Fake: &c.Fake} } -// Apiextensions retrieves the ApiextensionsV1alpha1Client -func (c *Clientset) Apiextensions() apiextensionsv1alpha1.ApiextensionsV1alpha1Interface { - return &fakeapiextensionsv1alpha1.FakeApiextensionsV1alpha1{Fake: &c.Fake} +// Apiextensions retrieves the ApiextensionsV1beta1Client +func (c *Clientset) Apiextensions() apiextensionsv1beta1.ApiextensionsV1beta1Interface { + return &fakeapiextensionsv1beta1.FakeApiextensionsV1beta1{Fake: &c.Fake} } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go index 9c2b3938676..d31cd113b68 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/fake/register.go @@ -21,7 +21,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) var scheme = runtime.NewScheme() @@ -48,6 +48,6 @@ func init() { // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. func AddToScheme(scheme *runtime.Scheme) { - apiextensionsv1alpha1.AddToScheme(scheme) + apiextensionsv1beta1.AddToScheme(scheme) } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD index 56cf2c632db..240a4292e66 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/BUILD @@ -19,6 +19,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go index 05c68e870d6..f0688a15171 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme/register.go @@ -21,7 +21,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) var Scheme = runtime.NewScheme() @@ -48,6 +48,6 @@ func init() { // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. func AddToScheme(scheme *runtime.Scheme) { - apiextensionsv1alpha1.AddToScheme(scheme) + apiextensionsv1beta1.AddToScheme(scheme) } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD similarity index 95% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/BUILD rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD index 4e6c23682c2..7bd7069dea4 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/BUILD @@ -22,7 +22,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/types:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/apiextensions_client.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go similarity index 61% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/apiextensions_client.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go index 697faee2919..8799838be22 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/apiextensions_client.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/apiextensions_client.go @@ -14,31 +14,31 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme" ) -type ApiextensionsV1alpha1Interface interface { +type ApiextensionsV1beta1Interface interface { RESTClient() rest.Interface CustomResourceDefinitionsGetter } -// ApiextensionsV1alpha1Client is used to interact with features provided by the apiextensions.k8s.io group. -type ApiextensionsV1alpha1Client struct { +// ApiextensionsV1beta1Client is used to interact with features provided by the apiextensions.k8s.io group. +type ApiextensionsV1beta1Client struct { restClient rest.Interface } -func (c *ApiextensionsV1alpha1Client) CustomResourceDefinitions() CustomResourceDefinitionInterface { +func (c *ApiextensionsV1beta1Client) CustomResourceDefinitions() CustomResourceDefinitionInterface { return newCustomResourceDefinitions(c) } -// NewForConfig creates a new ApiextensionsV1alpha1Client for the given config. -func NewForConfig(c *rest.Config) (*ApiextensionsV1alpha1Client, error) { +// NewForConfig creates a new ApiextensionsV1beta1Client for the given config. +func NewForConfig(c *rest.Config) (*ApiextensionsV1beta1Client, error) { config := *c if err := setConfigDefaults(&config); err != nil { return nil, err @@ -47,12 +47,12 @@ func NewForConfig(c *rest.Config) (*ApiextensionsV1alpha1Client, error) { if err != nil { return nil, err } - return &ApiextensionsV1alpha1Client{client}, nil + return &ApiextensionsV1beta1Client{client}, nil } -// NewForConfigOrDie creates a new ApiextensionsV1alpha1Client for the given config and +// NewForConfigOrDie creates a new ApiextensionsV1beta1Client for the given config and // panics if there is an error in the config. -func NewForConfigOrDie(c *rest.Config) *ApiextensionsV1alpha1Client { +func NewForConfigOrDie(c *rest.Config) *ApiextensionsV1beta1Client { client, err := NewForConfig(c) if err != nil { panic(err) @@ -60,13 +60,13 @@ func NewForConfigOrDie(c *rest.Config) *ApiextensionsV1alpha1Client { return client } -// New creates a new ApiextensionsV1alpha1Client for the given RESTClient. -func New(c rest.Interface) *ApiextensionsV1alpha1Client { - return &ApiextensionsV1alpha1Client{c} +// New creates a new ApiextensionsV1beta1Client for the given RESTClient. +func New(c rest.Interface) *ApiextensionsV1beta1Client { + return &ApiextensionsV1beta1Client{c} } func setConfigDefaults(config *rest.Config) error { - gv := v1alpha1.SchemeGroupVersion + gv := v1beta1.SchemeGroupVersion config.GroupVersion = &gv config.APIPath = "/apis" config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs} @@ -80,7 +80,7 @@ func setConfigDefaults(config *rest.Config) error { // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *ApiextensionsV1alpha1Client) RESTClient() rest.Interface { +func (c *ApiextensionsV1beta1Client) RESTClient() rest.Interface { if c == nil { return nil } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/customresourcedefinition.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go similarity index 76% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/customresourcedefinition.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go index ea791adbe76..00cfe919d8b 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/customresourcedefinition.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/customresourcedefinition.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" scheme "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/scheme" ) @@ -33,15 +33,15 @@ type CustomResourceDefinitionsGetter interface { // CustomResourceDefinitionInterface has methods to work with CustomResourceDefinition resources. type CustomResourceDefinitionInterface interface { - Create(*v1alpha1.CustomResourceDefinition) (*v1alpha1.CustomResourceDefinition, error) - Update(*v1alpha1.CustomResourceDefinition) (*v1alpha1.CustomResourceDefinition, error) - UpdateStatus(*v1alpha1.CustomResourceDefinition) (*v1alpha1.CustomResourceDefinition, error) + Create(*v1beta1.CustomResourceDefinition) (*v1beta1.CustomResourceDefinition, error) + Update(*v1beta1.CustomResourceDefinition) (*v1beta1.CustomResourceDefinition, error) + UpdateStatus(*v1beta1.CustomResourceDefinition) (*v1beta1.CustomResourceDefinition, error) Delete(name string, options *v1.DeleteOptions) error DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error - Get(name string, options v1.GetOptions) (*v1alpha1.CustomResourceDefinition, error) - List(opts v1.ListOptions) (*v1alpha1.CustomResourceDefinitionList, error) + Get(name string, options v1.GetOptions) (*v1beta1.CustomResourceDefinition, error) + List(opts v1.ListOptions) (*v1beta1.CustomResourceDefinitionList, error) Watch(opts v1.ListOptions) (watch.Interface, error) - Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.CustomResourceDefinition, err error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CustomResourceDefinition, err error) CustomResourceDefinitionExpansion } @@ -51,15 +51,15 @@ type customResourceDefinitions struct { } // newCustomResourceDefinitions returns a CustomResourceDefinitions -func newCustomResourceDefinitions(c *ApiextensionsV1alpha1Client) *customResourceDefinitions { +func newCustomResourceDefinitions(c *ApiextensionsV1beta1Client) *customResourceDefinitions { return &customResourceDefinitions{ client: c.RESTClient(), } } // Create takes the representation of a customResourceDefinition and creates it. Returns the server's representation of the customResourceDefinition, and an error, if there is any. -func (c *customResourceDefinitions) Create(customResourceDefinition *v1alpha1.CustomResourceDefinition) (result *v1alpha1.CustomResourceDefinition, err error) { - result = &v1alpha1.CustomResourceDefinition{} +func (c *customResourceDefinitions) Create(customResourceDefinition *v1beta1.CustomResourceDefinition) (result *v1beta1.CustomResourceDefinition, err error) { + result = &v1beta1.CustomResourceDefinition{} err = c.client.Post(). Resource("customresourcedefinitions"). Body(customResourceDefinition). @@ -69,8 +69,8 @@ func (c *customResourceDefinitions) Create(customResourceDefinition *v1alpha1.Cu } // Update takes the representation of a customResourceDefinition and updates it. Returns the server's representation of the customResourceDefinition, and an error, if there is any. -func (c *customResourceDefinitions) Update(customResourceDefinition *v1alpha1.CustomResourceDefinition) (result *v1alpha1.CustomResourceDefinition, err error) { - result = &v1alpha1.CustomResourceDefinition{} +func (c *customResourceDefinitions) Update(customResourceDefinition *v1beta1.CustomResourceDefinition) (result *v1beta1.CustomResourceDefinition, err error) { + result = &v1beta1.CustomResourceDefinition{} err = c.client.Put(). Resource("customresourcedefinitions"). Name(customResourceDefinition.Name). @@ -83,8 +83,8 @@ func (c *customResourceDefinitions) Update(customResourceDefinition *v1alpha1.Cu // UpdateStatus was generated because the type contains a Status member. // Add a +genclientstatus=false comment above the type to avoid generating UpdateStatus(). -func (c *customResourceDefinitions) UpdateStatus(customResourceDefinition *v1alpha1.CustomResourceDefinition) (result *v1alpha1.CustomResourceDefinition, err error) { - result = &v1alpha1.CustomResourceDefinition{} +func (c *customResourceDefinitions) UpdateStatus(customResourceDefinition *v1beta1.CustomResourceDefinition) (result *v1beta1.CustomResourceDefinition, err error) { + result = &v1beta1.CustomResourceDefinition{} err = c.client.Put(). Resource("customresourcedefinitions"). Name(customResourceDefinition.Name). @@ -116,8 +116,8 @@ func (c *customResourceDefinitions) DeleteCollection(options *v1.DeleteOptions, } // Get takes name of the customResourceDefinition, and returns the corresponding customResourceDefinition object, and an error if there is any. -func (c *customResourceDefinitions) Get(name string, options v1.GetOptions) (result *v1alpha1.CustomResourceDefinition, err error) { - result = &v1alpha1.CustomResourceDefinition{} +func (c *customResourceDefinitions) Get(name string, options v1.GetOptions) (result *v1beta1.CustomResourceDefinition, err error) { + result = &v1beta1.CustomResourceDefinition{} err = c.client.Get(). Resource("customresourcedefinitions"). Name(name). @@ -128,8 +128,8 @@ func (c *customResourceDefinitions) Get(name string, options v1.GetOptions) (res } // List takes label and field selectors, and returns the list of CustomResourceDefinitions that match those selectors. -func (c *customResourceDefinitions) List(opts v1.ListOptions) (result *v1alpha1.CustomResourceDefinitionList, err error) { - result = &v1alpha1.CustomResourceDefinitionList{} +func (c *customResourceDefinitions) List(opts v1.ListOptions) (result *v1beta1.CustomResourceDefinitionList, err error) { + result = &v1beta1.CustomResourceDefinitionList{} err = c.client.Get(). Resource("customresourcedefinitions"). VersionedParams(&opts, scheme.ParameterCodec). @@ -148,8 +148,8 @@ func (c *customResourceDefinitions) Watch(opts v1.ListOptions) (watch.Interface, } // Patch applies the patch and returns the patched customResourceDefinition. -func (c *customResourceDefinitions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.CustomResourceDefinition, err error) { - result = &v1alpha1.CustomResourceDefinition{} +func (c *customResourceDefinitions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CustomResourceDefinition, err error) { + result = &v1beta1.CustomResourceDefinition{} err = c.client.Patch(pt). Resource("customresourcedefinitions"). SubResource(subresources...). diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/doc.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/doc.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go index ba8d10d3b66..11b52389720 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/doc.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/doc.go @@ -17,4 +17,4 @@ limitations under the License. // This package is generated by client-gen with custom arguments. // This package has the automatically generated typed clients. -package v1alpha1 +package v1beta1 diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD similarity index 90% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/BUILD rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD index c2f776aba68..ab772e05965 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/BUILD @@ -23,7 +23,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/rest:go_default_library", "//vendor/k8s.io/client-go/testing:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/doc.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go similarity index 100% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/doc.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/doc.go diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/fake_apiextensions_client.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go similarity index 73% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/fake_apiextensions_client.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go index 5745a446577..38d09f1805c 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/fake_apiextensions_client.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_apiextensions_client.go @@ -19,20 +19,20 @@ package fake import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1" ) -type FakeApiextensionsV1alpha1 struct { +type FakeApiextensionsV1beta1 struct { *testing.Fake } -func (c *FakeApiextensionsV1alpha1) CustomResourceDefinitions() v1alpha1.CustomResourceDefinitionInterface { +func (c *FakeApiextensionsV1beta1) CustomResourceDefinitions() v1beta1.CustomResourceDefinitionInterface { return &FakeCustomResourceDefinitions{c} } // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. -func (c *FakeApiextensionsV1alpha1) RESTClient() rest.Interface { +func (c *FakeApiextensionsV1beta1) RESTClient() rest.Interface { var ret *rest.RESTClient return ret } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/fake_customresourcedefinition.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go similarity index 64% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/fake_customresourcedefinition.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go index 6a8c856c0b9..5dc54244937 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/fake/fake_customresourcedefinition.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake/fake_customresourcedefinition.go @@ -23,70 +23,70 @@ import ( types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // FakeCustomResourceDefinitions implements CustomResourceDefinitionInterface type FakeCustomResourceDefinitions struct { - Fake *FakeApiextensionsV1alpha1 + Fake *FakeApiextensionsV1beta1 } -var customresourcedefinitionsResource = schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1alpha1", Resource: "customresourcedefinitions"} +var customresourcedefinitionsResource = schema.GroupVersionResource{Group: "apiextensions.k8s.io", Version: "v1beta1", Resource: "customresourcedefinitions"} -var customresourcedefinitionsKind = schema.GroupVersionKind{Group: "apiextensions.k8s.io", Version: "v1alpha1", Kind: "CustomResourceDefinition"} +var customresourcedefinitionsKind = schema.GroupVersionKind{Group: "apiextensions.k8s.io", Version: "v1beta1", Kind: "CustomResourceDefinition"} -func (c *FakeCustomResourceDefinitions) Create(customResourceDefinition *v1alpha1.CustomResourceDefinition) (result *v1alpha1.CustomResourceDefinition, err error) { +func (c *FakeCustomResourceDefinitions) Create(customResourceDefinition *v1beta1.CustomResourceDefinition) (result *v1beta1.CustomResourceDefinition, err error) { obj, err := c.Fake. - Invokes(testing.NewRootCreateAction(customresourcedefinitionsResource, customResourceDefinition), &v1alpha1.CustomResourceDefinition{}) + Invokes(testing.NewRootCreateAction(customresourcedefinitionsResource, customResourceDefinition), &v1beta1.CustomResourceDefinition{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.CustomResourceDefinition), err + return obj.(*v1beta1.CustomResourceDefinition), err } -func (c *FakeCustomResourceDefinitions) Update(customResourceDefinition *v1alpha1.CustomResourceDefinition) (result *v1alpha1.CustomResourceDefinition, err error) { +func (c *FakeCustomResourceDefinitions) Update(customResourceDefinition *v1beta1.CustomResourceDefinition) (result *v1beta1.CustomResourceDefinition, err error) { obj, err := c.Fake. - Invokes(testing.NewRootUpdateAction(customresourcedefinitionsResource, customResourceDefinition), &v1alpha1.CustomResourceDefinition{}) + Invokes(testing.NewRootUpdateAction(customresourcedefinitionsResource, customResourceDefinition), &v1beta1.CustomResourceDefinition{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.CustomResourceDefinition), err + return obj.(*v1beta1.CustomResourceDefinition), err } -func (c *FakeCustomResourceDefinitions) UpdateStatus(customResourceDefinition *v1alpha1.CustomResourceDefinition) (*v1alpha1.CustomResourceDefinition, error) { +func (c *FakeCustomResourceDefinitions) UpdateStatus(customResourceDefinition *v1beta1.CustomResourceDefinition) (*v1beta1.CustomResourceDefinition, error) { obj, err := c.Fake. - Invokes(testing.NewRootUpdateSubresourceAction(customresourcedefinitionsResource, "status", customResourceDefinition), &v1alpha1.CustomResourceDefinition{}) + Invokes(testing.NewRootUpdateSubresourceAction(customresourcedefinitionsResource, "status", customResourceDefinition), &v1beta1.CustomResourceDefinition{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.CustomResourceDefinition), err + return obj.(*v1beta1.CustomResourceDefinition), err } func (c *FakeCustomResourceDefinitions) Delete(name string, options *v1.DeleteOptions) error { _, err := c.Fake. - Invokes(testing.NewRootDeleteAction(customresourcedefinitionsResource, name), &v1alpha1.CustomResourceDefinition{}) + Invokes(testing.NewRootDeleteAction(customresourcedefinitionsResource, name), &v1beta1.CustomResourceDefinition{}) return err } func (c *FakeCustomResourceDefinitions) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { action := testing.NewRootDeleteCollectionAction(customresourcedefinitionsResource, listOptions) - _, err := c.Fake.Invokes(action, &v1alpha1.CustomResourceDefinitionList{}) + _, err := c.Fake.Invokes(action, &v1beta1.CustomResourceDefinitionList{}) return err } -func (c *FakeCustomResourceDefinitions) Get(name string, options v1.GetOptions) (result *v1alpha1.CustomResourceDefinition, err error) { +func (c *FakeCustomResourceDefinitions) Get(name string, options v1.GetOptions) (result *v1beta1.CustomResourceDefinition, err error) { obj, err := c.Fake. - Invokes(testing.NewRootGetAction(customresourcedefinitionsResource, name), &v1alpha1.CustomResourceDefinition{}) + Invokes(testing.NewRootGetAction(customresourcedefinitionsResource, name), &v1beta1.CustomResourceDefinition{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.CustomResourceDefinition), err + return obj.(*v1beta1.CustomResourceDefinition), err } -func (c *FakeCustomResourceDefinitions) List(opts v1.ListOptions) (result *v1alpha1.CustomResourceDefinitionList, err error) { +func (c *FakeCustomResourceDefinitions) List(opts v1.ListOptions) (result *v1beta1.CustomResourceDefinitionList, err error) { obj, err := c.Fake. - Invokes(testing.NewRootListAction(customresourcedefinitionsResource, customresourcedefinitionsKind, opts), &v1alpha1.CustomResourceDefinitionList{}) + Invokes(testing.NewRootListAction(customresourcedefinitionsResource, customresourcedefinitionsKind, opts), &v1beta1.CustomResourceDefinitionList{}) if obj == nil { return nil, err } @@ -95,8 +95,8 @@ func (c *FakeCustomResourceDefinitions) List(opts v1.ListOptions) (result *v1alp if label == nil { label = labels.Everything() } - list := &v1alpha1.CustomResourceDefinitionList{} - for _, item := range obj.(*v1alpha1.CustomResourceDefinitionList).Items { + list := &v1beta1.CustomResourceDefinitionList{} + for _, item := range obj.(*v1beta1.CustomResourceDefinitionList).Items { if label.Matches(labels.Set(item.Labels)) { list.Items = append(list.Items, item) } @@ -111,11 +111,11 @@ func (c *FakeCustomResourceDefinitions) Watch(opts v1.ListOptions) (watch.Interf } // Patch applies the patch and returns the patched customResourceDefinition. -func (c *FakeCustomResourceDefinitions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.CustomResourceDefinition, err error) { +func (c *FakeCustomResourceDefinitions) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta1.CustomResourceDefinition, err error) { obj, err := c.Fake. - Invokes(testing.NewRootPatchSubresourceAction(customresourcedefinitionsResource, name, data, subresources...), &v1alpha1.CustomResourceDefinition{}) + Invokes(testing.NewRootPatchSubresourceAction(customresourcedefinitionsResource, name, data, subresources...), &v1beta1.CustomResourceDefinition{}) if obj == nil { return nil, err } - return obj.(*v1alpha1.CustomResourceDefinition), err + return obj.(*v1beta1.CustomResourceDefinition), err } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/generated_expansion.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/generated_expansion.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go index 5a6d09982bc..2f721078b07 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1alpha1/generated_expansion.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/generated_expansion.go @@ -14,6 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -package v1alpha1 +package v1beta1 type CustomResourceDefinitionExpansion interface{} diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD index 9be2ed18bf0..e170c6b7544 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/BUILD @@ -18,7 +18,7 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces:go_default_library", diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD index fcd04ad604c..c544036fc6f 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/BUILD @@ -12,7 +12,7 @@ go_library( srcs = ["interface.go"], tags = ["automanaged"], deps = [ - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go index f25b9c9534c..bbf5807f671 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/interface.go @@ -19,14 +19,14 @@ limitations under the License. package apiextensions import ( - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1" internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. type Interface interface { - // V1alpha1 provides access to shared informers for resources in V1alpha1. - V1alpha1() v1alpha1.Interface + // V1beta1 provides access to shared informers for resources in V1beta1. + V1beta1() v1beta1.Interface } type group struct { @@ -38,7 +38,7 @@ func New(f internalinterfaces.SharedInformerFactory) Interface { return &group{f} } -// V1alpha1 returns a new v1alpha1.Interface. -func (g *group) V1alpha1() v1alpha1.Interface { - return v1alpha1.New(g.SharedInformerFactory) +// V1beta1 returns a new v1beta1.Interface. +func (g *group) V1beta1() v1beta1.Interface { + return v1beta1.New(g.SharedInformerFactory) } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD similarity index 91% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/BUILD rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD index 2724cf7f055..bd12cd1c3e2 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/BUILD @@ -19,9 +19,9 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/customresourcedefinition.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go similarity index 71% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/customresourcedefinition.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go index c81a5c2e129..c89e6792130 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/customresourcedefinition.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/customresourcedefinition.go @@ -16,17 +16,17 @@ limitations under the License. // This file was automatically generated by informer-gen -package v1alpha1 +package v1beta1 import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - apiextensions_v1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + apiextensions_v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" clientset "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1" time "time" ) @@ -34,7 +34,7 @@ import ( // CustomResourceDefinitions. type CustomResourceDefinitionInformer interface { Informer() cache.SharedIndexInformer - Lister() v1alpha1.CustomResourceDefinitionLister + Lister() v1beta1.CustomResourceDefinitionLister } type customResourceDefinitionInformer struct { @@ -45,13 +45,13 @@ func newCustomResourceDefinitionInformer(client clientset.Interface, resyncPerio sharedIndexInformer := cache.NewSharedIndexInformer( &cache.ListWatch{ ListFunc: func(options v1.ListOptions) (runtime.Object, error) { - return client.ApiextensionsV1alpha1().CustomResourceDefinitions().List(options) + return client.ApiextensionsV1beta1().CustomResourceDefinitions().List(options) }, WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { - return client.ApiextensionsV1alpha1().CustomResourceDefinitions().Watch(options) + return client.ApiextensionsV1beta1().CustomResourceDefinitions().Watch(options) }, }, - &apiextensions_v1alpha1.CustomResourceDefinition{}, + &apiextensions_v1beta1.CustomResourceDefinition{}, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, ) @@ -60,9 +60,9 @@ func newCustomResourceDefinitionInformer(client clientset.Interface, resyncPerio } func (f *customResourceDefinitionInformer) Informer() cache.SharedIndexInformer { - return f.factory.InformerFor(&apiextensions_v1alpha1.CustomResourceDefinition{}, newCustomResourceDefinitionInformer) + return f.factory.InformerFor(&apiextensions_v1beta1.CustomResourceDefinition{}, newCustomResourceDefinitionInformer) } -func (f *customResourceDefinitionInformer) Lister() v1alpha1.CustomResourceDefinitionLister { - return v1alpha1.NewCustomResourceDefinitionLister(f.Informer().GetIndexer()) +func (f *customResourceDefinitionInformer) Lister() v1beta1.CustomResourceDefinitionLister { + return v1beta1.NewCustomResourceDefinitionLister(f.Informer().GetIndexer()) } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/interface.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go similarity index 98% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/interface.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go index 82cf7e7099f..51feb60cd7f 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1alpha1/interface.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/apiextensions/v1beta1/interface.go @@ -16,7 +16,7 @@ limitations under the License. // This file was automatically generated by informer-gen -package v1alpha1 +package v1beta1 import ( internalinterfaces "k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/internalinterfaces" diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go index 909e31293eb..d15a507ccba 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/informers/externalversions/generic.go @@ -22,7 +22,7 @@ import ( "fmt" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other @@ -51,9 +51,9 @@ func (f *genericInformer) Lister() cache.GenericLister { // TODO extend this to unknown resources with a client pool func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { - // Group=Apiextensions, Version=V1alpha1 - case v1alpha1.SchemeGroupVersion.WithResource("customresourcedefinitions"): - return &genericInformer{resource: resource.GroupResource(), informer: f.Apiextensions().V1alpha1().CustomResourceDefinitions().Informer()}, nil + // Group=Apiextensions, Version=V1beta1 + case v1beta1.SchemeGroupVersion.WithResource("customresourcedefinitions"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Apiextensions().V1beta1().CustomResourceDefinitions().Informer()}, nil } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/BUILD similarity index 94% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/BUILD rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/BUILD index ac475798aba..a87a9177c45 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/BUILD @@ -19,6 +19,6 @@ go_library( "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/client-go/tools/cache:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/customresourcedefinition.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go similarity index 73% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/customresourcedefinition.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go index 128e6175a9f..f069276d167 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/customresourcedefinition.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/customresourcedefinition.go @@ -16,22 +16,22 @@ limitations under the License. // This file was automatically generated by lister-gen -package v1alpha1 +package v1beta1 import ( "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + v1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" ) // CustomResourceDefinitionLister helps list CustomResourceDefinitions. type CustomResourceDefinitionLister interface { // List lists all CustomResourceDefinitions in the indexer. - List(selector labels.Selector) (ret []*v1alpha1.CustomResourceDefinition, err error) + List(selector labels.Selector) (ret []*v1beta1.CustomResourceDefinition, err error) // Get retrieves the CustomResourceDefinition from the index for a given name. - Get(name string) (*v1alpha1.CustomResourceDefinition, error) + Get(name string) (*v1beta1.CustomResourceDefinition, error) CustomResourceDefinitionListerExpansion } @@ -46,22 +46,22 @@ func NewCustomResourceDefinitionLister(indexer cache.Indexer) CustomResourceDefi } // List lists all CustomResourceDefinitions in the indexer. -func (s *customResourceDefinitionLister) List(selector labels.Selector) (ret []*v1alpha1.CustomResourceDefinition, err error) { +func (s *customResourceDefinitionLister) List(selector labels.Selector) (ret []*v1beta1.CustomResourceDefinition, err error) { err = cache.ListAll(s.indexer, selector, func(m interface{}) { - ret = append(ret, m.(*v1alpha1.CustomResourceDefinition)) + ret = append(ret, m.(*v1beta1.CustomResourceDefinition)) }) return ret, err } // Get retrieves the CustomResourceDefinition from the index for a given name. -func (s *customResourceDefinitionLister) Get(name string) (*v1alpha1.CustomResourceDefinition, error) { - key := &v1alpha1.CustomResourceDefinition{ObjectMeta: v1.ObjectMeta{Name: name}} +func (s *customResourceDefinitionLister) Get(name string) (*v1beta1.CustomResourceDefinition, error) { + key := &v1beta1.CustomResourceDefinition{ObjectMeta: v1.ObjectMeta{Name: name}} obj, exists, err := s.indexer.Get(key) if err != nil { return nil, err } if !exists { - return nil, errors.NewNotFound(v1alpha1.Resource("customresourcedefinition"), name) + return nil, errors.NewNotFound(v1beta1.Resource("customresourcedefinition"), name) } - return obj.(*v1alpha1.CustomResourceDefinition), nil + return obj.(*v1beta1.CustomResourceDefinition), nil } diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/expansion_generated.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go similarity index 97% rename from staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/expansion_generated.go rename to staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go index e1a2d1573a5..5723fc39b73 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1alpha1/expansion_generated.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/client/listers/apiextensions/v1beta1/expansion_generated.go @@ -16,7 +16,7 @@ limitations under the License. // This file was automatically generated by lister-gen -package v1alpha1 +package v1beta1 // CustomResourceDefinitionListerExpansion allows custom methods to be added to // CustomResourceDefinitionLister. diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD b/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD index 9b14126e2d4..27ea2d571e1 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/BUILD @@ -17,7 +17,7 @@ go_library( "//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library", "//vendor/k8s.io/apiserver/pkg/server:go_default_library", "//vendor/k8s.io/apiserver/pkg/server/options:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", ], ) diff --git a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go b/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go index 822a615ca7d..6b76aeb4cde 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go +++ b/staging/src/k8s.io/kube-apiextensions-server/pkg/cmd/server/start.go @@ -27,7 +27,7 @@ import ( genericregistry "k8s.io/apiserver/pkg/registry/generic" genericapiserver "k8s.io/apiserver/pkg/server" genericoptions "k8s.io/apiserver/pkg/server/options" - "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" "k8s.io/kube-apiextensions-server/pkg/apiserver" ) @@ -42,7 +42,7 @@ type CustomResourceDefinitionsServerOptions struct { func NewCustomResourceDefinitionsServerOptions(out, errOut io.Writer) *CustomResourceDefinitionsServerOptions { o := &CustomResourceDefinitionsServerOptions{ - RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, apiserver.Scheme, apiserver.Codecs.LegacyCodec(v1alpha1.SchemeGroupVersion)), + RecommendedOptions: genericoptions.NewRecommendedOptions(defaultEtcdPathPrefix, apiserver.Scheme, apiserver.Codecs.LegacyCodec(v1beta1.SchemeGroupVersion)), StdOut: out, StdErr: errOut, diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD b/staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD index b1fc0c07202..0ab373dc2b2 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/test/integration/BUILD @@ -27,7 +27,7 @@ go_test( "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/test/integration/testserver:go_default_library", ], diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go b/staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go index 4816657c369..f4c19804fd8 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go +++ b/staging/src/k8s.io/kube-apiextensions-server/test/integration/basic_test.go @@ -29,7 +29,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" "k8s.io/kube-apiextensions-server/test/integration/testserver" ) @@ -48,7 +48,7 @@ func TestNamespaceScopedCRUD(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -65,7 +65,7 @@ func TestClusterScopedCRUD(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.ClusterScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.ClusterScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -75,7 +75,7 @@ func TestClusterScopedCRUD(t *testing.T) { testSimpleCRUD(t, ns, noxuDefinition, noxuVersionClient) } -func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1alpha1.CustomResourceDefinition, noxuVersionClient *dynamic.Client) { +func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition, noxuVersionClient *dynamic.Client) { noxuResourceClient := NewNamespacedCustomResourceClient(ns, noxuVersionClient, noxuDefinition) initialList, err := noxuResourceClient.List(metav1.ListOptions{}) if err != nil { @@ -199,7 +199,7 @@ func testSimpleCRUD(t *testing.T, ns string, noxuDefinition *apiextensionsv1alph func TestDiscovery(t *testing.T) { group := "mygroup.example.com" - version := "v1alpha1" + version := "v1beta1" stopCh, apiExtensionClient, clientPool, err := testserver.StartDefaultServer() if err != nil { @@ -207,7 +207,7 @@ func TestDiscovery(t *testing.T) { } defer close(stopCh) - scope := apiextensionsv1alpha1.NamespaceScoped + scope := apiextensionsv1beta1.NamespaceScoped noxuDefinition := testserver.NewNoxuCustomResourceDefinition(scope) _, err = testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { @@ -251,7 +251,7 @@ func TestNoNamespaceReject(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -290,7 +290,7 @@ func TestSameNameDiffNamespace(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -311,7 +311,7 @@ func TestSelfLink(t *testing.T) { defer close(stopCh) // namespace scoped - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -320,7 +320,7 @@ func TestSelfLink(t *testing.T) { ns := "not-the-default" noxuNamespacedResourceClient := noxuVersionClient.Resource(&metav1.APIResource{ Name: noxuDefinition.Spec.Names.Plural, - Namespaced: noxuDefinition.Spec.Scope == apiextensionsv1alpha1.NamespaceScoped, + Namespaced: noxuDefinition.Spec.Scope == apiextensionsv1beta1.NamespaceScoped, }, ns) noxuInstanceToCreate := testserver.NewNoxuInstance(ns, "foo") @@ -329,12 +329,12 @@ func TestSelfLink(t *testing.T) { t.Fatal(err) } - if e, a := "/apis/mygroup.example.com/v1alpha1/namespaces/not-the-default/noxus/foo", createdNoxuInstance.GetSelfLink(); e != a { + if e, a := "/apis/mygroup.example.com/v1beta1/namespaces/not-the-default/noxus/foo", createdNoxuInstance.GetSelfLink(); e != a { t.Errorf("expected %v, got %v", e, a) } // cluster scoped - curletDefinition := testserver.NewCurletCustomResourceDefinition(apiextensionsv1alpha1.ClusterScoped) + curletDefinition := testserver.NewCurletCustomResourceDefinition(apiextensionsv1beta1.ClusterScoped) curletVersionClient, err := testserver.CreateNewCustomResourceDefinition(curletDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -342,7 +342,7 @@ func TestSelfLink(t *testing.T) { curletResourceClient := curletVersionClient.Resource(&metav1.APIResource{ Name: curletDefinition.Spec.Names.Plural, - Namespaced: curletDefinition.Spec.Scope == apiextensionsv1alpha1.NamespaceScoped, + Namespaced: curletDefinition.Spec.Scope == apiextensionsv1beta1.NamespaceScoped, }, ns) curletInstanceToCreate := testserver.NewCurletInstance(ns, "foo") @@ -351,7 +351,7 @@ func TestSelfLink(t *testing.T) { t.Fatal(err) } - if e, a := "/apis/mygroup.example.com/v1alpha1/foo", createdCurletInstance.GetSelfLink(); e != a { + if e, a := "/apis/mygroup.example.com/v1beta1/foo", createdCurletInstance.GetSelfLink(); e != a { t.Errorf("expected %v, got %v", e, a) } } @@ -363,7 +363,7 @@ func TestPreserveInt(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.ClusterScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.ClusterScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -408,7 +408,7 @@ func TestCrossNamespaceListWatch(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -501,7 +501,7 @@ func TestCrossNamespaceListWatch(t *testing.T) { checkNamespacesWatchHelper(t, ns2, noxuNamespacesWatch2) } -func createInstanceWithNamespaceHelper(t *testing.T, ns string, name string, noxuNamespacedResourceClient *dynamic.ResourceClient, noxuDefinition *apiextensionsv1alpha1.CustomResourceDefinition) *unstructured.Unstructured { +func createInstanceWithNamespaceHelper(t *testing.T, ns string, name string, noxuNamespacedResourceClient *dynamic.ResourceClient, noxuDefinition *apiextensionsv1beta1.CustomResourceDefinition) *unstructured.Unstructured { createdInstance, err := instantiateCustomResource(t, testserver.NewNoxuInstance(ns, name), noxuNamespacedResourceClient, noxuDefinition) if err != nil { t.Fatalf("unable to create noxu Instance:%v", err) @@ -544,13 +544,13 @@ func TestNameConflict(t *testing.T) { } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) _, err = testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) } - noxu2Definition := testserver.NewNoxu2CustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxu2Definition := testserver.NewNoxu2CustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) _, err = apiExtensionClient.Apiextensions().CustomResourceDefinitions().Create(noxu2Definition) if err != nil { t.Fatal(err) @@ -564,7 +564,7 @@ func TestNameConflict(t *testing.T) { } for _, condition := range crd.Status.Conditions { - if condition.Type == apiextensionsv1alpha1.NamesAccepted && condition.Status == apiextensionsv1alpha1.ConditionFalse { + if condition.Type == apiextensionsv1beta1.NamesAccepted && condition.Status == apiextensionsv1beta1.ConditionFalse { return true, nil } } @@ -587,7 +587,7 @@ func TestNameConflict(t *testing.T) { } for _, condition := range crd.Status.Conditions { - if condition.Type == apiextensionsv1alpha1.NamesAccepted && condition.Status == apiextensionsv1alpha1.ConditionTrue { + if condition.Type == apiextensionsv1beta1.NamesAccepted && condition.Status == apiextensionsv1beta1.ConditionTrue { return true, nil } } diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go b/staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go index 8d01c5063d6..8530beae9e6 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go +++ b/staging/src/k8s.io/kube-apiextensions-server/test/integration/registration_test.go @@ -34,12 +34,12 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/dynamic" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" extensionsapiserver "k8s.io/kube-apiextensions-server/pkg/apiserver" "k8s.io/kube-apiextensions-server/test/integration/testserver" ) -func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unstructured, client *dynamic.ResourceClient, definition *apiextensionsv1alpha1.CustomResourceDefinition) (*unstructured.Unstructured, error) { +func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unstructured, client *dynamic.ResourceClient, definition *apiextensionsv1beta1.CustomResourceDefinition) (*unstructured.Unstructured, error) { createdInstance, err := client.Create(instanceToCreate) if err != nil { t.Logf("%#v", createdInstance) @@ -66,10 +66,10 @@ func instantiateCustomResource(t *testing.T, instanceToCreate *unstructured.Unst return createdInstance, nil } -func NewNamespacedCustomResourceClient(ns string, client *dynamic.Client, definition *apiextensionsv1alpha1.CustomResourceDefinition) *dynamic.ResourceClient { +func NewNamespacedCustomResourceClient(ns string, client *dynamic.Client, definition *apiextensionsv1beta1.CustomResourceDefinition) *dynamic.ResourceClient { return client.Resource(&metav1.APIResource{ Name: definition.Spec.Names.Plural, - Namespaced: definition.Spec.Scope == apiextensionsv1alpha1.NamespaceScoped, + Namespaced: definition.Spec.Scope == apiextensionsv1beta1.NamespaceScoped, }, ns) } @@ -81,7 +81,7 @@ func TestMultipleResourceInstances(t *testing.T) { defer close(stopCh) ns := "not-the-default" - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -206,7 +206,7 @@ func TestMultipleRegistration(t *testing.T) { ns := "not-the-default" sameInstanceName := "foo" - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -225,7 +225,7 @@ func TestMultipleRegistration(t *testing.T) { t.Errorf("expected %v, got %v", e, a) } - curletDefinition := testserver.NewCurletCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + curletDefinition := testserver.NewCurletCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) curletVersionClient, err := testserver.CreateNewCustomResourceDefinition(curletDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -259,7 +259,7 @@ func TestDeRegistrationAndReRegistration(t *testing.T) { t.Fatal(err) } defer close(stopCh) - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) ns := "not-the-default" sameInstanceName := "foo" func() { @@ -356,7 +356,7 @@ func TestEtcdStorage(t *testing.T) { etcdPrefix := getPrefixFromConfig(t, config) ns1 := "another-default-is-possible" - curletDefinition := testserver.NewCurletCustomResourceDefinition(apiextensionsv1alpha1.ClusterScoped) + curletDefinition := testserver.NewCurletCustomResourceDefinition(apiextensionsv1beta1.ClusterScoped) curletVersionClient, err := testserver.CreateNewCustomResourceDefinition(curletDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -367,7 +367,7 @@ func TestEtcdStorage(t *testing.T) { } ns2 := "the-cruel-default" - noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1alpha1.NamespaceScoped) + noxuDefinition := testserver.NewNoxuCustomResourceDefinition(apiextensionsv1beta1.NamespaceScoped) noxuVersionClient, err := testserver.CreateNewCustomResourceDefinition(noxuDefinition, apiExtensionClient, clientPool) if err != nil { t.Fatal(err) @@ -385,11 +385,11 @@ func TestEtcdStorage(t *testing.T) { etcdPath: path.Join("/", etcdPrefix, "apiextensions.k8s.io/customresourcedefinitions/noxus.mygroup.example.com"), // TODO: Double check this, no namespace? expectedObject: &metaObject{ Kind: "CustomResourceDefinition", - APIVersion: "apiextensions.k8s.io/v1alpha1", + APIVersion: "apiextensions.k8s.io/v1beta1", Metadata: Metadata{ Name: "noxus.mygroup.example.com", Namespace: "", - SelfLink: "/apis/apiextensions.k8s.io/v1alpha1/customresourcedefinitions/noxus.mygroup.example.com", + SelfLink: "/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/noxus.mygroup.example.com", }, }, }, @@ -397,7 +397,7 @@ func TestEtcdStorage(t *testing.T) { etcdPath: path.Join("/", etcdPrefix, "mygroup.example.com/noxus/the-cruel-default/foo"), expectedObject: &metaObject{ Kind: "WishIHadChosenNoxu", - APIVersion: "mygroup.example.com/v1alpha1", + APIVersion: "mygroup.example.com/v1beta1", Metadata: Metadata{ Name: "foo", Namespace: "the-cruel-default", @@ -410,11 +410,11 @@ func TestEtcdStorage(t *testing.T) { etcdPath: path.Join("/", etcdPrefix, "apiextensions.k8s.io/customresourcedefinitions/curlets.mygroup.example.com"), expectedObject: &metaObject{ Kind: "CustomResourceDefinition", - APIVersion: "apiextensions.k8s.io/v1alpha1", + APIVersion: "apiextensions.k8s.io/v1beta1", Metadata: Metadata{ Name: "curlets.mygroup.example.com", Namespace: "", - SelfLink: "/apis/apiextensions.k8s.io/v1alpha1/customresourcedefinitions/curlets.mygroup.example.com", + SelfLink: "/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/curlets.mygroup.example.com", }, }, }, @@ -423,7 +423,7 @@ func TestEtcdStorage(t *testing.T) { etcdPath: path.Join("/", etcdPrefix, "mygroup.example.com/curlets/bar"), expectedObject: &metaObject{ Kind: "Curlet", - APIVersion: "mygroup.example.com/v1alpha1", + APIVersion: "mygroup.example.com/v1beta1", Metadata: Metadata{ Name: "bar", Namespace: "", diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD b/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD index 9d15c33cde5..dc39a16b283 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD +++ b/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/BUILD @@ -24,7 +24,7 @@ go_library( "//vendor/k8s.io/apiserver/pkg/authorization/authorizerfactory:go_default_library", "//vendor/k8s.io/apiserver/pkg/server:go_default_library", "//vendor/k8s.io/client-go/dynamic:go_default_library", - "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1:go_default_library", + "//vendor/k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/apiserver:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset:go_default_library", "//vendor/k8s.io/kube-apiextensions-server/pkg/cmd/server:go_default_library", diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go b/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go index 720338f25f4..262631e7a00 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go +++ b/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/resources.go @@ -25,17 +25,17 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/dynamic" - apiextensionsv1alpha1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1alpha1" + apiextensionsv1beta1 "k8s.io/kube-apiextensions-server/pkg/apis/apiextensions/v1beta1" "k8s.io/kube-apiextensions-server/pkg/client/clientset/clientset" ) -func NewNoxuCustomResourceDefinition(scope apiextensionsv1alpha1.ResourceScope) *apiextensionsv1alpha1.CustomResourceDefinition { - return &apiextensionsv1alpha1.CustomResourceDefinition{ +func NewNoxuCustomResourceDefinition(scope apiextensionsv1beta1.ResourceScope) *apiextensionsv1beta1.CustomResourceDefinition { + return &apiextensionsv1beta1.CustomResourceDefinition{ ObjectMeta: metav1.ObjectMeta{Name: "noxus.mygroup.example.com"}, - Spec: apiextensionsv1alpha1.CustomResourceDefinitionSpec{ + Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{ Group: "mygroup.example.com", - Version: "v1alpha1", - Names: apiextensionsv1alpha1.CustomResourceDefinitionNames{ + Version: "v1beta1", + Names: apiextensionsv1beta1.CustomResourceDefinitionNames{ Plural: "noxus", Singular: "nonenglishnoxu", Kind: "WishIHadChosenNoxu", @@ -50,7 +50,7 @@ func NewNoxuCustomResourceDefinition(scope apiextensionsv1alpha1.ResourceScope) func NewNoxuInstance(namespace, name string) *unstructured.Unstructured { return &unstructured.Unstructured{ Object: map[string]interface{}{ - "apiVersion": "mygroup.example.com/v1alpha1", + "apiVersion": "mygroup.example.com/v1beta1", "kind": "WishIHadChosenNoxu", "metadata": map[string]interface{}{ "namespace": namespace, @@ -67,13 +67,13 @@ func NewNoxuInstance(namespace, name string) *unstructured.Unstructured { } } -func NewNoxu2CustomResourceDefinition(scope apiextensionsv1alpha1.ResourceScope) *apiextensionsv1alpha1.CustomResourceDefinition { - return &apiextensionsv1alpha1.CustomResourceDefinition{ +func NewNoxu2CustomResourceDefinition(scope apiextensionsv1beta1.ResourceScope) *apiextensionsv1beta1.CustomResourceDefinition { + return &apiextensionsv1beta1.CustomResourceDefinition{ ObjectMeta: metav1.ObjectMeta{Name: "noxus2.mygroup.example.com"}, - Spec: apiextensionsv1alpha1.CustomResourceDefinitionSpec{ + Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{ Group: "mygroup.example.com", Version: "v1alpha1", - Names: apiextensionsv1alpha1.CustomResourceDefinitionNames{ + Names: apiextensionsv1beta1.CustomResourceDefinitionNames{ Plural: "noxus2", Singular: "nonenglishnoxu2", Kind: "WishIHadChosenNoxu2", @@ -85,13 +85,13 @@ func NewNoxu2CustomResourceDefinition(scope apiextensionsv1alpha1.ResourceScope) } } -func NewCurletCustomResourceDefinition(scope apiextensionsv1alpha1.ResourceScope) *apiextensionsv1alpha1.CustomResourceDefinition { - return &apiextensionsv1alpha1.CustomResourceDefinition{ +func NewCurletCustomResourceDefinition(scope apiextensionsv1beta1.ResourceScope) *apiextensionsv1beta1.CustomResourceDefinition { + return &apiextensionsv1beta1.CustomResourceDefinition{ ObjectMeta: metav1.ObjectMeta{Name: "curlets.mygroup.example.com"}, - Spec: apiextensionsv1alpha1.CustomResourceDefinitionSpec{ + Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{ Group: "mygroup.example.com", - Version: "v1alpha1", - Names: apiextensionsv1alpha1.CustomResourceDefinitionNames{ + Version: "v1beta1", + Names: apiextensionsv1beta1.CustomResourceDefinitionNames{ Plural: "curlets", Singular: "curlet", Kind: "Curlet", @@ -105,7 +105,7 @@ func NewCurletCustomResourceDefinition(scope apiextensionsv1alpha1.ResourceScope func NewCurletInstance(namespace, name string) *unstructured.Unstructured { return &unstructured.Unstructured{ Object: map[string]interface{}{ - "apiVersion": "mygroup.example.com/v1alpha1", + "apiVersion": "mygroup.example.com/v1beta1", "kind": "Curlet", "metadata": map[string]interface{}{ "namespace": namespace, @@ -118,7 +118,7 @@ func NewCurletInstance(namespace, name string) *unstructured.Unstructured { } } -func CreateNewCustomResourceDefinition(crd *apiextensionsv1alpha1.CustomResourceDefinition, apiExtensionsClient clientset.Interface, clientPool dynamic.ClientPool) (*dynamic.Client, error) { +func CreateNewCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceDefinition, apiExtensionsClient clientset.Interface, clientPool dynamic.ClientPool) (*dynamic.Client, error) { _, err := apiExtensionsClient.Apiextensions().CustomResourceDefinitions().Create(crd) if err != nil { return nil, err @@ -148,7 +148,7 @@ func CreateNewCustomResourceDefinition(crd *apiextensionsv1alpha1.CustomResource return dynamicClient, nil } -func DeleteCustomResourceDefinition(crd *apiextensionsv1alpha1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) error { +func DeleteCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) error { if err := apiExtensionsClient.Apiextensions().CustomResourceDefinitions().Delete(crd.Name, nil); err != nil { return err } @@ -171,6 +171,6 @@ func DeleteCustomResourceDefinition(crd *apiextensionsv1alpha1.CustomResourceDef return err } -func GetCustomResourceDefinition(crd *apiextensionsv1alpha1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) (*apiextensionsv1alpha1.CustomResourceDefinition, error) { +func GetCustomResourceDefinition(crd *apiextensionsv1beta1.CustomResourceDefinition, apiExtensionsClient clientset.Interface) (*apiextensionsv1beta1.CustomResourceDefinition, error) { return apiExtensionsClient.Apiextensions().CustomResourceDefinitions().Get(crd.Name, metav1.GetOptions{}) } diff --git a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go b/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go index 7772ca4c22d..88eca08502e 100644 --- a/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go +++ b/staging/src/k8s.io/kube-apiextensions-server/test/integration/testserver/start.go @@ -140,7 +140,7 @@ func StartServer(config *extensionsapiserver.Config) (chan struct{}, clientset.I return nil, nil, nil, err } - bytes, _ := apiExtensionsClient.Discovery().RESTClient().Get().AbsPath("/apis/apiextensions.k8s.io/v1alpha1").DoRaw() + bytes, _ := apiExtensionsClient.Discovery().RESTClient().Get().AbsPath("/apis/apiextensions.k8s.io/v1beta1").DoRaw() fmt.Print(string(bytes)) return stopCh, apiExtensionsClient, dynamic.NewDynamicClientPool(server.GenericAPIServer.LoopbackClientConfig), nil