diff --git a/hack/.golint_failures b/hack/.golint_failures index 33ba178da5d..63d10ea1a4b 100644 --- a/hack/.golint_failures +++ b/hack/.golint_failures @@ -309,6 +309,7 @@ plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1 plugin/pkg/auth/authorizer/node plugin/pkg/auth/authorizer/rbac plugin/pkg/auth/authorizer/rbac/bootstrappolicy +staging/src/k8s.io/api/admission/v1 staging/src/k8s.io/api/admission/v1beta1 staging/src/k8s.io/api/admissionregistration/v1 staging/src/k8s.io/api/admissionregistration/v1beta1 diff --git a/hack/.import-aliases b/hack/.import-aliases index 46c0b54e376..09acdf02519 100644 --- a/hack/.import-aliases +++ b/hack/.import-aliases @@ -2,6 +2,7 @@ "k8s.io/api/admissionregistration/v1": "admissionregistrationv1", "k8s.io/api/admissionregistration/v1beta1": "admissionregistrationv1beta1", "k8s.io/api/admission/v1beta1": "admissionv1beta1", + "k8s.io/api/admission/v1": "admissionv1", "k8s.io/api/apps/v1": "appsv1", "k8s.io/api/apps/v1beta1": "appsv1beta1", "k8s.io/api/apps/v1beta2": "appsv1beta2", diff --git a/hack/lib/init.sh b/hack/lib/init.sh index 3564550ab3b..9ca6a131bc5 100755 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -65,6 +65,7 @@ KUBE_AVAILABLE_GROUP_VERSIONS="${KUBE_AVAILABLE_GROUP_VERSIONS:-\ v1 \ admissionregistration.k8s.io/v1 \ admissionregistration.k8s.io/v1beta1 \ +admission.k8s.io/v1 \ admission.k8s.io/v1beta1 \ apps/v1 \ apps/v1beta1 \ @@ -110,6 +111,7 @@ KUBE_NONSERVER_GROUP_VERSIONS=" abac.authorization.kubernetes.io/v1beta1 \ componentconfig/v1alpha1 \ imagepolicy.k8s.io/v1alpha1\ + admission.k8s.io/v1\ admission.k8s.io/v1beta1\ " export KUBE_NONSERVER_GROUP_VERSIONS diff --git a/pkg/apis/admission/install/install.go b/pkg/apis/admission/install/install.go index 82a1cb4a40a..01408afdf58 100644 --- a/pkg/apis/admission/install/install.go +++ b/pkg/apis/admission/install/install.go @@ -23,6 +23,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/admission" + v1 "k8s.io/kubernetes/pkg/apis/admission/v1" "k8s.io/kubernetes/pkg/apis/admission/v1beta1" ) @@ -34,5 +35,6 @@ func init() { func Install(scheme *runtime.Scheme) { utilruntime.Must(admission.AddToScheme(scheme)) utilruntime.Must(v1beta1.AddToScheme(scheme)) - utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion)) + utilruntime.Must(v1.AddToScheme(scheme)) + utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion)) } diff --git a/pkg/controller/.import-restrictions b/pkg/controller/.import-restrictions index 4c4001ceffb..9d5894434b1 100644 --- a/pkg/controller/.import-restrictions +++ b/pkg/controller/.import-restrictions @@ -82,6 +82,7 @@ "k8s.io/api/authorization/v1", "k8s.io/api/settings/v1alpha1", "k8s.io/api/admission/v1beta1", + "k8s.io/api/admission/v1", "k8s.io/api/networking/v1", "k8s.io/component-base/config", "k8s.io/component-base/config/v1alpha1", diff --git a/staging/src/k8s.io/api/roundtrip_test.go b/staging/src/k8s.io/api/roundtrip_test.go index bf5b2bec822..321b2dfa3c5 100644 --- a/staging/src/k8s.io/api/roundtrip_test.go +++ b/staging/src/k8s.io/api/roundtrip_test.go @@ -20,6 +20,7 @@ import ( "math/rand" "testing" + admissionv1 "k8s.io/api/admission/v1" admissionv1beta1 "k8s.io/api/admission/v1beta1" admissionregv1 "k8s.io/api/admissionregistration/v1" admissionregv1beta1 "k8s.io/api/admissionregistration/v1beta1" @@ -69,6 +70,7 @@ import ( var groups = []runtime.SchemeBuilder{ admissionv1beta1.SchemeBuilder, + admissionv1.SchemeBuilder, admissionregv1beta1.SchemeBuilder, admissionregv1.SchemeBuilder, appsv1beta1.SchemeBuilder, diff --git a/staging/src/k8s.io/kubectl/pkg/scheme/install.go b/staging/src/k8s.io/kubectl/pkg/scheme/install.go index 83beb3da289..ffd15bf1b66 100644 --- a/staging/src/k8s.io/kubectl/pkg/scheme/install.go +++ b/staging/src/k8s.io/kubectl/pkg/scheme/install.go @@ -17,7 +17,8 @@ limitations under the License. package scheme import ( - admissionv1alpha1 "k8s.io/api/admission/v1beta1" + admissionv1 "k8s.io/api/admission/v1" + admissionv1beta1 "k8s.io/api/admission/v1beta1" admissionregistrationv1 "k8s.io/api/admissionregistration/v1" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" appsv1 "k8s.io/api/apps/v1" @@ -63,7 +64,7 @@ func init() { utilruntime.Must(scheme.AddToScheme(Scheme)) utilruntime.Must(Scheme.SetVersionPriority(corev1.SchemeGroupVersion)) - utilruntime.Must(Scheme.SetVersionPriority(admissionv1alpha1.SchemeGroupVersion)) + utilruntime.Must(Scheme.SetVersionPriority(admissionv1beta1.SchemeGroupVersion, admissionv1.SchemeGroupVersion)) utilruntime.Must(Scheme.SetVersionPriority(admissionregistrationv1beta1.SchemeGroupVersion, admissionregistrationv1.SchemeGroupVersion)) utilruntime.Must(Scheme.SetVersionPriority(appsv1beta1.SchemeGroupVersion, appsv1beta2.SchemeGroupVersion, appsv1.SchemeGroupVersion)) utilruntime.Must(Scheme.SetVersionPriority(authenticationv1.SchemeGroupVersion, authenticationv1beta1.SchemeGroupVersion))