Repository: knative/serving
Pull request #10669 (2021-02-01 21:48:31)

Remove the service name from the internal traffic target object.
Now that everything else is using revision name as private service name
there is no reason to have this field.

/assign @tcnghia @dprotaso 
For #10540

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

This pull-request has been approved by: *<a href="https://github.com/knative/serving/pull/10669#" 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/reconciler/route/OWNERS](https://github.com/knative/serving/blob/master/pkg/reconciler/route/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":[]} -->
codecov[bot]: # [Codecov](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=h1) Report
> Merging [#10669](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=desc) (e7631d4) into [master](https://codecov.io/gh/knative/serving/commit/1901e4caa76258232c82a18ce1529a02f5b7c9d0?el=desc) (1901e4c) will **increase** coverage by `0.05%`.
> The diff coverage is `100.00%`.

[![Impacted file tree graph](https://codecov.io/gh/knative/serving/pull/10669/graphs/tree.svg?width=650&height=150&src=pr&token=MPpDfAj4Ui)](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=tree)

```diff
@@            Coverage Diff             @@
##           master   #10669      +/-   ##
==========================================
+ Coverage   88.11%   88.16%   +0.05%     
==========================================
  Files         186      186              
  Lines        8892     8890       -2     
==========================================
+ Hits         7835     7838       +3     
+ Misses        814      811       -3     
+ Partials      243      241       -2     
```


| [Impacted Files](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [pkg/reconciler/route/traffic/traffic.go](https://codecov.io/gh/knative/serving/pull/10669/diff?src=pr&el=tree#diff-cGtnL3JlY29uY2lsZXIvcm91dGUvdHJhZmZpYy90cmFmZmljLmdv) | `93.00% <ø> (-0.07%)` | :arrow_down: |
| [pkg/reconciler/route/resources/ingress.go](https://codecov.io/gh/knative/serving/pull/10669/diff?src=pr&el=tree#diff-cGtnL3JlY29uY2lsZXIvcm91dGUvcmVzb3VyY2VzL2luZ3Jlc3MuZ28=) | `96.02% <100.00%> (ø)` | |
| [pkg/activator/net/revision\_backends.go](https://codecov.io/gh/knative/serving/pull/10669/diff?src=pr&el=tree#diff-cGtnL2FjdGl2YXRvci9uZXQvcmV2aXNpb25fYmFja2VuZHMuZ28=) | `91.32% <0.00%> (+0.91%)` | :arrow_up: |
| [pkg/reconciler/configuration/configuration.go](https://codecov.io/gh/knative/serving/pull/10669/diff?src=pr&el=tree#diff-cGtnL3JlY29uY2lsZXIvY29uZmlndXJhdGlvbi9jb25maWd1cmF0aW9uLmdv) | `86.71% <0.00%> (+2.34%)` | :arrow_up: |

------

[Continue to review full report at Codecov](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=footer). Last update [1901e4c...e7631d4](https://codecov.io/gh/knative/serving/pull/10669?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).

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

This pull-request has been approved by: *<a href="https://github.com/knative/serving/pull/10669#pullrequestreview-580815761" title="LGTM">tcnghia</a>*, *<a href="https://github.com/knative/serving/pull/10669#" 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/reconciler/route/OWNERS](https://github.com/knative/serving/blob/master/pkg/reconciler/route/OWNERS)~~ [tcnghia,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/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


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,