github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

AdmissionReview: Install/register

Browse Source
This commit is contained in:
Jordan Liggitt 2019-07-11 13:28:00 -04:00
parent 0429ab8c22
commit 44930fc939
7 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/.golint_failures
View File

@ -309,6 +309,7 @@ plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1
plugin/pkg/auth/authorizer/node plugin/pkg/auth/authorizer/node
plugin/pkg/auth/authorizer/rbac plugin/pkg/auth/authorizer/rbac
plugin/pkg/auth/authorizer/rbac/bootstrappolicy 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/admission/v1beta1
staging/src/k8s.io/api/admissionregistration/v1 staging/src/k8s.io/api/admissionregistration/v1
staging/src/k8s.io/api/admissionregistration/v1beta1 staging/src/k8s.io/api/admissionregistration/v1beta1

1
hack/.import-aliases
View File

@ -2,6 +2,7 @@
"k8s.io/api/admissionregistration/v1": "admissionregistrationv1", "k8s.io/api/admissionregistration/v1": "admissionregistrationv1",
"k8s.io/api/admissionregistration/v1beta1": "admissionregistrationv1beta1", "k8s.io/api/admissionregistration/v1beta1": "admissionregistrationv1beta1",
"k8s.io/api/admission/v1beta1": "admissionv1beta1", "k8s.io/api/admission/v1beta1": "admissionv1beta1",
"k8s.io/api/admission/v1": "admissionv1",
"k8s.io/api/apps/v1": "appsv1", "k8s.io/api/apps/v1": "appsv1",
"k8s.io/api/apps/v1beta1": "appsv1beta1", "k8s.io/api/apps/v1beta1": "appsv1beta1",
"k8s.io/api/apps/v1beta2": "appsv1beta2", "k8s.io/api/apps/v1beta2": "appsv1beta2",

2
hack/lib/init.sh
View File

@ -65,6 +65,7 @@ KUBE_AVAILABLE_GROUP_VERSIONS="${KUBE_AVAILABLE_GROUP_VERSIONS:-\
v1 \ v1 \
admissionregistration.k8s.io/v1 \ admissionregistration.k8s.io/v1 \
admissionregistration.k8s.io/v1beta1 \ admissionregistration.k8s.io/v1beta1 \
admission.k8s.io/v1 \
admission.k8s.io/v1beta1 \ admission.k8s.io/v1beta1 \
apps/v1 \ apps/v1 \
apps/v1beta1 \ apps/v1beta1 \
@ -110,6 +111,7 @@ KUBE_NONSERVER_GROUP_VERSIONS="
abac.authorization.kubernetes.io/v1beta1 \ abac.authorization.kubernetes.io/v1beta1 \
componentconfig/v1alpha1 \ componentconfig/v1alpha1 \
imagepolicy.k8s.io/v1alpha1\ imagepolicy.k8s.io/v1alpha1\
admission.k8s.io/v1\
admission.k8s.io/v1beta1\ admission.k8s.io/v1beta1\
" "
export KUBE_NONSERVER_GROUP_VERSIONS export KUBE_NONSERVER_GROUP_VERSIONS

4
pkg/apis/admission/install/install.go
View File

@ -23,6 +23,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/apis/admission" "k8s.io/kubernetes/pkg/apis/admission"
v1 "k8s.io/kubernetes/pkg/apis/admission/v1"
"k8s.io/kubernetes/pkg/apis/admission/v1beta1" "k8s.io/kubernetes/pkg/apis/admission/v1beta1"
) )
@ -34,5 +35,6 @@ func init() {
func Install(scheme *runtime.Scheme) { func Install(scheme *runtime.Scheme) {
utilruntime.Must(admission.AddToScheme(scheme)) utilruntime.Must(admission.AddToScheme(scheme))
utilruntime.Must(v1beta1.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))
} }

1
pkg/controller/.import-restrictions
View File

@ -82,6 +82,7 @@
"k8s.io/api/authorization/v1", "k8s.io/api/authorization/v1",
"k8s.io/api/settings/v1alpha1", "k8s.io/api/settings/v1alpha1",
"k8s.io/api/admission/v1beta1", "k8s.io/api/admission/v1beta1",
"k8s.io/api/admission/v1",
"k8s.io/api/networking/v1", "k8s.io/api/networking/v1",
"k8s.io/component-base/config", "k8s.io/component-base/config",
"k8s.io/component-base/config/v1alpha1", "k8s.io/component-base/config/v1alpha1",

2
staging/src/k8s.io/api/roundtrip_test.go
View File

@ -20,6 +20,7 @@ import (
"math/rand" "math/rand"
"testing" "testing"
admissionv1 "k8s.io/api/admission/v1"
admissionv1beta1 "k8s.io/api/admission/v1beta1" admissionv1beta1 "k8s.io/api/admission/v1beta1"
admissionregv1 "k8s.io/api/admissionregistration/v1" admissionregv1 "k8s.io/api/admissionregistration/v1"
admissionregv1beta1 "k8s.io/api/admissionregistration/v1beta1" admissionregv1beta1 "k8s.io/api/admissionregistration/v1beta1"
@ -69,6 +70,7 @@ import (
var groups = []runtime.SchemeBuilder{ var groups = []runtime.SchemeBuilder{
admissionv1beta1.SchemeBuilder, admissionv1beta1.SchemeBuilder,
admissionv1.SchemeBuilder,
admissionregv1beta1.SchemeBuilder, admissionregv1beta1.SchemeBuilder,
admissionregv1.SchemeBuilder, admissionregv1.SchemeBuilder,
appsv1beta1.SchemeBuilder, appsv1beta1.SchemeBuilder,

5
staging/src/k8s.io/kubectl/pkg/scheme/install.go
View File

@ -17,7 +17,8 @@ limitations under the License.
package scheme package scheme
import ( 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" admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1" admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"
@ -63,7 +64,7 @@ func init() {
utilruntime.Must(scheme.AddToScheme(Scheme)) utilruntime.Must(scheme.AddToScheme(Scheme))
utilruntime.Must(Scheme.SetVersionPriority(corev1.SchemeGroupVersion)) 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(admissionregistrationv1beta1.SchemeGroupVersion, admissionregistrationv1.SchemeGroupVersion))
utilruntime.Must(Scheme.SetVersionPriority(appsv1beta1.SchemeGroupVersion, appsv1beta2.SchemeGroupVersion, appsv1.SchemeGroupVersion)) utilruntime.Must(Scheme.SetVersionPriority(appsv1beta1.SchemeGroupVersion, appsv1beta2.SchemeGroupVersion, appsv1.SchemeGroupVersion))
utilruntime.Must(Scheme.SetVersionPriority(authenticationv1.SchemeGroupVersion, authenticationv1beta1.SchemeGroupVersion)) utilruntime.Must(Scheme.SetVersionPriority(authenticationv1.SchemeGroupVersion, authenticationv1beta1.SchemeGroupVersion))