Add ImageDigests for multi container support

pkg/apis/serving/v1/revision_types.go

@@ -129,12 +129,32 @@ type RevisionStatus struct {
 	// +optional
 	LogURL string `json:"logUrl,omitempty"`
 
-	// ImageDigest holds the resolved digest for the image specified
+	// DeprecatedImageDigest holds the resolved digest for the image specified
 	// within .Spec.Container.Image. The digest is resolved during the creation
 	// of Revision. This field holds the digest value regardless of whether
 	// a tag or digest was originally specified in the Container object. It
 	// may be empty if the image comes from a registry listed to skip resolution.
+	// If multiple containers specified then DeprecatedImageDigest holds the digest
+	// for serving container.
+	// DEPRECATED Use ImageDigests instead.
+	// TODO(savitaashture) Remove deprecatedImageDigest.
+	// ref https://kubernetes.io/docs/reference/using-api/deprecation-policy for deprecation.
 	// +optional
+	DeprecatedImageDigest string `json:"imageDigest,omitempty"`
+
+	// ContainerStatuses is a slice of images present in .Spec.Container[*].Image
+	// to their respective digests and their container name.
+	// The digests are resolved during the creation of Revision.
+	// ContainerStatuses holds the container name and image digests
+	// for both serving and non serving containers.
+	// ref: http://bit.ly/image-digests
+	// +optional
+	ContainerStatuses []ContainerStatuses `json:"containerStatuses,omitempty"`
+}
+
+// ContainerStatuses holds the information of container name and image digest value
+type ContainerStatuses struct {
+	Name        string `json:"name,omitempty"`
 	ImageDigest string `json:"imageDigest,omitempty"`
 }
 

pkg/apis/serving/v1alpha1/revision_conversion.go

@@ -79,6 +79,16 @@ func (source *RevisionStatus) ConvertTo(ctx context.Context, sink *v1.RevisionSt
 	source.Status.ConvertTo(ctx, &sink.Status, v1.IsRevisionCondition)
 	sink.ServiceName = source.ServiceName
 	sink.LogURL = source.LogURL
+	sink.DeprecatedImageDigest = source.DeprecatedImageDigest
+	sink.ContainerStatuses = make([]v1.ContainerStatuses, len(source.ContainerStatuses))
+	for i := range source.ContainerStatuses {
+		source.ContainerStatuses[i].ConvertTo(ctx, &sink.ContainerStatuses[i])
+	}
+}
+
+// ConvertTo helps implement apis.Convertible
+func (source *ContainerStatuses) ConvertTo(ctx context.Context, sink *v1.ContainerStatuses) {
+	sink.Name = source.Name
 	sink.ImageDigest = source.ImageDigest
 }
 
@@ -111,5 +121,15 @@ func (sink *RevisionStatus) ConvertFrom(ctx context.Context, source v1.RevisionS
 	source.Status.ConvertTo(ctx, &sink.Status, v1.IsRevisionCondition)
 	sink.ServiceName = source.ServiceName
 	sink.LogURL = source.LogURL
+	sink.DeprecatedImageDigest = source.DeprecatedImageDigest
+	sink.ContainerStatuses = make([]ContainerStatuses, len(source.ContainerStatuses))
+	for i := range sink.ContainerStatuses {
+		sink.ContainerStatuses[i].ConvertFrom(ctx, &source.ContainerStatuses[i])
+	}
+}
+
+// ConvertFrom helps implement apis.Convertible
+func (sink *ContainerStatuses) ConvertFrom(ctx context.Context, source *v1.ContainerStatuses) {
+	sink.Name = source.Name
 	sink.ImageDigest = source.ImageDigest
 }

pkg/apis/serving/v1alpha1/revision_conversion_test.go

@@ -89,8 +89,9 @@ func TestRevisionConversion(t *testing.T) {
 						Status: "True",
 					}},
 				},
-				ServiceName: "foo-bar",
-				LogURL:      "http://logger.io",
+				ServiceName:       "foo-bar",
+				LogURL:            "http://logger.io",
+				ContainerStatuses: []ContainerStatuses{},
 			},
 		},
 	}, {
@@ -232,8 +233,9 @@ func TestRevisionConversionForMultiContainer(t *testing.T) {
 					Status: "True",
 				}},
 			},
-			ServiceName: "foo-bar",
-			LogURL:      "http://logger.io",
+			ServiceName:       "foo-bar",
+			LogURL:            "http://logger.io",
+			ContainerStatuses: []ContainerStatuses{},
 		},
 	}
 	beta := &v1beta1.Revision{}

pkg/apis/serving/v1alpha1/revision_types.go

@@ -185,12 +185,32 @@ type RevisionStatus struct {
 	// +optional
 	LogURL string `json:"logUrl,omitempty"`
 
-	// ImageDigest holds the resolved digest for the image specified
+	// DeprecatedImageDigest holds the resolved digest for the image specified
 	// within .Spec.Container.Image. The digest is resolved during the creation
 	// of Revision. This field holds the digest value regardless of whether
 	// a tag or digest was originally specified in the Container object. It
 	// may be empty if the image comes from a registry listed to skip resolution.
+	// If multiple containers specified then DeprecatedImageDigest holds the digest
+	// for serving container.
+	// DEPRECATED Use ImageDigests instead.
+	// TODO(savitaashture) Remove deprecatedImageDigest.
+	// ref https://kubernetes.io/docs/reference/using-api/deprecation-policy for deprecation.
 	// +optional
+	DeprecatedImageDigest string `json:"imageDigest,omitempty"`
+
+	// ContainerStatuses is a slice of images present in .Spec.Container[*].Image
+	// to their respective digests and their container name.
+	// The digests are resolved during the creation of Revision.
+	// ContainerStatuses holds the container name and image digests
+	// for both serving and non serving containers.
+	// ref: http://bit.ly/image-digests
+	// +optional
+	ContainerStatuses []ContainerStatuses `json:"containerStatuses,omitempty"`
+}
+
+// ContainerStatuses holds the information of container name and image digest value
+type ContainerStatuses struct {
+	Name        string `json:"name,omitempty"`
 	ImageDigest string `json:"imageDigest,omitempty"`
 }
 

pkg/reconciler/revision/queueing_test.go

@@ -60,7 +60,37 @@ const (
 	testQueueImage      = "queueImage"
 )
 
-func testRevision() *v1.Revision {
+func getPodSpec() corev1.PodSpec {
+	return corev1.PodSpec{
+		// corev1.Container has a lot of setting.  We try to pass many
+		// of them here to verify that we pass through the settings to
+		// derived objects.
+		Containers: []corev1.Container{{
+			Image:      "gcr.io/repo/image",
+			Command:    []string{"echo"},
+			Args:       []string{"hello", "world"},
+			WorkingDir: "/tmp",
+			Env: []corev1.EnvVar{{
+				Name:  "EDITOR",
+				Value: "emacs",
+			}},
+			LivenessProbe: &corev1.Probe{
+				TimeoutSeconds: 42,
+			},
+			ReadinessProbe: &corev1.Probe{
+				Handler: corev1.Handler{
+					HTTPGet: &corev1.HTTPGetAction{
+						Path: "health",
+					},
+				},
+				TimeoutSeconds: 43,
+			},
+			TerminationMessagePath: "/dev/null",
+		}},
+	}
+}
+
+func testRevision(podSpec corev1.PodSpec) *v1.Revision {
 	rev := &v1.Revision{
 		ObjectMeta: metav1.ObjectMeta{
 			SelfLink:  "/apis/serving/v1/namespaces/test/revisions/test-rev",
@@ -77,33 +107,7 @@ func testRevision() *v1.Revision {
 			UID: "test-rev-uid",
 		},
 		Spec: v1.RevisionSpec{
-			PodSpec: corev1.PodSpec{
-				// corev1.Container has a lot of setting.  We try to pass many
-				// of them here to verify that we pass through the settings to
-				// derived objects.
-				Containers: []corev1.Container{{
-					Image:      "gcr.io/repo/image",
-					Command:    []string{"echo"},
-					Args:       []string{"hello", "world"},
-					WorkingDir: "/tmp",
-					Env: []corev1.EnvVar{{
-						Name:  "EDITOR",
-						Value: "emacs",
-					}},
-					LivenessProbe: &corev1.Probe{
-						TimeoutSeconds: 42,
-					},
-					ReadinessProbe: &corev1.Probe{
-						Handler: corev1.Handler{
-							HTTPGet: &corev1.HTTPGetAction{
-								Path: "health",
-							},
-						},
-						TimeoutSeconds: 43,
-					},
-					TerminationMessagePath: "/dev/null",
-				}},
-			},
+			PodSpec:        podSpec,
 			TimeoutSeconds: ptr.Int64(60),
 		},
 	}
@@ -230,7 +234,7 @@ func TestNewRevisionCallsSyncHandler(t *testing.T) {
 
 	eg := errgroup.Group{}
 
-	rev := testRevision()
+	rev := testRevision(getPodSpec())
 	servingClient := fakeservingclient.Get(ctx)
 
 	h := NewHooks()

pkg/reconciler/revision/resources/deploy.go

@@ -159,8 +159,8 @@ func makePodSpec(rev *v1.Revision, loggingConfig *logging.Config, tracingConfig
 	userContainer.TTY = false
 
 	// Prefer imageDigest from revision if available
-	if rev.Status.ImageDigest != "" {
-		userContainer.Image = rev.Status.ImageDigest
+	if rev.Status.DeprecatedImageDigest != "" {
+		userContainer.Image = rev.Status.DeprecatedImageDigest
 	}
 
 	if userContainer.TerminationMessagePolicy == "" {

pkg/reconciler/revision/resources/deploy_test.go

@@ -495,7 +495,7 @@ func TestMakePodSpec(t *testing.T) {
 			withContainerConcurrency(1),
 			func(revision *v1.Revision) {
 				revision.Status = v1.RevisionStatus{
-					ImageDigest: "busybox@sha256:deadbeef",
+					DeprecatedImageDigest: "busybox@sha256:deadbeef",
 				}
 				container(revision.Spec.GetContainer(),
 					withTCPReadinessProbe(),

pkg/reconciler/revision/resources/imagecache.go

@@ -28,7 +28,7 @@ import (
 
 // MakeImageCache makes an caching.Image resources from a revision.
 func MakeImageCache(rev *v1.Revision) *caching.Image {
-	image := rev.Status.ImageDigest
+	image := rev.Status.DeprecatedImageDigest
 	if image == "" {
 		image = rev.Spec.GetContainer().Image
 	}

pkg/reconciler/revision/resources/imagecache_test.go

@@ -55,7 +55,7 @@ func TestMakeImageCache(t *testing.T) {
 				},
 			},
 			Status: v1.RevisionStatus{
-				ImageDigest: "busybox@sha256:deadbeef",
+				DeprecatedImageDigest: "busybox@sha256:deadbeef",
 			},
 		},
 		want: &caching.Image{