Skip to content

Commit c981c65

Browse files
authored
Merge pull request kubernetes#80231 from liggitt/admissionreview-v1
Promote admissionreview to v1
2 parents e857ae0 + 308c23c commit c981c65

File tree

52 files changed

+4120
-96
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+4120
-96
lines changed

api/openapi-spec/swagger.json

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/kazel_generated.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ kazel_configured_tags = ["openapi-gen"]
2727
# tags_values_pkgs is a dictionary mapping {k8s build tag: {tag value: [pkgs including that tag:value]}}
2828
tags_values_pkgs = {"openapi-gen": {
2929
"false": [
30+
"staging/src/k8s.io/api/admission/v1",
3031
"staging/src/k8s.io/api/admission/v1beta1",
3132
"staging/src/k8s.io/api/core/v1",
3233
"staging/src/k8s.io/apimachinery/pkg/apis/testapigroup/v1",
@@ -114,6 +115,7 @@ tags_pkgs_values = {"openapi-gen": {
114115
"pkg/apis/abac/v1beta1": ["true"],
115116
"pkg/apis/auditregistration": ["true"],
116117
"pkg/version": ["true"],
118+
"staging/src/k8s.io/api/admission/v1": ["false"],
117119
"staging/src/k8s.io/api/admission/v1beta1": ["false"],
118120
"staging/src/k8s.io/api/admissionregistration/v1": ["true"],
119121
"staging/src/k8s.io/api/admissionregistration/v1beta1": ["true"],

hack/.golint_failures

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ plugin/pkg/admission/resourcequota/apis/resourcequota/v1beta1
302302
plugin/pkg/auth/authorizer/node
303303
plugin/pkg/auth/authorizer/rbac
304304
plugin/pkg/auth/authorizer/rbac/bootstrappolicy
305+
staging/src/k8s.io/api/admission/v1
305306
staging/src/k8s.io/api/admission/v1beta1
306307
staging/src/k8s.io/api/admissionregistration/v1
307308
staging/src/k8s.io/api/admissionregistration/v1beta1

hack/.import-aliases

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"k8s.io/api/admissionregistration/v1": "admissionregistrationv1",
33
"k8s.io/api/admissionregistration/v1beta1": "admissionregistrationv1beta1",
44
"k8s.io/api/admission/v1beta1": "admissionv1beta1",
5+
"k8s.io/api/admission/v1": "admissionv1",
56
"k8s.io/api/apps/v1": "appsv1",
67
"k8s.io/api/apps/v1beta1": "appsv1beta1",
78
"k8s.io/api/apps/v1beta2": "appsv1beta2",

hack/lib/init.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ KUBE_AVAILABLE_GROUP_VERSIONS="${KUBE_AVAILABLE_GROUP_VERSIONS:-\
6565
v1 \
6666
admissionregistration.k8s.io/v1 \
6767
admissionregistration.k8s.io/v1beta1 \
68+
admission.k8s.io/v1 \
6869
admission.k8s.io/v1beta1 \
6970
apps/v1 \
7071
apps/v1beta1 \
@@ -110,6 +111,7 @@ KUBE_NONSERVER_GROUP_VERSIONS="
110111
abac.authorization.kubernetes.io/v1beta1 \
111112
componentconfig/v1alpha1 \
112113
imagepolicy.k8s.io/v1alpha1\
114+
admission.k8s.io/v1\
113115
admission.k8s.io/v1beta1\
114116
"
115117
export KUBE_NONSERVER_GROUP_VERSIONS

pkg/apis/admission/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ filegroup(
3636
":package-srcs",
3737
"//pkg/apis/admission/fuzzer:all-srcs",
3838
"//pkg/apis/admission/install:all-srcs",
39+
"//pkg/apis/admission/v1:all-srcs",
3940
"//pkg/apis/admission/v1beta1:all-srcs",
4041
],
4142
tags = ["automanaged"],

pkg/apis/admission/install/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ go_library(
1212
deps = [
1313
"//pkg/api/legacyscheme:go_default_library",
1414
"//pkg/apis/admission:go_default_library",
15+
"//pkg/apis/admission/v1:go_default_library",
1516
"//pkg/apis/admission/v1beta1:go_default_library",
1617
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
1718
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",

pkg/apis/admission/install/install.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2424
"k8s.io/kubernetes/pkg/api/legacyscheme"
2525
"k8s.io/kubernetes/pkg/apis/admission"
26+
v1 "k8s.io/kubernetes/pkg/apis/admission/v1"
2627
"k8s.io/kubernetes/pkg/apis/admission/v1beta1"
2728
)
2829

@@ -34,5 +35,6 @@ func init() {
3435
func Install(scheme *runtime.Scheme) {
3536
utilruntime.Must(admission.AddToScheme(scheme))
3637
utilruntime.Must(v1beta1.AddToScheme(scheme))
37-
utilruntime.Must(scheme.SetVersionPriority(v1beta1.SchemeGroupVersion))
38+
utilruntime.Must(v1.AddToScheme(scheme))
39+
utilruntime.Must(scheme.SetVersionPriority(v1.SchemeGroupVersion, v1beta1.SchemeGroupVersion))
3840
}

pkg/apis/admission/types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ type AdmissionRequest struct {
9595
Operation Operation
9696
// UserInfo is information about the requesting user
9797
UserInfo authentication.UserInfo
98-
// Object is the object from the incoming request prior to default values being applied
98+
// Object is the object from the incoming request.
9999
// +optional
100100
Object runtime.Object
101-
// OldObject is the existing object. Only populated for UPDATE requests.
101+
// OldObject is the existing object. Only populated for DELETE and UPDATE requests.
102102
// +optional
103103
OldObject runtime.Object
104104
// DryRun indicates that modifications will definitely not be persisted for this request.

pkg/apis/admission/v1/BUILD

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package(default_visibility = ["//visibility:public"])
2+
3+
load(
4+
"@io_bazel_rules_go//go:def.bzl",
5+
"go_library",
6+
)
7+
8+
go_library(
9+
name = "go_default_library",
10+
srcs = [
11+
"doc.go",
12+
"register.go",
13+
"zz_generated.conversion.go",
14+
"zz_generated.defaults.go",
15+
],
16+
importpath = "k8s.io/kubernetes/pkg/apis/admission/v1",
17+
deps = [
18+
"//pkg/apis/admission:go_default_library",
19+
"//staging/src/k8s.io/api/admission/v1:go_default_library",
20+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
21+
"//staging/src/k8s.io/apimachinery/pkg/conversion:go_default_library",
22+
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
23+
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
24+
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
25+
],
26+
)
27+
28+
filegroup(
29+
name = "package-srcs",
30+
srcs = glob(["**"]),
31+
tags = ["automanaged"],
32+
visibility = ["//visibility:private"],
33+
)
34+
35+
filegroup(
36+
name = "all-srcs",
37+
srcs = [":package-srcs"],
38+
tags = ["automanaged"],
39+
)

0 commit comments

Comments
 (0)