diff --git a/Gopkg.lock b/Gopkg.lock
index e1f53753..341947f8 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -966,7 +966,7 @@
 
 [[projects]]
   branch = "master"
-  digest = "1:064cef5ec36970abc88e990be3e032b7bed5969201962d27d9e80982168b6664"
+  digest = "1:6794f3dda78fe3254a3561ef0d747b30f5e81f0acd7a79d5ae8dcbeb218704d6"
   name = "knative.dev/pkg"
   packages = [
     "apis",
@@ -986,18 +986,18 @@
     "reconciler",
   ]
   pruneopts = "T"
-  revision = "1327ff317946b1d98492b35655e761702db330ca"
+  revision = "a572b9922a9e2bdf860a9c9f3482782a912d9b25"
 
 [[projects]]
   branch = "master"
-  digest = "1:dd8432987142e8a917e58bac0137c287f54399fa68b0760936d52dce04eb639b"
+  digest = "1:3d0c703375017dde28d1ee030d7f82ea838ab023841890ead18e91c8c9aded80"
   name = "knative.dev/test-infra"
   packages = [
     "scripts",
     "tools/dep-collector",
   ]
   pruneopts = "UT"
-  revision = "3cf9b305bb55cce84866bbf7e7fc4415adde01fb"
+  revision = "7a8eea898f66fc7cd5fec6bb7c0fa2a80eeb702e"
 
 [[projects]]
   digest = "1:8730e0150dfb2b7e173890c8b9868e7a273082ef8e39f4940e3506a481cf895c"
diff --git a/vendor/knative.dev/pkg/webhook/admission.go b/vendor/knative.dev/pkg/webhook/admission.go
index be13d6d1..4bcd6483 100644
--- a/vendor/knative.dev/pkg/webhook/admission.go
+++ b/vendor/knative.dev/pkg/webhook/admission.go
@@ -82,7 +82,7 @@ func admissionHandler(rootLogger *zap.SugaredLogger, stats StatsReporter, c Admi
 		response.Response.UID = review.Request.UID
 
 		if err := json.NewEncoder(w).Encode(response); err != nil {
-			http.Error(w, fmt.Sprintf("could encode response: %v", err), http.StatusInternalServerError)
+			http.Error(w, fmt.Sprintf("could not encode response: %v", err), http.StatusInternalServerError)
 			return
 		}
 
diff --git a/vendor/knative.dev/pkg/webhook/certificates/certificates.go b/vendor/knative.dev/pkg/webhook/certificates/certificates.go
index e01242bc..68e2d770 100644
--- a/vendor/knative.dev/pkg/webhook/certificates/certificates.go
+++ b/vendor/knative.dev/pkg/webhook/certificates/certificates.go
@@ -32,7 +32,7 @@ import (
 )
 
 const (
-	// Time used for updating a certificate before it expires. Default 1 week.
+	// Time used for updating a certificate before it expires.
 	oneWeek = 7 * 24 * time.Hour
 )
 
@@ -64,7 +64,7 @@ func (r *reconciler) reconcileCertificate(ctx context.Context) error {
 			return err
 		}
 	} else if err != nil {
-		logger.Errorf("error accessing certificate secret %q: %v", r.secretName, err)
+		logger.Errorf("Error accessing certificate secret %q: %v", r.secretName, err)
 		return err
 	}
 
diff --git a/vendor/knative.dev/pkg/webhook/conversion.go b/vendor/knative.dev/pkg/webhook/conversion.go
index 60343e0d..59575c34 100644
--- a/vendor/knative.dev/pkg/webhook/conversion.go
+++ b/vendor/knative.dev/pkg/webhook/conversion.go
@@ -58,7 +58,7 @@ func conversionHandler(rootLogger *zap.SugaredLogger, stats StatsReporter, c Con
 		}
 
 		if err := json.NewEncoder(w).Encode(response); err != nil {
-			http.Error(w, fmt.Sprintf("could encode response: %v", err), http.StatusInternalServerError)
+			http.Error(w, fmt.Sprintf("could not encode response: %v", err), http.StatusInternalServerError)
 			return
 		}
 
diff --git a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/conversion.go b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/conversion.go
index e829ed75..0d3f0ad2 100644
--- a/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/conversion.go
+++ b/vendor/knative.dev/pkg/webhook/resourcesemantics/conversion/conversion.go
@@ -52,6 +52,7 @@ func (r *reconciler) Convert(
 	for _, obj := range req.Objects {
 		converted, err := r.convert(ctx, obj, req.DesiredAPIVersion)
 		if err != nil {
+			logging.FromContext(ctx).Errorf("Conversion failed: %v", err)
 			res.Result.Status = metav1.StatusFailure
 			res.Result.Message = err.Error()
 			break
@@ -68,19 +69,13 @@ func (r *reconciler) convert(
 	ctx context.Context,
 	inRaw runtime.RawExtension,
 	targetVersion string,
-) (outRaw runtime.RawExtension, err error) {
-
+) (runtime.RawExtension, error) {
 	logger := logging.FromContext(ctx)
-
-	defer func() {
-		if err != nil {
-			logger.Errorf("Conversion failed: %s", err)
-		}
-	}()
+	var ret runtime.RawExtension
 
 	inGVK, err := parseGVK(inRaw)
 	if err != nil {
-		return
+		return ret, err
 	}
 
 	logger.Infof("Converting %s to version %s", formatGVK(inGVK), targetVersion)
@@ -88,30 +83,25 @@ func (r *reconciler) convert(
 	inGK := inGVK.GroupKind()
 	conv, ok := r.kinds[inGK]
 	if !ok {
-		err = fmt.Errorf("no conversion support for type %s", formatGK(inGVK.GroupKind()))
-		return
+		return ret, fmt.Errorf("no conversion support for type %s", formatGK(inGVK.GroupKind()))
 	}
 
 	outGVK, err := parseAPIVersion(targetVersion, inGK.Kind)
 	if err != nil {
-		return
+		return ret, err
 	}
 
 	inZygote, ok := conv.Zygotes[inGVK.Version]
 	if !ok {
-		err = fmt.Errorf("conversion not supported for type %s", formatGVK(inGVK))
-		return
+		return ret, fmt.Errorf("conversion not supported for type %s", formatGVK(inGVK))
 	}
 	outZygote, ok := conv.Zygotes[outGVK.Version]
 	if !ok {
-		err = fmt.Errorf("conversion not supported for type %s", formatGVK(outGVK))
-		return
+		return ret, fmt.Errorf("conversion not supported for type %s", formatGVK(outGVK))
 	}
 	hubZygote, ok := conv.Zygotes[conv.HubVersion]
 	if !ok {
-		inGK := inGVK.GroupKind()
-		err = fmt.Errorf("conversion not supported for type %s", formatGK(inGK))
-		return
+		return ret, fmt.Errorf("conversion not supported for type %s", formatGK(inGVK.GroupKind()))
 	}
 
 	in := inZygote.DeepCopyObject().(ConvertibleObject)
@@ -127,22 +117,19 @@ func (r *reconciler) convert(
 
 	// TODO(dprotaso) - potentially error on unknown fields
 	if err = json.Unmarshal(inRaw.Raw, &in); err != nil {
-		err = fmt.Errorf("unable to unmarshal input: %s", err)
-		return
+		return ret, fmt.Errorf("unable to unmarshal input: %w", err)
 	}
 
 	if inGVK.Version == conv.HubVersion {
 		hub = in
 	} else if err = hub.ConvertFrom(ctx, in); err != nil {
-		err = fmt.Errorf("conversion failed to version %s for type %s -  %s", outGVK.Version, formatGVK(inGVK), err)
-		return
+		return ret, fmt.Errorf("conversion failed to version %s for type %s -  %w", outGVK.Version, formatGVK(inGVK), err)
 	}
 
 	if outGVK.Version == conv.HubVersion {
 		out = hub
 	} else if err = hub.ConvertTo(ctx, out); err != nil {
-		err = fmt.Errorf("conversion failed to version %s for type %s -  %s", outGVK.Version, formatGVK(inGVK), err)
-		return
+		return ret, fmt.Errorf("conversion failed to version %s for type %s -  %w", outGVK.Version, formatGVK(inGVK), err)
 	}
 
 	out.GetObjectKind().SetGroupVersionKind(outGVK)
@@ -151,31 +138,33 @@ func (r *reconciler) convert(
 		defaultable.SetDefaults(ctx)
 	}
 
-	if outRaw.Raw, err = json.Marshal(out); err != nil {
-		err = fmt.Errorf("unable to marshal output: %s", err)
-		return
+	if ret.Raw, err = json.Marshal(out); err != nil {
+		return ret, fmt.Errorf("unable to marshal output: %w", err)
 	}
-
-	return
+	return ret, nil
 }
 
-func parseGVK(in runtime.RawExtension) (gvk schema.GroupVersionKind, err error) {
-	var typeMeta metav1.TypeMeta
+func parseGVK(in runtime.RawExtension) (schema.GroupVersionKind, error) {
+	var (
+		typeMeta metav1.TypeMeta
+		gvk      schema.GroupVersionKind
+	)
 
-	if err = json.Unmarshal(in.Raw, &typeMeta); err != nil {
-		err = fmt.Errorf("error parsing type meta %q - %s", string(in.Raw), err)
-		return
+	if err := json.Unmarshal(in.Raw, &typeMeta); err != nil {
+		return gvk, fmt.Errorf("error parsing type meta %q - %w", string(in.Raw), err)
 	}
 
 	gv, err := schema.ParseGroupVersion(typeMeta.APIVersion)
+	if err != nil {
+		return gvk, fmt.Errorf("error parsing GV %q: %w", typeMeta.APIVersion, err)
+	}
 	gvk = gv.WithKind(typeMeta.Kind)
 
 	if gvk.Group == "" || gvk.Version == "" || gvk.Kind == "" {
-		err = fmt.Errorf("invalid GroupVersionKind %v", gvk)
-		return
+		return gvk, fmt.Errorf("invalid GroupVersionKind %v", gvk)
 	}
 
-	return
+	return gvk, nil
 }
 
 func parseAPIVersion(apiVersion string, kind string) (schema.GroupVersionKind, error) {
diff --git a/vendor/knative.dev/test-infra/scripts/release.sh b/vendor/knative.dev/test-infra/scripts/release.sh
index 915fc97f..9c555777 100755
--- a/vendor/knative.dev/test-infra/scripts/release.sh
+++ b/vendor/knative.dev/test-infra/scripts/release.sh
@@ -498,9 +498,24 @@ function publish_artifacts() {
 
 # Entry point for a release script.
 function main() {
+  parse_flags "$@"
+
+  # Checkout specific branch, if necessary
+  local current_branch
+  current_branch="$(git rev-parse --abbrev-ref HEAD)"
+  if [[ -n "${RELEASE_BRANCH}" && -z "${FROM_NIGHTLY_RELEASE}" && "${current_branch}" != "${RELEASE_BRANCH}" ]]; then
+    setup_upstream
+    setup_branch
+    git checkout upstream/"${RELEASE_BRANCH}" || abort "cannot checkout branch ${RELEASE_BRANCH}"
+    # HACK HACK HACK
+    # Rerun the release script from the release branch. Fixes https://github.com/knative/test-infra/issues/1262
+    ./hack/release.sh "$@"
+    exit "$?"
+  fi
+
   function_exists build_release || abort "function 'build_release()' not defined"
   [[ -x ${VALIDATION_TESTS} ]] || abort "test script '${VALIDATION_TESTS}' doesn't exist"
-  parse_flags "$@"
+
   # Log what will be done and where.
   banner "Release configuration"
   if which gcloud &>/dev/null ; then
@@ -533,13 +548,6 @@ function main() {
   fi
   [[ -n "${RELEASE_NOTES}" ]] && echo "- Release notes are generated from '${RELEASE_NOTES}'"
 
-  # Checkout specific branch, if necessary
-  if [[ -n "${RELEASE_BRANCH}" && -z "${FROM_NIGHTLY_RELEASE}" ]]; then
-    setup_upstream
-    setup_branch
-    git checkout upstream/${RELEASE_BRANCH} || abort "cannot checkout branch ${RELEASE_BRANCH}"
-  fi
-
   if [[ -n "${FROM_NIGHTLY_RELEASE}" ]]; then
     build_from_nightly_release
   else