Merge pull request #917 from adrianludwin/unbreak-114-051

k8s-ci-robot · web-flow · commit e6946d0e216f · 2020-07-23T07:57:41.000-07:00
Unbreak object validator on 1.14
diff --git a/incubator/hnc/internal/validators/object.go b/incubator/hnc/internal/validators/object.go
@@ -70,6 +70,10 @@ func (o *Object) Handle(ctx context.Context, req admission.Request) admission.Re
 		}
 	}
 	if req.Operation != admissionv1beta1.Create {
+		// See issue #688 and #889
+		if req.Operation == admissionv1beta1.Delete && req.OldObject.Raw == nil {
+			return allow("cannot validate deletions in K8s 1.14")
+		}
 		if err := o.decoder.DecodeRaw(req.OldObject, oldInst); err != nil {
 			log.Error(err, "Couldn't decode req.OldObject", "raw", req.OldObject)
 			return deny(metav1.StatusReasonBadRequest, err.Error())

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,10 @@ func (o *Object) Handle(ctx context.Context, req admission.Request) admission.Re`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`	`if req.Operation != admissionv1beta1.Create {`
	`73`	`+ // See issue #688 and #889`
	`74`	`+ if req.Operation == admissionv1beta1.Delete && req.OldObject.Raw == nil {`
	`75`	`+ return allow("cannot validate deletions in K8s 1.14")`
	`76`	`+ }`
`73`	`77`	`if err := o.decoder.DecodeRaw(req.OldObject, oldInst); err != nil {`
`74`	`78`	`log.Error(err, "Couldn't decode req.OldObject", "raw", req.OldObject)`
`75`	`79`	`return deny(metav1.StatusReasonBadRequest, err.Error())`