pkg/reconcile/reconcile.go

@@ -112,11 +112,15 @@ type terminalError struct {
 	err error
 }
 
+// This function will return nil if te.err is nil.
 func (te *terminalError) Unwrap() error {
 	return te.err
 }
 
 func (te *terminalError) Error() string {
+	if te.err == nil {
+		return "nil terminal error"
+	}
 	return "terminal error: " + te.err.Error()
 }
 

pkg/reconcile/reconcile_test.go

@@ -96,5 +96,10 @@ var _ = Describe("reconcile", func() {
 
 			Expect(apierrors.IsGone(terminalError)).To(BeTrue())
 		})
+
+		It("should handle nil terminal errors properly", func() {
+			err := reconcile.TerminalError(nil)
+			Expect(err.Error()).To(Equal("nil terminal error"))
+		})
 	})
 })

pkg/webhook/admission/decode.go

@@ -71,6 +71,7 @@ func (d *Decoder) DecodeRaw(rawObj runtime.RawExtension, into runtime.Object) er
 			return err
 		}
 		unstructuredInto.SetUnstructuredContent(object)
+		return nil
 	}
 
 	deserializer := d.codecs.UniversalDeserializer()

pkg/webhook/admission/decode_test.go

@@ -123,6 +123,8 @@ var _ = Describe("Admission Webhook Decoder", func() {
 		}))
 	})
 
+	// NOTE: This will only pass if a GVK is provided. An unstructered object without a GVK may succeed
+	// in decoding to an alternate type.
 	It("should fail to decode if the object in the request doesn't match the passed-in type", func() {
 		By("trying to extract a pod from the quest into a node")
 		Expect(decoder.Decode(req, &corev1.Node{})).NotTo(Succeed())
@@ -152,4 +154,35 @@ var _ = Describe("Admission Webhook Decoder", func() {
 			"namespace": "default",
 		}))
 	})
+
+	req2 := Request{
+		AdmissionRequest: admissionv1.AdmissionRequest{
+			Operation: "CREATE",
+			Object: runtime.RawExtension{
+				Raw: []byte(`{
+    "metadata": {
+        "name": "foo",
+        "namespace": "default"
+    },
+    "spec": {
+        "containers": [
+            {
+                "image": "bar:v2",
+                "name": "bar"
+            }
+        ]
+    }
+	}`),
+			},
+			OldObject: runtime.RawExtension{
+				Object: nil,
+			},
+		},
+	}
+
+	It("should decode a valid admission request without GVK", func() {
+		By("extracting the object from the request")
+		var target3 unstructured.Unstructured
+		Expect(decoder.DecodeRaw(req2.Object, &target3)).To(Succeed())
+	})
 })