Repository: knative/serving
Pull request #10670 (2021-02-01 22:38:19)

Perform some test helper cleanup
Remove unused or move single used items closer to invocation, reduces our public method footprint.

Improve the code flow in the e2e tests.

/assign @dprotaso @tcnghia 

knative-prow-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative/serving/pull/10670#" title="Author self-approved">vagababov</a>*

The full list of commands accepted by this bot can be found [here](https://go.k8s.io/bot-commands?repo=knative%2Fserving).

The pull request process is described [here](https://git.k8s.io/community/contributors/guide/owners.md#the-code-review-process)

<details >
Needs approval from an approver in each of these files:

- ~~[pkg/testing/OWNERS](https://github.com/knative/serving/blob/master/pkg/testing/OWNERS)~~ [vagababov]
- ~~[test/OWNERS](https://github.com/knative/serving/blob/master/test/OWNERS)~~ [vagababov]

Approvers can indicate their approval by writing `/approve` in a comment
Approvers can cancel approval by writing `/approve cancel` in a comment
</details>
<!-- META={"approvers":[]} -->

Patch:
diff --git a/go.mod b/go.mod
index 92830eaf5..b28c8ff94 100644
--- a/go.mod
+++ b/go.mod
@@ -52,9 +52,9 @@ require (
 	k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 // indirect
 	k8s.io/kube-openapi v0.0.0-20210113233702-8566a335510f
 	k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
-	knative.dev/caching v0.0.0-20210125050654-45e8de7ff96e
+	knative.dev/caching v0.0.0-20210201195732-f8bed817dad1
 	knative.dev/hack v0.0.0-20210120165453-8d623a0af457
-	knative.dev/networking v0.0.0-20210125050654-94433ab7f620
-	knative.dev/pkg v0.0.0-20210125222030-6040b3af4803
+	knative.dev/networking v0.0.0-20210201021832-342a3fbb8756
+	knative.dev/pkg v0.0.0-20210130001831-ca02ef752ac6
 	sigs.k8s.io/yaml v1.2.0
 )
diff --git a/go.sum b/go.sum
index a493002c9..c47ec78aa 100644
--- a/go.sum
+++ b/go.sum
@@ -1289,16 +1289,14 @@ k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K
 k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 h1:0T5IaWHO3sJTEmCP6mUlBvMukxPKUQWqiI/YuiBNMiQ=
 k8s.io/utils v0.0.0-20210111153108-fddb29f9d009/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-knative.dev/caching v0.0.0-20210125050654-45e8de7ff96e h1:yby4d04C0Da7kIaRkMIOAbimAMtHkgz3aEltCrKV44E=
-knative.dev/caching v0.0.0-20210125050654-45e8de7ff96e/go.mod h1:CCPmbFBblAYTrif1qlBP1pSuGECOYLNoVjHgqCimdK0=
+knative.dev/caching v0.0.0-20210201195732-f8bed817dad1 h1:cgLn/SJdX1/q0RV9qssJtgl1O3pkIJy2DXAHV4iB978=
+knative.dev/caching v0.0.0-20210201195732-f8bed817dad1/go.mod h1:YTyeMeeMzVkCsGLNuucs0Ui25BcR0iKUGQgef4cj4/o=
 knative.dev/hack v0.0.0-20210120165453-8d623a0af457 h1:jEBITgx/lQydGncM0uetpv/ZqawRzb2aSfEaYoMeDjM=
 knative.dev/hack v0.0.0-20210120165453-8d623a0af457/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/networking v0.0.0-20210125050654-94433ab7f620 h1:Psy3pDjwkXmsgj+4sI7sLkYdoE6SgxKRq453FpCR+/c=
-knative.dev/networking v0.0.0-20210125050654-94433ab7f620/go.mod h1:P90P5exK7Vl5AGzuT946ee9Sxf/BoCwNnX8fmxrkuJw=
-knative.dev/pkg v0.0.0-20210124203454-7101e9d4f6c6 h1:jMwOlw2AZx9KlfIExLCFjcpM5jxL4huwfhHvRPqrTSI=
-knative.dev/pkg v0.0.0-20210124203454-7101e9d4f6c6/go.mod h1:X4NPrCo8NK3hbDVan9Vm7mf5io3ZoINakAdrpSXVB08=
-knative.dev/pkg v0.0.0-20210125222030-6040b3af4803 h1:L9lY/UztepeiTWys3VyO3Y5wQmYPyYG7eOG9qib6AZY=
-knative.dev/pkg v0.0.0-20210125222030-6040b3af4803/go.mod h1:X4NPrCo8NK3hbDVan9Vm7mf5io3ZoINakAdrpSXVB08=
+knative.dev/networking v0.0.0-20210201021832-342a3fbb8756 h1:1u93ZH+YivqpH9f8awyG0SZ6kwj/0w9optnHeQKUG6g=
+knative.dev/networking v0.0.0-20210201021832-342a3fbb8756/go.mod h1:LFCHSswO9cLifBJtuipVzw4M+nPdvkR1t82U6YJdhCA=
+knative.dev/pkg v0.0.0-20210130001831-ca02ef752ac6 h1:HIACRvhv/4U7vcFTAakfqYJIlENCSGtTrZOwz/q/A00=
+knative.dev/pkg v0.0.0-20210130001831-ca02ef752ac6/go.mod h1:X4NPrCo8NK3hbDVan9Vm7mf5io3ZoINakAdrpSXVB08=
 modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw=
 modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk=
 modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k=
diff --git a/pkg/reconciler/route/resources/ingress.go b/pkg/reconciler/route/resources/ingress.go
index 034fa35fb..ae82e4856 100644
--- a/pkg/reconciler/route/resources/ingress.go
+++ b/pkg/reconciler/route/resources/ingress.go
@@ -313,7 +313,7 @@ func makeBaseIngressPath(ns string, targets traffic.RevisionTargets,
 			splits = append(splits, netv1alpha1.IngressBackendSplit{
 				IngressBackend: netv1alpha1.IngressBackend{
 					ServiceNamespace: ns,
-					ServiceName:      t.ServiceName,
+					ServiceName:      t.RevisionName,
 					// Port on the public service must match port on the activator.
 					// Otherwise, the serverless services can't guarantee seamless positive handoff.
 					ServicePort: intstr.FromInt(networking.ServicePort(t.Protocol)),
diff --git a/pkg/reconciler/route/traffic/traffic.go b/pkg/reconciler/route/traffic/traffic.go
index 3582150c4..8aa03385d 100644
--- a/pkg/reconciler/route/traffic/traffic.go
+++ b/pkg/reconciler/route/traffic/traffic.go
@@ -41,8 +41,7 @@ const DefaultTarget = ""
 // Revision to a flattened TrafficTarget.
 type RevisionTarget struct {
 	v1.TrafficTarget
-	Protocol    net.ProtocolType
-	ServiceName string // Revision service name.
+	Protocol net.ProtocolType
 }
 
 // RevisionTargets is a collection of revision targets.
@@ -364,7 +363,6 @@ func (cb *configBuilder) addConfigurationTarget(tt *v1.TrafficTarget) error {
 	target := RevisionTarget{
 		TrafficTarget: *ntt,
 		Protocol:      rev.GetProtocol(),
-		ServiceName:   rev.Name,
 	}
 	target.TrafficTarget.RevisionName = rev.Name
 	cb.addFlattenedTarget(target)
@@ -383,7 +381,6 @@ func (cb *configBuilder) addRevisionTarget(tt *v1.TrafficTarget) error {
 	target := RevisionTarget{
 		TrafficTarget: *ntt,
 		Protocol:      rev.GetProtocol(),
-		ServiceName:   rev.Name,
 	}
 	if configName, ok := rev.Labels[serving.ConfigurationLabelKey]; ok {
 		target.TrafficTarget.ConfigurationName = configName
diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go
index 75dafbf1b..e71e92dc2 100644
--- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go
+++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/packages.go
@@ -552,6 +552,7 @@ func reconcilerPackages(basePackage string, groupPkgName string, gv clientgentyp
 					schemePkg:           filepath.Join(customArgs.VersionedClientSetPackage, "scheme"),
 					reconcilerClass:     reconcilerClass,
 					hasReconcilerClass:  hasReconcilerClass,
+					hasStatus:           hasStatus(t),
 				})
 				return generators
 			},
@@ -613,6 +614,7 @@ func reconcilerPackages(basePackage string, groupPkgName string, gv clientgentyp
 					hasReconcilerClass: hasReconcilerClass,
 					nonNamespaced:      nonNamespaced,
 					isKRShaped:         isKRShaped,
+					hasStatus:          hasStatus(t),
 				})
 				return generators
 			},
@@ -737,3 +739,12 @@ func versionDuckPackages(basePackage string, groupPkgName string, gv clientgenty
 	}
 	return vers
 }
+
+func hasStatus(t *types.Type) bool {
+	for _, member := range t.Members {
+		if member.Name == "Status" {
+			return true
+		}
+	}
+	return false
+}
diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go
index 0f0f417ec..06d436648 100644
--- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go
+++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_controller.go
@@ -40,6 +40,7 @@ type reconcilerControllerGenerator struct {
 
 	reconcilerClass    string
 	hasReconcilerClass bool
+	hasStatus          bool
 }
 
 var _ generator.Generator = (*reconcilerControllerGenerator)(nil)
@@ -66,10 +67,11 @@ func (g *reconcilerControllerGenerator) GenerateType(c *generator.Context, t *ty
 	klog.V(5).Info("processing type ", t)
 
 	m := map[string]interface{}{
-		"type":     t,
-		"group":    g.groupName,
-		"class":    g.reconcilerClass,
-		"hasClass": g.hasReconcilerClass,
+		"type":      t,
+		"group":     g.groupName,
+		"class":     g.reconcilerClass,
+		"hasClass":  g.hasReconcilerClass,
+		"hasStatus": g.hasStatus,
 		"controllerImpl": c.Universe.Type(types.Name{
 			Package: "knative.dev/pkg/controller",
 			Name:    "Impl",
@@ -264,9 +266,11 @@ func NewImpl(ctx {{.contextContext|raw}}, r Interface{{if .hasClass}}, classValu
 		if opts.AgentName != "" {
 			agentName = opts.AgentName
 		}
+		{{- if .hasStatus}}
 		if opts.SkipStatusUpdates {
 			rec.skipStatusUpdates = true
 		}
+		{{- end}}
 	}
 
 	rec.Recorder = createRecorder(ctx, agentName)
diff --git a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go
index 0c6e3e04e..10149fadd 100644
--- a/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go
+++ b/vendor/knative.dev/pkg/codegen/cmd/injection-gen/generators/reconciler_reconciler.go
@@ -41,6 +41,7 @@ type reconcilerReconcilerGenerator struct {
 	hasReconcilerClass bool
 	nonNamespaced      bool
 	isKRShaped         bool
+	hasStatus          bool
 
 	groupGoName  string
 	groupVersion clientgentypes.GroupVersion
@@ -76,6 +77,7 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty
 		"class":         g.reconcilerClass,
 		"hasClass":      g.hasReconcilerClass,
 		"isKRShaped":    g.isKRShaped,
+		"hasStatus":     g.hasStatus,
 		"nonNamespaced": g.nonNamespaced,
 		"controllerImpl": c.Universe.Type(types.Name{
 			Package: "knative.dev/pkg/controller",
@@ -213,7 +215,9 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty
 	sw.Do(reconcilerInterfaceFactory, m)
 	sw.Do(reconcilerNewReconciler, m)
 	sw.Do(reconcilerImplFactory, m)
-	sw.Do(reconcilerStatusFactory, m)
+	if g.hasStatus {
+		sw.Do(reconcilerStatusFactory, m)
+	}
 	sw.Do(reconcilerFinalizerFactory, m)
 
 	return sw.Error()
@@ -289,9 +293,11 @@ type reconcilerImpl struct {
 	// finalizerName is the name of the finalizer to reconcile.
 	finalizerName string
 
+	{{if .hasStatus}}
 	// skipStatusUpdates configures whether or not this reconciler automatically updates
 	// the status of the reconciled resource.
 	skipStatusUpdates bool
+	{{end}}
 
 	{{if .hasClass}}
 	// classValue is the resource annotation[{{ .class }}] instance value this reconciler instance filters on.
@@ -352,9 +358,11 @@ func NewReconciler(ctx {{.contextContext|raw}}, logger *{{.zapSugaredLogger|raw}
 		if opts.FinalizerName != "" {
 			rec.finalizerName = opts.FinalizerName
 		}
+		{{- if .hasStatus}}
 		if opts.SkipStatusUpdates {
 			rec.skipStatusUpdates = true
 		}
+		{{- end}}
 	}
 
 	return rec
@@ -460,6 +468,7 @@ func (r *reconcilerImpl) Reconcile(ctx {{.contextContext|raw}}, key string) erro
 
 	}
 
+	{{if .hasStatus}}
 	// Synchronize the status.
 	switch {
 	case r.skipStatusUpdates:
@@ -482,6 +491,7 @@ func (r *reconcilerImpl) Reconcile(ctx {{.contextContext|raw}}, key string) erro
 			return err
 		}
 	}
+	{{end}}
 
 	// Report the reconciler event, if any.
 	if reconcileEvent != nil {
diff --git a/vendor/knative.dev/pkg/hack/update-codegen.sh b/vendor/knative.dev/pkg/hack/update-codegen.sh
index 8ba165d1e..5f6df7e28 100644
--- a/vendor/knative.dev/pkg/hack/update-codegen.sh
+++ b/vendor/knative.dev/pkg/hack/update-codegen.sh
@@ -49,7 +49,7 @@ EXTERNAL_INFORMER_PKG="k8s.io/client-go/informers" \
     k8s.io/api \
     "admissionregistration:v1beta1,v1 apps:v1 autoscaling:v1,v2beta1 batch:v1,v1beta1 core:v1 rbac:v1 coordination:v1" \
     --go-header-file ${REPO_ROOT_DIR}/hack/boilerplate/boilerplate.go.txt \
-    --force-genreconciler-kinds "Namespace,Deployment"
+    --force-genreconciler-kinds "Namespace,Deployment,Secret"
 
 OUTPUT_PKG="knative.dev/pkg/client/injection/apiextensions" \
 VERSIONED_CLIENTSET_PKG="k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" \
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 571c31cdc..4e8660ce0 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1004,7 +1004,7 @@ k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/caching v0.0.0-20210125050654-45e8de7ff96e
+# knative.dev/caching v0.0.0-20210201195732-f8bed817dad1
 ## explicit
 knative.dev/caching/config
 knative.dev/caching/pkg/apis/caching
@@ -1029,7 +1029,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
 ## explicit
 knative.dev/hack
 knative.dev/hack/shell
-# knative.dev/networking v0.0.0-20210125050654-94433ab7f620
+# knative.dev/networking v0.0.0-20210201021832-342a3fbb8756
 ## explicit
 knative.dev/networking/config
 knative.dev/networking/pkg
@@ -1063,7 +1063,7 @@ knative.dev/networking/test/conformance/ingress
 knative.dev/networking/test/defaultsystem
 knative.dev/networking/test/test_images/grpc-ping/proto
 knative.dev/networking/test/types
-# knative.dev/pkg v0.0.0-20210125222030-6040b3af4803
+# knative.dev/pkg v0.0.0-20210130001831-ca02ef752ac6
 ## explicit
 knative.dev/pkg/apiextensions/storageversion
 knative.dev/pkg/apiextensions/storageversion/cmd/migrate


Test patch:
diff --git a/pkg/reconciler/route/resources/ingress_test.go b/pkg/reconciler/route/resources/ingress_test.go
index 110d5e0c7..2a302fca1 100644
--- a/pkg/reconciler/route/resources/ingress_test.go
+++ b/pkg/reconciler/route/resources/ingress_test.go
@@ -107,7 +107,6 @@ func TestMakeIngressWithTaggedRollout(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					RevisionName:      "thor-02020",
 				},
-				ServiceName: "hammer",
 			}},
 			traffic.DefaultTarget: {{
 				TrafficTarget: v1.TrafficTarget{
@@ -116,7 +115,6 @@ func TestMakeIngressWithTaggedRollout(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					RevisionName:      "valhalla-01982",
 				},
-				ServiceName: "mia",
 			}},
 		},
 	}
@@ -206,7 +204,6 @@ func TestMakeIngressWithActualRollout(t *testing.T) {
 					Percent:           ptr.Int64(80),
 					RevisionName:      "thor-02020",
 				},
-				ServiceName: "thor-02020",
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: "thor",
@@ -214,7 +211,6 @@ func TestMakeIngressWithActualRollout(t *testing.T) {
 					Percent:           ptr.Int64(20),
 					RevisionName:      "thor-beta",
 				},
-				ServiceName: "thor-beta",
 			}},
 			traffic.DefaultTarget: {{
 				TrafficTarget: v1.TrafficTarget{
@@ -223,7 +219,6 @@ func TestMakeIngressWithActualRollout(t *testing.T) {
 					Percent:           ptr.Int64(1),
 					RevisionName:      "rune-01911",
 				},
-				ServiceName: "rune-01911",
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: "valhalla",
@@ -231,7 +226,6 @@ func TestMakeIngressWithActualRollout(t *testing.T) {
 					Percent:           ptr.Int64(99),
 					RevisionName:      "valhalla-01982",
 				},
-				ServiceName: "valhalla-01982",
 			}},
 		},
 	}
@@ -487,7 +481,6 @@ func TestMakeIngressSpecCorrectRules(t *testing.T) {
 				RevisionName:      "v2",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "gilberto",
 		}},
 		"v1": {{
 			TrafficTarget: v1.TrafficTarget{
@@ -495,7 +488,6 @@ func TestMakeIngressSpecCorrectRules(t *testing.T) {
 				RevisionName:      "v1",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "jobim",
 		}},
 	}
 
@@ -512,7 +504,7 @@ func TestMakeIngressSpecCorrectRules(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "gilberto",
+						ServiceName:      "v2",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -533,7 +525,7 @@ func TestMakeIngressSpecCorrectRules(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "gilberto",
+						ServiceName:      "v2",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -556,7 +548,7 @@ func TestMakeIngressSpecCorrectRules(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "jobim",
+						ServiceName:      "v1",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -577,7 +569,7 @@ func TestMakeIngressSpecCorrectRules(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "jobim",
+						ServiceName:      "v1",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -620,7 +612,6 @@ func TestMakeIngressSpecCorrectRuleVisibility(t *testing.T) {
 					RevisionName:      "v2",
 					Percent:           ptr.Int64(100),
 				},
-				ServiceName: "gilberto",
 			}},
 		},
 		expectedVisibility: map[netv1alpha1.IngressVisibility][]string{
@@ -637,7 +628,6 @@ func TestMakeIngressSpecCorrectRuleVisibility(t *testing.T) {
 					RevisionName:      "v2",
 					Percent:           ptr.Int64(100),
 				},
-				ServiceName: "gilberto",
 			}},
 		},
 		serviceVisibility: map[string]netv1alpha1.IngressVisibility{
@@ -656,7 +646,6 @@ func TestMakeIngressSpecCorrectRuleVisibility(t *testing.T) {
 					RevisionName:      "v2",
 					Percent:           ptr.Int64(100),
 				},
-				ServiceName: "gilberto",
 			}},
 		},
 		expectedVisibility: map[netv1alpha1.IngressVisibility][]string{
@@ -696,7 +685,6 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				RevisionName:      "v2",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "gilberto",
 		}},
 		"v1": {{
 			TrafficTarget: v1.TrafficTarget{
@@ -704,7 +692,6 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				RevisionName:      "v1",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "jobim",
 		}},
 	}
 
@@ -726,7 +713,7 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "jobim",
+						ServiceName:      "v1",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -742,7 +729,7 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "gilberto",
+						ServiceName:      "v2",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -768,7 +755,7 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "jobim",
+						ServiceName:      "v1",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -784,7 +771,7 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "gilberto",
+						ServiceName:      "v2",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -810,7 +797,7 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "jobim",
+						ServiceName:      "v1",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -834,7 +821,7 @@ func TestMakeIngressSpecCorrectRulesWithTagBasedRouting(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "jobim",
+						ServiceName:      "v1",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -869,10 +856,9 @@ func TestMakeIngressRuleVanilla(t *testing.T) {
 	targets := traffic.RevisionTargets{{
 		TrafficTarget: v1.TrafficTarget{
 			ConfigurationName: "config",
-			RevisionName:      "revision",
+			RevisionName:      "revision-shark",
 			Percent:           ptr.Int64(100),
 		},
-		ServiceName: "chocolate",
 	}}
 	tc := &traffic.Config{
 		Targets: map[string]traffic.RevisionTargets{
@@ -892,12 +878,12 @@ func TestMakeIngressRuleVanilla(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "chocolate",
+						ServiceName:      "revision-shark",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
 					AppendHeaders: map[string]string{
-						"Knative-Serving-Revision":  "revision",
+						"Knative-Serving-Revision":  "revision-shark",
 						"Knative-Serving-Namespace": ns,
 					},
 				}},
@@ -916,14 +902,13 @@ func TestMakeIngressRuleZeroPercentTarget(t *testing.T) {
 	targets := []traffic.RevisionTarget{{
 		TrafficTarget: v1.TrafficTarget{
 			ConfigurationName: "config",
-			RevisionName:      "revision",
+			RevisionName:      "revision-dolphin",
 			Percent:           ptr.Int64(100),
 		},
-		ServiceName: "active-target",
 	}, {
 		TrafficTarget: v1.TrafficTarget{
 			ConfigurationName: "new-config",
-			RevisionName:      "new-revision",
+			RevisionName:      "new-revision-orca",
 			Percent:           ptr.Int64(0),
 		},
 	}}
@@ -943,12 +928,12 @@ func TestMakeIngressRuleZeroPercentTarget(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "active-target",
+						ServiceName:      "revision-dolphin",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
 					AppendHeaders: map[string]string{
-						"Knative-Serving-Revision":  "revision",
+						"Knative-Serving-Revision":  "revision-dolphin",
 						"Knative-Serving-Namespace": ns,
 					},
 				}},
@@ -967,17 +952,15 @@ func TestMakeIngressRuleTwoTargets(t *testing.T) {
 	targets := []traffic.RevisionTarget{{
 		TrafficTarget: v1.TrafficTarget{
 			ConfigurationName: "config",
-			RevisionName:      "revision",
+			RevisionName:      "revision-beluga",
 			Percent:           ptr.Int64(80),
 		},
-		ServiceName: "nigh",
 	}, {
 		TrafficTarget: v1.TrafficTarget{
 			ConfigurationName: "new-config",
-			RevisionName:      "new-revision",
+			RevisionName:      "new-revision-narwhal",
 			Percent:           ptr.Int64(20),
 		},
-		ServiceName: "death",
 	}}
 	tc := &traffic.Config{
 		Targets: map[string]traffic.RevisionTargets{
@@ -995,24 +978,24 @@ func TestMakeIngressRuleTwoTargets(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "nigh",
+						ServiceName:      "revision-beluga",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 80,
 					AppendHeaders: map[string]string{
 						"Knative-Serving-Namespace": ns,
-						"Knative-Serving-Revision":  "revision",
+						"Knative-Serving-Revision":  "revision-beluga",
 					},
 				}, {
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: ns,
-						ServiceName:      "death",
+						ServiceName:      "new-revision-narwhal",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 20,
 					AppendHeaders: map[string]string{
 						"Knative-Serving-Namespace": ns,
-						"Knative-Serving-Revision":  "new-revision",
+						"Knative-Serving-Revision":  "new-revision-narwhal",
 					},
 				}},
 			}},
@@ -1093,7 +1076,6 @@ func TestMakeIngressACMEChallenges(t *testing.T) {
 				RevisionName:      "v2",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "gilberto",
 		}},
 	}
 
@@ -1135,7 +1117,7 @@ func TestMakeIngressACMEChallenges(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: "test-ns",
-						ServiceName:      "gilberto",
+						ServiceName:      "v2",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -1165,7 +1147,7 @@ func TestMakeIngressACMEChallenges(t *testing.T) {
 				Splits: []netv1alpha1.IngressBackendSplit{{
 					IngressBackend: netv1alpha1.IngressBackend{
 						ServiceNamespace: "test-ns",
-						ServiceName:      "gilberto",
+						ServiceName:      "v2",
 						ServicePort:      intstr.FromInt(80),
 					},
 					Percent: 100,
@@ -1201,7 +1183,6 @@ func TestMakeIngressFailToGenerateDomain(t *testing.T) {
 				RevisionName:      "v2",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "gilberto",
 		}},
 	}
 
@@ -1232,7 +1213,6 @@ func TestMakeIngressFailToGenerateTagHost(t *testing.T) {
 				RevisionName:      "v2",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "gilberto",
 		}},
 		"v1": {{
 			TrafficTarget: v1.TrafficTarget{
@@ -1240,7 +1220,6 @@ func TestMakeIngressFailToGenerateTagHost(t *testing.T) {
 				RevisionName:      "v1",
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: "jobim",
 		}},
 	}
 
diff --git a/pkg/reconciler/route/table_test.go b/pkg/reconciler/route/table_test.go
index 530e7dd25..670647d6b 100644
--- a/pkg/reconciler/route/table_test.go
+++ b/pkg/reconciler/route/table_test.go
@@ -153,7 +153,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								RevisionName:      "ing-unknown-00001",
 							},
-							ServiceName: "ing-unknown-00001",
 						}},
 					},
 				},
@@ -200,7 +199,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				}, WithLoadbalancerFailed("TestFailure", "failure"),
@@ -249,7 +247,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -303,7 +300,6 @@ func TestReconcile(t *testing.T) {
 								LatestRevision:    ptr.Bool(true),
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 					Visibility: map[string]netv1alpha1.IngressVisibility{
@@ -355,7 +351,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -504,7 +499,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -537,7 +531,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				}),
@@ -634,7 +627,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -694,7 +686,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -772,7 +763,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -792,7 +782,6 @@ func TestReconcile(t *testing.T) {
 								LatestRevision:    ptr.Bool(true),
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -829,7 +818,6 @@ func TestReconcile(t *testing.T) {
 								LatestRevision:    ptr.Bool(true),
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -868,7 +856,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -889,7 +876,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName: "config-00002",
 								Percent:      ptr.Int64(100),
 							},
-							ServiceName: "config-00002",
 						}},
 					},
 				},
@@ -956,7 +942,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -977,7 +962,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName: "config-00002",
 								Percent:      ptr.Int64(100),
 							},
-							ServiceName: "config-00002",
 						}},
 					},
 				}),
@@ -1013,7 +997,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1036,7 +1019,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 					Visibility: map[string]netv1alpha1.IngressVisibility{
@@ -1079,7 +1061,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 					Visibility: map[string]netv1alpha1.IngressVisibility{
@@ -1103,7 +1084,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1156,7 +1136,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1176,7 +1155,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName: "config-00002",
 								Percent:      ptr.Int64(100),
 							},
-							ServiceName: "config-00002",
 						}},
 					},
 				}),
@@ -1223,7 +1201,6 @@ func TestReconcile(t *testing.T) {
 								LatestRevision:    ptr.Bool(true),
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1268,7 +1245,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1314,7 +1290,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1355,7 +1330,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1393,7 +1367,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName: "config-00001",
 								Percent:      ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1412,7 +1385,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1485,7 +1457,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName: "config-00001",
 								Percent:      ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -1541,7 +1512,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(50),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "blue-00001",
 						}, {
 							TrafficTarget: v1.TrafficTarget{
 								ConfigurationName: "green",
@@ -1549,7 +1519,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(50),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "green-00001",
 						}},
 					},
 				},
@@ -1637,7 +1606,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "gray-00001",
 						}},
 						"gray": {{
 							TrafficTarget: v1.TrafficTarget{
@@ -1646,14 +1614,12 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "gray-00001",
 						}},
 						"also-gray": {{
 							TrafficTarget: v1.TrafficTarget{
 								RevisionName: "gray-00001",
 								Percent:      ptr.Int64(100),
 							},
-							ServiceName: "gray-00001",
 						}},
 					},
 				},
@@ -1785,7 +1751,6 @@ func TestReconcile(t *testing.T) {
 								Percent:           ptr.Int64(100),
 								LatestRevision:    ptr.Bool(true),
 							},
-							ServiceName: "blue-00001",
 						}},
 					},
 				},
@@ -1804,7 +1769,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "green-02020",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "green-02020",
 						}},
 					},
 				},
@@ -1906,7 +1870,6 @@ func TestReconcile(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2018,7 +1981,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2074,7 +2036,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2127,7 +2088,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2203,7 +2163,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2294,7 +2253,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2425,7 +2383,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				}, nil, nil),
@@ -2479,7 +2436,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				},
@@ -2502,7 +2458,6 @@ func TestReconcileEnableAutoTLS(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 					Visibility: map[string]netv1alpha1.IngressVisibility{
@@ -2608,7 +2563,6 @@ func TestReconcileEnableAutoTLSHTTPDisabled(t *testing.T) {
 								RevisionName:      "config-00001",
 								Percent:           ptr.Int64(100),
 							},
-							ServiceName: "config-00001",
 						}},
 					},
 				}, nil, nil),
diff --git a/pkg/reconciler/route/traffic/traffic_test.go b/pkg/reconciler/route/traffic/traffic_test.go
index fcc1fa6cc..f96fefdbe 100644
--- a/pkg/reconciler/route/traffic/traffic_test.go
+++ b/pkg/reconciler/route/traffic/traffic_test.go
@@ -151,8 +151,7 @@ func TestBuildTrafficConfigurationVanilla(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				Protocol:    net.ProtocolH2C,
-				ServiceName: goodNewRev.Name,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -162,8 +161,7 @@ func TestBuildTrafficConfigurationVanilla(t *testing.T) {
 				Percent:           ptr.Int64(100),
 				LatestRevision:    ptr.Bool(true),
 			},
-			Protocol:    net.ProtocolH2C,
-			ServiceName: goodNewRev.Name,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -214,8 +212,7 @@ func TestBuildTrafficConfigurationNoNameRevision(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -225,8 +222,7 @@ func TestBuildTrafficConfigurationNoNameRevision(t *testing.T) {
 				Percent:           ptr.Int64(100),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{goodConfig.Name: goodConfig},
 		Revisions:      map[string]*v1.Revision{goodNewRev.Name: goodNewRev},
@@ -253,8 +249,7 @@ func TestBuildTrafficConfigurationVanillaScaledToZero(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: inactiveRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -264,8 +259,7 @@ func TestBuildTrafficConfigurationVanillaScaledToZero(t *testing.T) {
 				Percent:           ptr.Int64(100),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: inactiveRev.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			inactiveConfig.Name: inactiveConfig,
@@ -310,8 +304,7 @@ func TestBuildTrafficConfigurationTwoConfigs(t *testing.T) {
 					Percent:           ptr.Int64(90),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: goodConfig.Name,
@@ -319,8 +312,7 @@ func TestBuildTrafficConfigurationTwoConfigs(t *testing.T) {
 					Percent:           ptr.Int64(10),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -330,8 +322,7 @@ func TestBuildTrafficConfigurationTwoConfigs(t *testing.T) {
 				Percent:           ptr.Int64(90),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: goodConfig.Name,
@@ -339,8 +330,7 @@ func TestBuildTrafficConfigurationTwoConfigs(t *testing.T) {
 				Percent:           ptr.Int64(10),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -374,8 +364,7 @@ func TestBuildTrafficConfigurationTwoEntriesSameConfig(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -385,8 +374,7 @@ func TestBuildTrafficConfigurationTwoEntriesSameConfig(t *testing.T) {
 				Percent:           ptr.Int64(100),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			niceConfig.Name: niceConfig,
@@ -461,8 +449,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 					Percent:           ptr.Int64(30),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: goodConfig.Name,
@@ -471,8 +458,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 					LatestRevision:    ptr.Bool(true),
 					Tag:               "robert",
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: inactiveConfig.Name,
@@ -481,8 +467,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 					LatestRevision:    ptr.Bool(true),
 					Tag:               "jackson",
 				},
-				ServiceName: inactiveRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}},
 			"robert": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -492,8 +477,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 					Tag:               "robert",
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 			"jackson": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -503,8 +487,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 					Tag:               "jackson",
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: inactiveRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -514,8 +497,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 				Percent:           ptr.Int64(30),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: goodConfig.Name,
@@ -524,8 +506,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 				LatestRevision:    ptr.Bool(true),
 				Tag:               "robert",
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: inactiveConfig.Name,
@@ -534,8 +515,7 @@ func TestBuildTrafficConfigThreeConfigs(t *testing.T) {
 				LatestRevision:    ptr.Bool(true),
 				Tag:               "jackson",
 			},
-			ServiceName: inactiveRev.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			niceConfig.Name:     niceConfig,
@@ -625,8 +605,7 @@ func TestBuildTrafficConfigurationTwoEntriesSameConfigDifferentTags(t *testing.T
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 			"robert": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -636,8 +615,7 @@ func TestBuildTrafficConfigurationTwoEntriesSameConfigDifferentTags(t *testing.T
 					Tag:               "robert",
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -647,8 +625,7 @@ func TestBuildTrafficConfigurationTwoEntriesSameConfigDifferentTags(t *testing.T
 				Percent:           ptr.Int64(90),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: niceConfig.Name,
@@ -657,8 +634,7 @@ func TestBuildTrafficConfigurationTwoEntriesSameConfigDifferentTags(t *testing.T
 				LatestRevision:    ptr.Bool(true),
 				Tag:               "robert",
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			niceConfig.Name: niceConfig,
@@ -718,8 +694,7 @@ func TestBuildTrafficConfigurationCanary(t *testing.T) {
 					Percent:           ptr.Int64(90),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodOldRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: goodConfig.Name,
@@ -727,8 +702,7 @@ func TestBuildTrafficConfigurationCanary(t *testing.T) {
 					Percent:           ptr.Int64(10),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -738,8 +712,7 @@ func TestBuildTrafficConfigurationCanary(t *testing.T) {
 				Percent:           ptr.Int64(90),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodOldRev.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: goodConfig.Name,
@@ -747,8 +720,7 @@ func TestBuildTrafficConfigurationCanary(t *testing.T) {
 				Percent:           ptr.Int64(10),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -800,8 +772,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 					Percent:           ptr.Int64(49),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodOldRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					Tag:               "two",
@@ -810,8 +781,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 					Percent:           ptr.Int64(51),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 			"one": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -821,8 +791,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodOldRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}},
 			"two": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -832,8 +801,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 			"also-two": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -843,8 +811,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -855,8 +822,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 				Percent:           ptr.Int64(49),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodOldRev.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				Tag:               "two",
@@ -865,8 +831,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 				Percent:           ptr.Int64(50),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				Tag:               "also-two",
@@ -875,8 +840,7 @@ func TestBuildTrafficConfigurationConsolidated(t *testing.T) {
 				Percent:           ptr.Int64(1),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -916,8 +880,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisions(t *testing.T) {
 					Percent:           ptr.Int64(90),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodOldRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: goodConfig.Name,
@@ -925,8 +888,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisions(t *testing.T) {
 					Percent:           ptr.Int64(10),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -936,8 +898,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisions(t *testing.T) {
 				Percent:           ptr.Int64(90),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodOldRev.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: goodConfig.Name,
@@ -945,8 +906,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisions(t *testing.T) {
 				Percent:           ptr.Int64(10),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -988,8 +948,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisionsFromTwoConfigurations(t *test
 					Percent:           ptr.Int64(40),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: niceConfig.Name,
@@ -997,8 +956,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisionsFromTwoConfigurations(t *test
 					Percent:           ptr.Int64(60),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -1008,8 +966,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisionsFromTwoConfigurations(t *test
 				Percent:           ptr.Int64(40),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: niceConfig.Name,
@@ -1017,8 +974,7 @@ func TestBuildTrafficConfigurationTwoFixedRevisionsFromTwoConfigurations(t *test
 				Percent:           ptr.Int64(60),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -1053,8 +1009,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodOldRev.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					Tag:               "beta",
@@ -1063,8 +1018,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 					LatestRevision:    ptr.Bool(false),
 					Percent:           ptr.Int64(0),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					Tag:               "alpha",
@@ -1073,8 +1027,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 					Percent:           ptr.Int64(0),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 			"beta": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -1084,8 +1037,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(false),
 				},
-				ServiceName: goodNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 			"alpha": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -1095,8 +1047,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -1106,8 +1057,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 				Percent:           ptr.Int64(100),
 				LatestRevision:    ptr.Bool(false),
 			},
-			ServiceName: goodOldRev.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				Tag:               "beta",
@@ -1116,8 +1066,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 				LatestRevision:    ptr.Bool(false),
 				Percent:           ptr.Int64(0),
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				Tag:               "alpha",
@@ -1126,8 +1075,7 @@ func TestBuildTrafficConfigurationPreliminary(t *testing.T) {
 				LatestRevision:    ptr.Bool(true),
 				Percent:           ptr.Int64(0),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			goodConfig.Name: goodConfig,
@@ -1219,8 +1167,7 @@ func TestBuildTrafficConfigurationReadyNotReadyConfig(t *testing.T) {
 					LatestRevision:    ptr.Bool(true),
 					Percent:           ptr.Int64(100),
 				},
-				ServiceName: readyRevision.Name,
-				Protocol:    net.ProtocolHTTP1,
+				Protocol: net.ProtocolHTTP1,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -1230,8 +1177,7 @@ func TestBuildTrafficConfigurationReadyNotReadyConfig(t *testing.T) {
 				LatestRevision:    ptr.Bool(true),
 				Percent:           ptr.Int64(100),
 			},
-			ServiceName: readyRevision.Name,
-			Protocol:    net.ProtocolHTTP1,
+			Protocol: net.ProtocolHTTP1,
 		}},
 		Revisions: map[string]*v1.Revision{
 			readyRevision.Name: readyRevision,
@@ -1638,8 +1584,7 @@ func TestBuildTrafficConfigurationTag0Percent(t *testing.T) {
 					Percent:           ptr.Int64(100),
 					LatestRevision:    ptr.Bool(true),
 				},
-				ServiceName: niceNewRev.Name,
-				Protocol:    net.ProtocolH2C,
+				Protocol: net.ProtocolH2C,
 			}, {
 				TrafficTarget: v1.TrafficTarget{
 					ConfigurationName: goodConfig.Name,
@@ -1648,8 +1593,7 @@ func TestBuildTrafficConfigurationTag0Percent(t *testing.T) {
 					LatestRevision:    ptr.Bool(true),
 					Tag:               "robert",
 				},
-				Protocol:    net.ProtocolH2C,
-				ServiceName: goodNewRev.Name,
+				Protocol: net.ProtocolH2C,
 			}},
 			"robert": {{
 				TrafficTarget: v1.TrafficTarget{
@@ -1659,8 +1603,7 @@ func TestBuildTrafficConfigurationTag0Percent(t *testing.T) {
 					Tag:               "robert",
 					LatestRevision:    ptr.Bool(true),
 				},
-				Protocol:    net.ProtocolH2C,
-				ServiceName: goodNewRev.Name,
+				Protocol: net.ProtocolH2C,
 			}},
 		},
 		revisionTargets: []RevisionTarget{{
@@ -1670,8 +1613,7 @@ func TestBuildTrafficConfigurationTag0Percent(t *testing.T) {
 				Percent:           ptr.Int64(100),
 				LatestRevision:    ptr.Bool(true),
 			},
-			ServiceName: niceNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}, {
 			TrafficTarget: v1.TrafficTarget{
 				ConfigurationName: goodConfig.Name,
@@ -1680,8 +1622,7 @@ func TestBuildTrafficConfigurationTag0Percent(t *testing.T) {
 				LatestRevision:    ptr.Bool(true),
 				Tag:               "robert",
 			},
-			ServiceName: goodNewRev.Name,
-			Protocol:    net.ProtocolH2C,
+			Protocol: net.ProtocolH2C,
 		}},
 		Configurations: map[string]*v1.Configuration{
 			niceConfig.Name: niceConfig,
diff --git a/pkg/testing/v1/revision.go b/pkg/testing/v1/revision.go
index 5db2740c1..ac9b9cc51 100644
--- a/pkg/testing/v1/revision.go
+++ b/pkg/testing/v1/revision.go
@@ -49,13 +49,6 @@ func WithRevName(name string) RevisionOption {
 	}
 }
 
-// WithServiceName propagates the given service name to the revision status.
-func WithServiceName(sn string) RevisionOption {
-	return func(rev *v1.Revision) {
-		rev.Status.ServiceName = sn
-	}
-}
-
 // MarkResourceNotOwned calls the function of the same name on the Revision's status.
 func MarkResourceNotOwned(kind, name string) RevisionOption {
 	return func(rev *v1.Revision) {
diff --git a/test/conformance/api/v1/route_test.go b/test/conformance/api/v1/route_test.go
index a1eba289e..521a3815d 100644
--- a/test/conformance/api/v1/route_test.go
+++ b/test/conformance/api/v1/route_test.go
@@ -26,10 +26,9 @@ import (
 	pkgTest "knative.dev/pkg/test"
 	"knative.dev/pkg/test/spoof"
 	v1 "knative.dev/serving/pkg/apis/serving/v1"
+	rtesting "knative.dev/serving/pkg/testing/v1"
 	"knative.dev/serving/test"
 	v1test "knative.dev/serving/test/v1"
-
-	rtesting "knative.dev/serving/pkg/testing/v1"
 )
 
 func assertResourcesUpdatedWhenRevisionIsReady(t *testing.T, clients *test.Clients, names test.ResourceNames, url *url.URL, expectedGeneration, expectedText string) {
@@ -144,7 +143,7 @@ func TestRouteCreation(t *testing.T) {
 	defer test.AssertProberDefault(t, prober)
 
 	t.Log("Updating the Configuration to use a different image")
-	objects.Config, err = v1test.PatchConfig(t, clients, objects.Config, rtesting.WithConfigImage(pkgTest.ImagePath(test.PizzaPlanet2)))
+	objects.Config, err = v1test.PatchConfig(t, clients, objects.Config, withConfigImage(pkgTest.ImagePath(test.PizzaPlanet2)))
 	if err != nil {
 		t.Fatalf("Patch update for Configuration %s with new image %s failed: %v", names.Config, test.PizzaPlanet2, err)
 	}
@@ -157,3 +156,10 @@ func TestRouteCreation(t *testing.T) {
 
 	assertResourcesUpdatedWhenRevisionIsReady(t, clients, names, url, "2", test.PizzaPlanetText2)
 }
+
+// withConfigImage sets the container image to be the provided string.
+func withConfigImage(img string) rtesting.ConfigOption {
+	return func(cfg *v1.Configuration) {
+		cfg.Spec.Template.Spec.Containers[0].Image = img
+	}
+}
diff --git a/test/v1/service.go b/test/v1/service.go
index 4415ec9cb..f229884ba 100644
--- a/test/v1/service.go
+++ b/test/v1/service.go
@@ -192,17 +192,14 @@ func WaitForServiceLatestRevision(clients *test.Clients, names test.ResourceName
 			revisionName = s.Status.LatestCreatedRevisionName
 			// Without this it might happen that the latest created revision is later overridden by a newer one
 			// and the following check for LatestReadyRevisionName would fail.
-			if revErr := CheckRevisionState(clients.ServingClient, revisionName, IsRevisionRoutingActive); revErr != nil {
-				return false, nil
-			}
-			return true, nil
+			return CheckRevisionState(clients.ServingClient, revisionName, IsRevisionRoutingActive) == nil, nil
 		}
 		return false, nil
 	}, "ServiceUpdatedWithRevision"); err != nil {
 		return "", fmt.Errorf("LatestCreatedRevisionName not updated: %w", err)
 	}
 	if err := WaitForServiceState(clients.ServingClient, names.Service, func(s *v1.Service) (bool, error) {
-		return (s.Status.LatestReadyRevisionName == revisionName), nil
+		return s.Status.LatestReadyRevisionName == revisionName, nil
 	}, "ServiceReadyWithRevision"); err != nil {
 		return "", fmt.Errorf("LatestReadyRevisionName not updated with %s: %w", revisionName, err)
 	}