diff --git a/hack/.golint_failures b/hack/.golint_failures index f597c9e39ac..22678d53f80 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -422,6 +422,7 @@ plugin/pkg/admission/podtolerationrestriction/apis/podtolerationrestriction/v1al plugin/pkg/admission/resourcequota plugin/pkg/admission/resourcequota/apis/resourcequota plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1 +plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1 plugin/pkg/admission/security plugin/pkg/admission/security/podsecuritypolicy plugin/pkg/admission/serviceaccount diff --git a/plugin/pkg/admission/resourcequota/BUILD b/plugin/pkg/admission/resourcequota/BUILD index 464931016a6..714cbdd8b02 100644 --- a/plugin/pkg/admission/resourcequota/BUILD +++ b/plugin/pkg/admission/resourcequota/BUILD @@ -28,7 +28,7 @@ go_library( "//pkg/util/workqueue/prometheus:go_default_library", "//plugin/pkg/admission/resourcequota/apis/resourcequota:go_default_library", "//plugin/pkg/admission/resourcequota/apis/resourcequota/install:go_default_library", - "//plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1:go_default_library", + "//plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1:go_default_library", "//plugin/pkg/admission/resourcequota/apis/resourcequota/validation:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library", diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/BUILD b/plugin/pkg/admission/resourcequota/apis/resourcequota/BUILD index 03fea6b1897..9440df52e70 100644 --- a/plugin/pkg/admission/resourcequota/apis/resourcequota/BUILD +++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/BUILD @@ -35,6 +35,7 @@ filegroup( ":package-srcs", "//plugin/pkg/admission/resourcequota/apis/resourcequota/install:all-srcs", "//plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1:all-srcs", + "//plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1:all-srcs", "//plugin/pkg/admission/resourcequota/apis/resourcequota/validation:all-srcs", ], tags = ["automanaged"], diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/install/BUILD b/plugin/pkg/admission/resourcequota/apis/resourcequota/install/BUILD index 2bc40fc3ef8..1a45a3b9cba 100644 --- a/plugin/pkg/admission/resourcequota/apis/resourcequota/install/BUILD +++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/install/BUILD @@ -12,6 +12,7 @@ go_library( deps = [ "//plugin/pkg/admission/resourcequota/apis/resourcequota:go_default_library", "//plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1:go_default_library", + "//plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library", ], diff --git a/plugin/pkg/admission/resourcequota/apis/resourcequota/install/install.go b/plugin/pkg/admission/resourcequota/apis/resourcequota/install/install.go index 87c9d6f9a7c..e152eedf750 100644 --- a/plugin/pkg/admission/resourcequota/apis/resourcequota/install/install.go +++ b/plugin/pkg/admission/resourcequota/apis/resourcequota/install/install.go @@ -23,11 +23,13 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" resourcequotaapi "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota" resourcequotav1alpha1 "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1" + resourcequotav1beta1 "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1" ) // Install registers the API group and adds types to a scheme func Install(scheme *runtime.Scheme) { utilruntime.Must(resourcequotaapi.AddToScheme(scheme)) + utilruntime.Must(resourcequotav1beta1.AddToScheme(scheme)) utilruntime.Must(resourcequotav1alpha1.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(resourcequotav1alpha1.SchemeGroupVersion)) + utilruntime.Must(scheme.SetVersionPriority(resourcequotav1beta1.SchemeGroupVersion, resourcequotav1alpha1.SchemeGroupVersion)) } diff --git a/plugin/pkg/admission/resourcequota/config.go b/plugin/pkg/admission/resourcequota/config.go index 8bb5db13c80..626b354b5b9 100644 --- a/plugin/pkg/admission/resourcequota/config.go +++ b/plugin/pkg/admission/resourcequota/config.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/serializer" resourcequotaapi "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota" "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/install" - resourcequotav1alpha1 "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1alpha1" + resourcequotav1beta1 "k8s.io/kubernetes/plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1" ) var ( @@ -41,7 +41,7 @@ func init() { func LoadConfiguration(config io.Reader) (*resourcequotaapi.Configuration, error) { // if no config is provided, return a default configuration if config == nil { - externalConfig := &resourcequotav1alpha1.Configuration{} + externalConfig := &resourcequotav1beta1.Configuration{} scheme.Default(externalConfig) internalConfig := &resourcequotaapi.Configuration{} if err := scheme.Convert(externalConfig, internalConfig, nil); err != nil {