Merge pull request kubernetes-retired#234 from mochizuki875/feature-230

Fix validation of Subnamespaceanchor deletion

Author: k8s-ci-robot

internal/anchor/validator.go

@@ -75,14 +75,16 @@ func (v *Validator) handle(req *anchorRequest) admission.Response {
 	cnm := req.anchor.Name
 	cns := v.Forest.Get(cnm)
 
-	errStrs := validation.IsDNS1123Label(cnm)
-	if len(errStrs) != 0 {
-		fldPath := field.NewPath("metadata", "name")
-		msg := fmt.Sprintf("not a valid namespace name: %s", strings.Join(errStrs, "; "))
-		allErrs := field.ErrorList{
-			field.Invalid(fldPath, cnm, msg),
+	if req.op != k8sadm.Delete {
+		errStrs := validation.IsDNS1123Label(cnm)
+		if len(errStrs) != 0 {
+			fldPath := field.NewPath("metadata", "name")
+			msg := fmt.Sprintf("not a valid namespace name: %s", strings.Join(errStrs, "; "))
+			allErrs := field.ErrorList{
+				field.Invalid(fldPath, cnm, msg),
+			}
+			return webhooks.DenyInvalid(api.SubnamespaceAnchorGK, cnm, allErrs)
 		}
-		return webhooks.DenyInvalid(api.SubnamespaceAnchorGK, cnm, allErrs)
 	}
 
 	labelErrs := config.ValidateManagedLabels(req.anchor.Spec.Labels)

internal/anchor/validator_test.go

@@ -32,6 +32,7 @@ func TestCreateSubnamespaces(t *testing.T) {
 		{name: "for existing non-subns child", pnm: "a", cnm: "c", fail: true},
 		{name: "for existing subns", pnm: "a", cnm: "b"},
 		{name: "for non DNS label compliant child", pnm: "a", cnm: "child.01", fail: true},
+		{name: "with name more than 63 characters", pnm: "a", cnm: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", fail: true},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
@@ -55,6 +56,41 @@ func TestCreateSubnamespaces(t *testing.T) {
 	}
 }
 
+func TestDeleteSubnamespaces(t *testing.T) {
+	f := foresttest.Create("-Aa")
+	v := &Validator{Forest: f}
+
+	tests := []struct {
+		name string
+		pnm  string
+		cnm  string
+		fail bool
+	}{
+		{name: "for existing subns", pnm: "a", cnm: "b"},
+		{name: "with name more than 63 characters", pnm: "a", cnm: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"},
+	}
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			// Setup
+			g := NewWithT(t)
+			anchor := &api.SubnamespaceAnchor{}
+			anchor.ObjectMeta.Namespace = tc.pnm
+			anchor.ObjectMeta.Name = tc.cnm
+			req := &anchorRequest{
+				anchor: anchor,
+				op:     k8sadm.Delete,
+			}
+
+			// Test
+			got := v.handle(req)
+
+			// Report
+			logResult(t, got.AdmissionResponse.Result)
+			g.Expect(got.AdmissionResponse.Allowed).ShouldNot(Equal(tc.fail))
+		})
+	}
+}
+
 func TestManagedMeta(t *testing.T) {
 	f := foresttest.Create("-") // a
 	v := &Validator{Forest: f}