github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 05:46:16 +00:00
Code Issues Projects Releases Wiki Activity

Store validating admission policies and bindings as v1beta1

Browse Source
This commit is contained in:
Jordan Liggitt 2023-08-17 09:32:57 -04:00
parent 9ee7185be6
commit 09fa21ab87
No known key found for this signature in database
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json
View File

@ -11,7 +11,7 @@
"name": "validatingadmissionpolicies", "name": "validatingadmissionpolicies",
"namespaced": false, "namespaced": false,
"singularName": "validatingadmissionpolicy", "singularName": "validatingadmissionpolicy",
"storageVersionHash": "Vd+hadMG3gs=", "storageVersionHash": "P/h9c6yIbaY=",
"verbs": [ "verbs": [
"create", "create",
"delete", "delete",
@ -42,7 +42,7 @@
"name": "validatingadmissionpolicybindings", "name": "validatingadmissionpolicybindings",
"namespaced": false, "namespaced": false,
"singularName": "validatingadmissionpolicybinding", "singularName": "validatingadmissionpolicybinding",
"storageVersionHash": "Yc3M4GKADk4=", "storageVersionHash": "XYju31JKYek=",
"verbs": [ "verbs": [
"create", "create",
"delete", "delete",

4
api/discovery/apis__admissionregistration.k8s.io__v1beta1.json
View File

@ -11,7 +11,7 @@
"name": "validatingadmissionpolicies", "name": "validatingadmissionpolicies",
"namespaced": false, "namespaced": false,
"singularName": "validatingadmissionpolicy", "singularName": "validatingadmissionpolicy",
"storageVersionHash": "Vd+hadMG3gs=", "storageVersionHash": "P/h9c6yIbaY=",
"verbs": [ "verbs": [
"create", "create",
"delete", "delete",
@ -42,7 +42,7 @@
"name": "validatingadmissionpolicybindings", "name": "validatingadmissionpolicybindings",
"namespaced": false, "namespaced": false,
"singularName": "validatingadmissionpolicybinding", "singularName": "validatingadmissionpolicybinding",
"storageVersionHash": "Yc3M4GKADk4=", "storageVersionHash": "XYju31JKYek=",
"verbs": [ "verbs": [
"create", "create",
"delete", "delete",

4
pkg/kubeapiserver/default_storage_factory_builder.go
View File

@ -69,8 +69,8 @@ func NewStorageFactoryConfig() *StorageFactoryConfig {
// //
// TODO (https://github.com/kubernetes/kubernetes/issues/108451): remove the override in 1.25. // TODO (https://github.com/kubernetes/kubernetes/issues/108451): remove the override in 1.25.
// apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"), // apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"),
admissionregistration.Resource("validatingadmissionpolicies").WithVersion("v1alpha1"), admissionregistration.Resource("validatingadmissionpolicies").WithVersion("v1beta1"),
admissionregistration.Resource("validatingadmissionpolicybindings").WithVersion("v1alpha1"), admissionregistration.Resource("validatingadmissionpolicybindings").WithVersion("v1beta1"),
networking.Resource("clustercidrs").WithVersion("v1alpha1"), networking.Resource("clustercidrs").WithVersion("v1alpha1"),
networking.Resource("ipaddresses").WithVersion("v1alpha1"), networking.Resource("ipaddresses").WithVersion("v1alpha1"),
certificates.Resource("clustertrustbundles").WithVersion("v1alpha1"), certificates.Resource("clustertrustbundles").WithVersion("v1alpha1"),

4
test/integration/etcd/data.go
View File

@ -354,12 +354,10 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): { gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): {
Stub: `{"metadata":{"name":"vap1b1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`, Stub: `{"metadata":{"name":"vap1b1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1", ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "ValidatingAdmissionPolicy"),
}, },
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings"): { gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings"): {
Stub: `{"metadata":{"name":"pb1b1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`, Stub: `{"metadata":{"name":"pb1b1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1", ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1alpha1", "ValidatingAdmissionPolicyBinding"),
}, },
// -- // --
@ -367,10 +365,12 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): { gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): {
Stub: `{"metadata":{"name":"vap1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`, Stub: `{"metadata":{"name":"vap1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"validations":[{"expression":"object.spec.replicas <= params.maxReplicas","message":"Too many replicas"}]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1", ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicy"),
}, },
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): { gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): {
Stub: `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`, Stub: `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`,
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1", ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1",
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"),
}, },
// -- // --