Skip to content

Commit e8a6762

Browse files
authored
[bugfix] remove label and annotation validation for sandboxset (openkruise#86)
* remove label and annotation validation for sandboxset Signed-off-by: AiRanthem <zhongtianyun.zty@alibaba-inc.com>
1 parent e8ba9e9 commit e8a6762

File tree

2 files changed

+0
-28
lines changed

2 files changed

+0
-28
lines changed

pkg/webhook/sandboxset/validating/sandboxset_create_update.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ func (h *SandboxSetValidatingHandler) Handle(_ context.Context, req admission.Re
5151
func validateSandboxSetMetadata(metadata metav1.ObjectMeta, fldPath *field.Path) field.ErrorList {
5252
var errList field.ErrorList
5353
errList = append(errList, validation.ValidateObjectMeta(&metadata, true, validation.NameIsDNSSubdomain, fldPath)...)
54-
errList = append(errList, validateLabelsAndAnnotations(metadata, fldPath)...)
5554
return errList
5655
}
5756

pkg/webhook/sandboxset/validating/sandboxset_create_update_test.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -148,33 +148,6 @@ func TestSandboxSetValidatingHandler_Handle(t *testing.T) {
148148
expectError: true,
149149
errorMessage: "label cannot start with " + v1alpha1.E2BPrefix,
150150
},
151-
{
152-
name: "Annotation with internal prefix",
153-
sandboxSet: &v1alpha1.SandboxSet{
154-
ObjectMeta: metav1.ObjectMeta{
155-
Name: "test-sbs",
156-
Namespace: "default",
157-
Annotations: map[string]string{
158-
v1alpha1.E2BPrefix + "test": "value", // Internal prefix annotations are invalid
159-
},
160-
},
161-
Spec: v1alpha1.SandboxSetSpec{
162-
Replicas: 3,
163-
SandboxTemplate: v1alpha1.SandboxTemplate{
164-
Template: &corev1.PodTemplateSpec{
165-
ObjectMeta: metav1.ObjectMeta{
166-
Labels: map[string]string{
167-
v1alpha1.E2BPrefix + "test": "value", // Template internal prefix labels are invalid
168-
},
169-
},
170-
},
171-
},
172-
},
173-
},
174-
expectAllow: false,
175-
expectError: true,
176-
errorMessage: "annotation cannot start with " + v1alpha1.E2BPrefix,
177-
},
178151
{
179152
name: "Template label with internal prefix",
180153
sandboxSet: &v1alpha1.SandboxSet{

0 commit comments

Comments
 (0)