From cd41a7d8e11796b6f13a62dfefd661d24664eb2d Mon Sep 17 00:00:00 2001 From: Alexander Zielenski Date: Thu, 23 May 2024 09:42:29 -0700 Subject: [PATCH] store validatingadmissionpolicy and bindings at v1 --- api/discovery/apis__admissionregistration.k8s.io__v1.json | 4 ++-- .../apis__admissionregistration.k8s.io__v1alpha1.json | 4 ++-- .../apis__admissionregistration.k8s.io__v1beta1.json | 4 ++-- pkg/controlplane/storageversionhashdata/data.go | 4 ++-- pkg/kubeapiserver/default_storage_factory_builder.go | 3 --- test/integration/etcd/data.go | 8 ++++---- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/api/discovery/apis__admissionregistration.k8s.io__v1.json b/api/discovery/apis__admissionregistration.k8s.io__v1.json index 56f1f694002..9334cc7948b 100644 --- a/api/discovery/apis__admissionregistration.k8s.io__v1.json +++ b/api/discovery/apis__admissionregistration.k8s.io__v1.json @@ -31,7 +31,7 @@ "name": "validatingadmissionpolicies", "namespaced": false, "singularName": "validatingadmissionpolicy", - "storageVersionHash": "P/h9c6yIbaY=", + "storageVersionHash": "6OxvlMmQ6is=", "verbs": [ "create", "delete", @@ -62,7 +62,7 @@ "name": "validatingadmissionpolicybindings", "namespaced": false, "singularName": "validatingadmissionpolicybinding", - "storageVersionHash": "XYju31JKYek=", + "storageVersionHash": "v9715VZqakg=", "verbs": [ "create", "delete", diff --git a/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json b/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json index 5b3232fae3a..1e7ff835df1 100644 --- a/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json +++ b/api/discovery/apis__admissionregistration.k8s.io__v1alpha1.json @@ -11,7 +11,7 @@ "name": "validatingadmissionpolicies", "namespaced": false, "singularName": "validatingadmissionpolicy", - "storageVersionHash": "P/h9c6yIbaY=", + "storageVersionHash": "6OxvlMmQ6is=", "verbs": [ "create", "delete", @@ -42,7 +42,7 @@ "name": "validatingadmissionpolicybindings", "namespaced": false, "singularName": "validatingadmissionpolicybinding", - "storageVersionHash": "XYju31JKYek=", + "storageVersionHash": "v9715VZqakg=", "verbs": [ "create", "delete", diff --git a/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json b/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json index 05f2215c37a..9314d0d6fcb 100644 --- a/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json +++ b/api/discovery/apis__admissionregistration.k8s.io__v1beta1.json @@ -11,7 +11,7 @@ "name": "validatingadmissionpolicies", "namespaced": false, "singularName": "validatingadmissionpolicy", - "storageVersionHash": "P/h9c6yIbaY=", + "storageVersionHash": "6OxvlMmQ6is=", "verbs": [ "create", "delete", @@ -42,7 +42,7 @@ "name": "validatingadmissionpolicybindings", "namespaced": false, "singularName": "validatingadmissionpolicybinding", - "storageVersionHash": "XYju31JKYek=", + "storageVersionHash": "v9715VZqakg=", "verbs": [ "create", "delete", diff --git a/pkg/controlplane/storageversionhashdata/data.go b/pkg/controlplane/storageversionhashdata/data.go index fee516380e6..b38b6a64dd8 100644 --- a/pkg/controlplane/storageversionhashdata/data.go +++ b/pkg/controlplane/storageversionhashdata/data.go @@ -81,8 +81,8 @@ var GVRToStorageVersionHash = map[string]string{ "apps/v1/statefulsets": "H+vl74LkKdo=", "admissionregistration.k8s.io/v1/mutatingwebhookconfigurations": "Sqi0GUgDaX0=", "admissionregistration.k8s.io/v1/validatingwebhookconfigurations": "B0wHjQmsGNk=", - "admissionregistration.k8s.io/v1/validatingadmissionpolicies": "P/h9c6yIbaY=", - "admissionregistration.k8s.io/v1/validatingadmissionpolicybindings": "XYju31JKYek=", + "admissionregistration.k8s.io/v1/validatingadmissionpolicies": "6OxvlMmQ6is=", + "admissionregistration.k8s.io/v1/validatingadmissionpolicybindings": "v9715VZqakg=", "events.k8s.io/v1/events": "r2yiGXH7wu8=", "flowcontrol.apiserver.k8s.io/v1beta3/flowschemas": "GJVAJZSZBIw=", "flowcontrol.apiserver.k8s.io/v1beta3/prioritylevelconfigurations": "Kir5PVfvNeI=", diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index 4d314a2604e..f73289ba761 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -26,7 +26,6 @@ import ( serverstorage "k8s.io/apiserver/pkg/server/storage" "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api/legacyscheme" - "k8s.io/kubernetes/pkg/apis/admissionregistration" "k8s.io/kubernetes/pkg/apis/apps" "k8s.io/kubernetes/pkg/apis/certificates" api "k8s.io/kubernetes/pkg/apis/core" @@ -71,8 +70,6 @@ func NewStorageFactoryConfig() *StorageFactoryConfig { // // TODO (https://github.com/kubernetes/kubernetes/issues/108451): remove the override in 1.25. // apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"), - admissionregistration.Resource("validatingadmissionpolicies").WithVersion("v1beta1"), - admissionregistration.Resource("validatingadmissionpolicybindings").WithVersion("v1beta1"), networking.Resource("ipaddresses").WithVersion("v1alpha1"), networking.Resource("servicecidrs").WithVersion("v1alpha1"), certificates.Resource("clustertrustbundles").WithVersion("v1alpha1"), diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index c30015321a1..a0cd9113017 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -348,12 +348,10 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("admissionregistration.k8s.io", "v1", "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"}]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicy"), }, gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings"): { Stub: `{"metadata":{"name":"pb1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com","parameterNotFoundAction":"Deny"},"validationActions":["Deny"]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"), }, // -- @@ -361,10 +359,12 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes 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"}]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1b1", + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"), }, 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"]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1b1", + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"), }, // -- @@ -372,12 +372,12 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): { Stub: `{"metadata":{"name":"vap1a1","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/vap1a1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicy"), + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"), }, gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): { Stub: `{"metadata":{"name":"pb1a1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`, ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1a1", - ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1beta1", "ValidatingAdmissionPolicyBinding"), + ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"), }, // --