Skip to content

Commit 3cd1c8d

Browse files
JefftreeJefftree
committed
Drop v1alpha1 VAP in CEL tests
1 parent 68631d8 commit 3cd1c8d

File tree

3 files changed

+46
-62
lines changed

3 files changed

+46
-62
lines changed

‎test/integration/apiserver/cel/admission_policy_test.go‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
3232
apiservertesting "k8s.io/kubernetes/cmd/kube-apiserver/app/testing"
3333
"k8s.io/kubernetes/pkg/apis/admissionregistration"
34-
admissionregistrationv1alpha1apis "k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1"
34+
admissionregistrationv1apis "k8s.io/kubernetes/pkg/apis/admissionregistration/v1"
3535
admissionregistrationv1beta1apis "k8s.io/kubernetes/pkg/apis/admissionregistration/v1beta1"
3636
"k8s.io/kubernetes/test/integration/etcd"
3737
"k8s.io/kubernetes/test/integration/framework"
@@ -43,7 +43,6 @@ import (
4343
clientset "k8s.io/client-go/kubernetes"
4444

4545
admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
46-
admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
4746
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
4847
)
4948

@@ -282,22 +281,22 @@ func createV1beta1ValidatingPolicyAndBinding(client clientset.Interface, convert
282281
return nil
283282
}
284283

285-
func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, convertedRules []admissionregistrationv1alpha1.NamedRuleWithOperations) error {
286-
exact := admissionregistrationv1alpha1.Exact
287-
equivalent := admissionregistrationv1alpha1.Equivalent
288-
denyAction := admissionregistrationv1alpha1.DenyAction
284+
func createV1ValidatingPolicyAndBinding(client clientset.Interface, convertedRules []admissionregistrationv1.NamedRuleWithOperations) error {
285+
exact := admissionregistrationv1.Exact
286+
equivalent := admissionregistrationv1.Equivalent
287+
denyAction := admissionregistrationv1.DenyAction
289288

290-
var outSpec admissionregistrationv1alpha1.ValidatingAdmissionPolicy
291-
if err := admissionregistrationv1alpha1apis.Convert_admissionregistration_ValidatingAdmissionPolicy_To_v1alpha1_ValidatingAdmissionPolicy(&testSpec, &outSpec, nil); err != nil {
289+
var outSpec admissionregistrationv1.ValidatingAdmissionPolicy
290+
if err := admissionregistrationv1apis.Convert_admissionregistration_ValidatingAdmissionPolicy_To_v1_ValidatingAdmissionPolicy(&testSpec, &outSpec, nil); err != nil {
292291
return err
293292
}
294293

295294
exactPolicyTemplate := outSpec.DeepCopy()
296295
convertedPolicyTemplate := outSpec.DeepCopy()
297296

298-
exactPolicyTemplate.SetName("test-policy-v1alpha1")
299-
exactPolicyTemplate.Spec.MatchConstraints = &admissionregistrationv1alpha1.MatchResources{
300-
ResourceRules: []admissionregistrationv1alpha1.NamedRuleWithOperations{
297+
exactPolicyTemplate.SetName("test-policy-v1")
298+
exactPolicyTemplate.Spec.MatchConstraints = &admissionregistrationv1.MatchResources{
299+
ResourceRules: []admissionregistrationv1.NamedRuleWithOperations{
301300
{
302301
RuleWithOperations: admissionregistrationv1.RuleWithOperations{
303302
Operations: []admissionregistrationv1.OperationType{admissionregistrationv1.OperationAll},
@@ -308,33 +307,33 @@ func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, conver
308307
MatchPolicy: &exact,
309308
}
310309

311-
convertedPolicyTemplate.SetName("test-policy-v1alpha1-convert")
312-
convertedPolicyTemplate.Spec.MatchConstraints = &admissionregistrationv1alpha1.MatchResources{
310+
convertedPolicyTemplate.SetName("test-policy-v1-convert")
311+
convertedPolicyTemplate.Spec.MatchConstraints = &admissionregistrationv1.MatchResources{
313312
ResourceRules: convertedRules,
314313
MatchPolicy: &equivalent,
315314
}
316315

317-
exactPolicy, err := client.AdmissionregistrationV1alpha1().ValidatingAdmissionPolicies().Create(context.TODO(), exactPolicyTemplate, metav1.CreateOptions{})
316+
exactPolicy, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Create(context.TODO(), exactPolicyTemplate, metav1.CreateOptions{})
318317
if err != nil {
319318
return err
320319
}
321320

322-
convertPolicy, err := client.AdmissionregistrationV1alpha1().ValidatingAdmissionPolicies().Create(context.TODO(), convertedPolicyTemplate, metav1.CreateOptions{})
321+
convertPolicy, err := client.AdmissionregistrationV1().ValidatingAdmissionPolicies().Create(context.TODO(), convertedPolicyTemplate, metav1.CreateOptions{})
323322
if err != nil {
324323
return err
325324
}
326325

327326
// Create a param that holds the options for this
328327
configuration, err := client.CoreV1().ConfigMaps("default").Create(context.TODO(), &corev1.ConfigMap{
329328
ObjectMeta: metav1.ObjectMeta{
330-
Name: "test-policy-v1alpha1-param",
329+
Name: "test-policy-v1-param",
331330
Namespace: "default",
332331
Annotations: map[string]string{
333332
"skipMatch": "yes",
334333
},
335334
},
336335
Data: map[string]string{
337-
"version": "v1alpha1",
336+
"version": "v1",
338337
"phase": validation,
339338
"convert": "false",
340339
},
@@ -345,14 +344,14 @@ func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, conver
345344

346345
configurationConvert, err := client.CoreV1().ConfigMaps("default").Create(context.TODO(), &corev1.ConfigMap{
347346
ObjectMeta: metav1.ObjectMeta{
348-
Name: "test-policy-v1alpha1-convert-param",
347+
Name: "test-policy-v1-convert-param",
349348
Namespace: "default",
350349
Annotations: map[string]string{
351350
"skipMatch": "yes",
352351
},
353352
},
354353
Data: map[string]string{
355-
"version": "v1alpha1",
354+
"version": "v1",
356355
"phase": validation,
357356
"convert": "true",
358357
},
@@ -361,14 +360,14 @@ func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, conver
361360
return err
362361
}
363362

364-
_, err = client.AdmissionregistrationV1alpha1().ValidatingAdmissionPolicyBindings().Create(context.TODO(), &admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding{
363+
_, err = client.AdmissionregistrationV1().ValidatingAdmissionPolicyBindings().Create(context.TODO(), &admissionregistrationv1.ValidatingAdmissionPolicyBinding{
365364
ObjectMeta: metav1.ObjectMeta{
366-
Name: "test-policy-v1alpha1-binding",
365+
Name: "test-policy-v1-binding",
367366
},
368-
Spec: admissionregistrationv1alpha1.ValidatingAdmissionPolicyBindingSpec{
367+
Spec: admissionregistrationv1.ValidatingAdmissionPolicyBindingSpec{
369368
PolicyName: exactPolicy.GetName(),
370-
ValidationActions: []admissionregistrationv1alpha1.ValidationAction{admissionregistrationv1alpha1.Warn},
371-
ParamRef: &admissionregistrationv1alpha1.ParamRef{
369+
ValidationActions: []admissionregistrationv1.ValidationAction{admissionregistrationv1.Warn},
370+
ParamRef: &admissionregistrationv1.ParamRef{
372371
Name: configuration.GetName(),
373372
Namespace: configuration.GetNamespace(),
374373
ParameterNotFoundAction: &denyAction,
@@ -378,14 +377,14 @@ func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, conver
378377
if err != nil {
379378
return err
380379
}
381-
_, err = client.AdmissionregistrationV1alpha1().ValidatingAdmissionPolicyBindings().Create(context.TODO(), &admissionregistrationv1alpha1.ValidatingAdmissionPolicyBinding{
380+
_, err = client.AdmissionregistrationV1().ValidatingAdmissionPolicyBindings().Create(context.TODO(), &admissionregistrationv1.ValidatingAdmissionPolicyBinding{
382381
ObjectMeta: metav1.ObjectMeta{
383-
Name: "test-policy-v1alpha1-convert-binding",
382+
Name: "test-policy-v1-convert-binding",
384383
},
385-
Spec: admissionregistrationv1alpha1.ValidatingAdmissionPolicyBindingSpec{
384+
Spec: admissionregistrationv1.ValidatingAdmissionPolicyBindingSpec{
386385
PolicyName: convertPolicy.GetName(),
387-
ValidationActions: []admissionregistrationv1alpha1.ValidationAction{admissionregistrationv1alpha1.Warn},
388-
ParamRef: &admissionregistrationv1alpha1.ParamRef{
386+
ValidationActions: []admissionregistrationv1.ValidationAction{admissionregistrationv1.Warn},
387+
ParamRef: &admissionregistrationv1.ParamRef{
389388
Name: configurationConvert.GetName(),
390389
Namespace: configurationConvert.GetNamespace(),
391390
ParameterNotFoundAction: &denyAction,
@@ -405,10 +404,6 @@ func createV1alpha1ValidatingPolicyAndBinding(client clientset.Interface, conver
405404
// This test tries to mirror very closely the same test for webhook admission
406405
// test/integration/apiserver/admissionwebhook/admission_test.go testWebhookAdmission
407406
func TestPolicyAdmission(t *testing.T) {
408-
// KUBE_APISERVER_SERVE_REMOVED_APIS_FOR_ONE_RELEASE allows for APIs pending removal to not block tests
409-
// TODO: Remove this line once admissionregistration v1alpha1 types to be removed in 1.32 are fully removed
410-
t.Setenv("KUBE_APISERVER_SERVE_REMOVED_APIS_FOR_ONE_RELEASE", "true")
411-
412407
holder := &policyExpectationHolder{
413408
holder: holder{
414409
t: t,
@@ -505,7 +500,7 @@ func TestPolicyAdmission(t *testing.T) {
505500
convertedResources := map[string]schema.GroupVersionResource{}
506501
// build the webhook rules enumerating the specific group/version/resources we want
507502
convertedV1beta1Rules := []admissionregistrationv1beta1.NamedRuleWithOperations{}
508-
convertedV1alpha1Rules := []admissionregistrationv1alpha1.NamedRuleWithOperations{}
503+
convertedV1Rules := []admissionregistrationv1.NamedRuleWithOperations{}
509504
for _, gvr := range gvrsToTest {
510505
metaGVR := metav1.GroupVersionResource{Group: gvr.Group, Version: gvr.Version, Resource: gvr.Resource}
511506

@@ -522,10 +517,10 @@ func TestPolicyAdmission(t *testing.T) {
522517
Rule: admissionregistrationv1beta1.Rule{APIGroups: []string{gvr.Group}, APIVersions: []string{gvr.Version}, Resources: []string{gvr.Resource}},
523518
},
524519
})
525-
convertedV1alpha1Rules = append(convertedV1alpha1Rules, admissionregistrationv1alpha1.NamedRuleWithOperations{
520+
convertedV1Rules = append(convertedV1Rules, admissionregistrationv1.NamedRuleWithOperations{
526521
RuleWithOperations: admissionregistrationv1.RuleWithOperations{
527-
Operations: []admissionregistrationv1alpha1.OperationType{admissionregistrationv1alpha1.OperationAll},
528-
Rule: admissionregistrationv1alpha1.Rule{APIGroups: []string{gvr.Group}, APIVersions: []string{gvr.Version}, Resources: []string{gvr.Resource}},
522+
Operations: []admissionregistrationv1.OperationType{admissionregistrationv1.OperationAll},
523+
Rule: admissionregistrationv1.Rule{APIGroups: []string{gvr.Group}, APIVersions: []string{gvr.Version}, Resources: []string{gvr.Resource}},
529524
},
530525
})
531526
}
@@ -535,11 +530,10 @@ func TestPolicyAdmission(t *testing.T) {
535530
holder.gvrToConvertedGVK[metaGVR] = schema.GroupVersionKind{Group: resourcesByGVR[convertedGVR].Group, Version: resourcesByGVR[convertedGVR].Version, Kind: resourcesByGVR[convertedGVR].Kind}
536531
}
537532

538-
if err := createV1alpha1ValidatingPolicyAndBinding(client, convertedV1alpha1Rules); err != nil {
533+
if err := createV1beta1ValidatingPolicyAndBinding(client, convertedV1beta1Rules); err != nil {
539534
t.Fatal(err)
540535
}
541-
542-
if err := createV1beta1ValidatingPolicyAndBinding(client, convertedV1beta1Rules); err != nil {
536+
if err := createV1ValidatingPolicyAndBinding(client, convertedV1Rules); err != nil {
543537
t.Fatal(err)
544538
}
545539

@@ -610,7 +604,7 @@ func (p *policyExpectationHolder) expect(gvr schema.GroupVersionResource, gvk, o
610604
p.recorded = map[webhookOptions]*admissionRequest{}
611605
for _, phase := range []string{validation} {
612606
for _, converted := range []bool{true, false} {
613-
for _, version := range []string{"v1alpha1", "v1beta1"} {
607+
for _, version := range []string{"v1beta1", "v1"} {
614608
p.recorded[webhookOptions{version: version, phase: phase, converted: converted}] = nil
615609
}
616610
}

‎test/integration/apiserver/cel/admission_test_util.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -137,17 +137,17 @@ var (
137137
// gvr("admissionregistration.k8s.io", "v1beta1", "validatingwebhookconfigurations"): true,
138138
// gvr("admissionregistration.k8s.io", "v1", "mutatingwebhookconfigurations"): true,
139139
// gvr("admissionregistration.k8s.io", "v1", "validatingwebhookconfigurations"): true,
140-
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): true,
141-
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies/status"): true,
142-
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): true,
143-
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): true,
144-
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies/status"): true,
145-
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings"): true,
146-
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies"): true,
147-
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies/status"): true,
148-
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings"): true,
149-
gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicies"): true,
150-
gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicybindings"): true,
140+
// gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): true,
141+
// gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies/status"): true,
142+
// gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): true,
143+
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies"): true,
144+
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicies/status"): true,
145+
gvr("admissionregistration.k8s.io", "v1beta1", "validatingadmissionpolicybindings"): true,
146+
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies"): true,
147+
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicies/status"): true,
148+
gvr("admissionregistration.k8s.io", "v1", "validatingadmissionpolicybindings"): true,
149+
gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicies"): true,
150+
gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicybindings"): true,
151151
// transient resource exemption
152152
gvr("authentication.k8s.io", "v1", "selfsubjectreviews"): true,
153153
gvr("authentication.k8s.io", "v1beta1", "selfsubjectreviews"): true,

‎test/integration/etcd/data.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
352352
// --
353353

354354
// k8s.io/kubernetes/pkg/apis/admissionregistration/v1alpha1
355-
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicies"): {
356-
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"}]}}`,
357-
ExpectedEtcdPath: "/registry/validatingadmissionpolicies/vap1a1",
358-
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicy"),
359-
},
360-
gvr("admissionregistration.k8s.io", "v1alpha1", "validatingadmissionpolicybindings"): {
361-
Stub: `{"metadata":{"name":"pb1a1","creationTimestamp":null},"spec":{"policyName":"replicalimit-policy.example.com","paramRef":{"name":"replica-limit-test.example.com"},"validationActions":["Deny"]}}`,
362-
ExpectedEtcdPath: "/registry/validatingadmissionpolicybindings/pb1a1",
363-
ExpectedGVK: gvkP("admissionregistration.k8s.io", "v1", "ValidatingAdmissionPolicyBinding"),
364-
},
365355
gvr("admissionregistration.k8s.io", "v1alpha1", "mutatingadmissionpolicies"): {
366356
Stub: `{"metadata":{"name":"map1","creationTimestamp":null},"spec":{"paramKind":{"apiVersion":"test.example.com/v1","kind":"Example"},"matchConstraints":{"resourceRules": [{"resourceNames": ["fakeName"], "apiGroups":["apps"],"apiVersions":["v1"],"operations":["CREATE", "UPDATE"], "resources":["deployments"]}]},"reinvocationPolicy": "IfNeeded","mutations":[{"applyConfiguration": {"expression":"Object{metadata: Object.metadata{labels: {'example':'true'}}}"}, "patchType":"ApplyConfiguration"}]}}`,
367357
ExpectedEtcdPath: "/registry/mutatingadmissionpolicies/map1",

0 commit comments

Comments
 (0)