Resolve tags by the controller's platform (knative#3998)

* Resolve tags by the controller's platform

* Link to CRI-O bug

pkg/reconciler/revision/resolve.go

@@ -24,10 +24,12 @@ import (
 	"io/ioutil"
 	"net"
 	"net/http"
+	"runtime"
 	"time"
 
 	"github.com/google/go-containerregistry/pkg/authn/k8schain"
 	"github.com/google/go-containerregistry/pkg/name"
+	"github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/kubernetes"
@@ -106,9 +108,20 @@ func (r *digestResolver) Resolve(
 		return "", nil
 	}
 
-	desc, err := remote.Get(tag, remote.WithTransport(r.transport), remote.WithAuthFromKeychain(kc))
+	// TODO(#3997): Use remote.Get to resolve manifest lists to digests as well
+	// once CRI-O is fixed: https://github.com/cri-o/cri-o/issues/2157
+	platform := v1.Platform{
+		Architecture: runtime.GOARCH,
+		OS:           runtime.GOOS,
+	}
+	img, err := remote.Image(tag, remote.WithTransport(r.transport), remote.WithAuthFromKeychain(kc), remote.WithPlatform(platform))
+	if err != nil {
+		return "", err
+	}
+
+	dgst, err := img.Digest()
 	if err != nil {
 		return "", err
 	}
-	return fmt.Sprintf("%s@%s", tag.Repository.String(), desc.Digest), nil
+	return fmt.Sprintf("%s@%s", tag.Repository.String(), dgst), nil
 }