Repository: knative/serving
Pull request #10366 (2020-12-14 21:33:56)

Only upload the kail log file when the e2e test flow fails
<!-- Please include the 'why' behind your changes if no issue exists -->
## Proposed Changes

Only upload the kail log file when the e2e test flow fails:

* The log file produced by `kail` for one Prow e2e test job is now >2GB (see one example [here](https://pantheon.corp.google.com/storage/browser/knative-prow/pr-logs/pull/knative_serving/10365/pull-knative-serving-istio-stable-no-mesh/1338582402011762688/artifacts/5847d45a-3e4b-11eb-8fee-f23821ec9c13?pageState=(%22StorageObjectListTable%22:(%22f%22:%22%255B%255D%22))&prefix=&forceOnObjectsSortingFiltering=false)), that means we can easily produced >1TB logs for only serving within a few days... This is quite unreasonable waste of resources , and I doubt people will download the log files and check it in detail on their local machine. 

**Release Note**

<!-- Enter your extended release note in the below block. If the PR requires
additional action from users switching to the new release, include the string
"action required". If no release note is required, write "NONE". -->

```release-note
NONE
```

knative-prow-robot: @chizhg: GitHub didn't allow me to request PR reviews from the following users: chizhg.

Note that only [knative members](https://github.com/orgs/knative/people) and repo collaborators can review this PR, and authors cannot review their own PRs.

<details>

In response to [this](https://github.com/knative/serving/pull/10366):

>Fixes #
>
><!-- Please include the 'why' behind your changes if no issue exists -->
>## Proposed Changes
>
>*
>*
>*
>
>**Release Note**
>
><!-- Enter your extended release note in the below block. If the PR requires
>additional action from users switching to the new release, include the string
>"action required". If no release note is required, write "NONE". -->
>
>```release-note
>
>```
>
>/cc


Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
</details>
knative-prow-robot: [APPROVALNOTIFIER] This PR is **APPROVED**

This pull-request has been approved by: *<a href="https://github.com/knative/serving/pull/10366#" title="Author self-approved">chizhg</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:

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

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/10366?src=pr&el=h1) Report
> Merging [#10366](https://codecov.io/gh/knative/serving/pull/10366?src=pr&el=desc) (838d2ff) into [master](https://codecov.io/gh/knative/serving/commit/00a08be100977249cee97ccc70490b5b19e0da49?el=desc) (00a08be) will **not change** coverage.
> The diff coverage is `n/a`.

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

```diff
@@           Coverage Diff           @@
##           master   #10366   +/-   ##
=======================================
  Coverage   88.02%   88.02%           
=======================================
  Files         186      186           
  Lines        8712     8712           
=======================================
  Hits         7669     7669           
  Misses        806      806           
  Partials      237      237           
```


| [Impacted Files](https://codecov.io/gh/knative/serving/pull/10366?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [pkg/autoscaler/statforwarder/forwarder.go](https://codecov.io/gh/knative/serving/pull/10366/diff?src=pr&el=tree#diff-cGtnL2F1dG9zY2FsZXIvc3RhdGZvcndhcmRlci9mb3J3YXJkZXIuZ28=) | `90.74% <0.00%> (-5.56%)` | :arrow_down: |
| [pkg/autoscaler/statforwarder/processor.go](https://codecov.io/gh/knative/serving/pull/10366/diff?src=pr&el=tree#diff-cGtnL2F1dG9zY2FsZXIvc3RhdGZvcndhcmRlci9wcm9jZXNzb3IuZ28=) | `83.33% <0.00%> (-5.56%)` | :arrow_down: |
| [pkg/activator/net/revision\_backends.go](https://codecov.io/gh/knative/serving/pull/10366/diff?src=pr&el=tree#diff-cGtnL2FjdGl2YXRvci9uZXQvcmV2aXNpb25fYmFja2VuZHMuZ28=) | `91.40% <0.00%> (+0.90%)` | :arrow_up: |
| [pkg/reconciler/configuration/configuration.go](https://codecov.io/gh/knative/serving/pull/10366/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/10366?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/10366?src=pr&el=footer). Last update [00a08be...81a7678](https://codecov.io/gh/knative/serving/pull/10366?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).

knative-prow-robot: @chizhg: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh-tls | 81a7678b7f135894b296ff8229a2f3098bd79cd3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1338598148230090752) | `/test pull-knative-serving-istio-stable-no-mesh-tls`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-prow-robot: @chizhg: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh-tls | 81a7678b7f135894b296ff8229a2f3098bd79cd3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1338598148230090752) | `/test pull-knative-serving-istio-stable-no-mesh-tls`
pull-knative-serving-istio-stable-no-mesh | 81a7678b7f135894b296ff8229a2f3098bd79cd3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh/1338598148209119232) | `/test pull-knative-serving-istio-stable-no-mesh`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
chizhg: /cc @mattmoor @vagababov @ZhiminXiang 

FYI @albertomilan @fejta 
knative-prow-robot: @chizhg: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh | 81a7678b7f135894b296ff8229a2f3098bd79cd3 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh/1338598148209119232) | `/test pull-knative-serving-istio-stable-no-mesh`
pull-knative-serving-istio-stable-no-mesh-tls | 59615220018568408be4bbaff5ed39c8e6069f83 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1338630861242765312) | `/test pull-knative-serving-istio-stable-no-mesh-tls`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
chizhg: /retest
knative-prow-robot: @chizhg: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh-tls | 59615220018568408be4bbaff5ed39c8e6069f83 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1338630861242765312) | `/test pull-knative-serving-istio-stable-no-mesh-tls`
pull-knative-serving-istio-stable-no-mesh | 59615220018568408be4bbaff5ed39c8e6069f83 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh/1338630861213405184) | `/test pull-knative-serving-istio-stable-no-mesh`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
markusthoemmes: Can we only upload them for failing builds for starters?
knative-prow-robot: @chizhg: The following tests **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh | 59615220018568408be4bbaff5ed39c8e6069f83 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh/1338630861213405184) | `/test pull-knative-serving-istio-stable-no-mesh`
pull-knative-serving-istio-stable-no-mesh-tls | cc6152a326b8e815ea1616902c82f29b59b5f16e | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1340008480735498240) | `/test pull-knative-serving-istio-stable-no-mesh-tls`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
chizhg: /retest
knative-prow-robot: @chizhg: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh-tls | cc6152a326b8e815ea1616902c82f29b59b5f16e | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1340020966956208128) | `/test pull-knative-serving-istio-stable-no-mesh-tls`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->
knative-prow-robot: @chizhg: The following test **failed**, say `/retest` to rerun all failed tests:

Test name | Commit | Details | Rerun command
--- | --- | --- | ---
pull-knative-serving-istio-stable-no-mesh-tls | bb0043a8457e74e92b28e68eb18530cc82f19cf0 | [link](https://prow.knative.dev/view/gs/knative-prow/pr-logs/pull/knative_serving/10366/pull-knative-serving-istio-stable-no-mesh-tls/1340032289500827648) | `/test pull-knative-serving-istio-stable-no-mesh-tls`

[Full PR test history](https://gubernator.knative.dev/pr/knative_serving/10366). [Your PR dashboard](https://gubernator.knative.dev/pr/chizhg).

<details>

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md).  If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
</details>
<!-- test report -->

Patch:
diff --git a/.github/workflows/knative-releasability.yaml b/.github/workflows/knative-releasability.yaml
index ca0820a6e..ecfd542a6 100644
--- a/.github/workflows/knative-releasability.yaml
+++ b/.github/workflows/knative-releasability.yaml
@@ -36,8 +36,8 @@ jobs:
     env:
       #########################################
       #   Update this section each release.   #
-      RELEASE: 'v0.19'
-      SLACK_CHANNEL: 'release-19'
+      RELEASE: 'v0.20'
+      SLACK_CHANNEL: 'release-20'
       #########################################
 
     steps:
diff --git a/.github/workflows/knative-verify.yaml b/.github/workflows/knative-verify.yaml
index 3443a0496..5f20c548b 100644
--- a/.github/workflows/knative-verify.yaml
+++ b/.github/workflows/knative-verify.yaml
@@ -45,7 +45,9 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        go get github.com/google/ko/cmd/ko
+        curl -L https://github.com/google/ko/releases/download/v0.6.0/ko_0.6.0_Linux_x86_64.tar.gz | tar xzf - ko
+        chmod +x ./ko
+        sudo mv ko /usr/local/bin
         go get github.com/google/go-licenses
 
     - name: Check out code onto GOPATH
diff --git a/cmd/activator/main.go b/cmd/activator/main.go
index c640589c3..5b0e90198 100644
--- a/cmd/activator/main.go
+++ b/cmd/activator/main.go
@@ -40,6 +40,7 @@ import (
 
 	network "knative.dev/networking/pkg"
 	"knative.dev/pkg/configmap"
+	configmapinformer "knative.dev/pkg/configmap/informer"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/injection/sharedmain"
 	pkglogging "knative.dev/pkg/logging"
@@ -155,7 +156,7 @@ func main() {
 	})
 
 	// Set up our config store
-	configMapWatcher := configmap.NewInformedWatcher(kubeClient, system.Namespace())
+	configMapWatcher := configmapinformer.NewInformedWatcher(kubeClient, system.Namespace())
 	configStore := activatorconfig.NewStore(logger, tracerUpdater)
 	configStore.WatchConfigs(configMapWatcher)
 
diff --git a/cmd/autoscaler/main.go b/cmd/autoscaler/main.go
index 4daafda48..efe79b52a 100644
--- a/cmd/autoscaler/main.go
+++ b/cmd/autoscaler/main.go
@@ -38,7 +38,7 @@ import (
 	"knative.dev/pkg/injection/sharedmain"
 	"knative.dev/pkg/leaderelection"
 
-	"knative.dev/pkg/configmap"
+	configmap "knative.dev/pkg/configmap/informer"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/logging"
 	"knative.dev/pkg/metrics"
diff --git a/config/core/deployments/webhook.yaml b/config/core/deployments/webhook.yaml
index 2813fbc0c..15b10bc8d 100644
--- a/config/core/deployments/webhook.yaml
+++ b/config/core/deployments/webhook.yaml
@@ -79,7 +79,7 @@ spec:
 
         # TODO(https://github.com/knative/pkg/pull/953): Remove stackdriver specific config
         - name: METRICS_DOMAIN
-          value: knative.dev/serving
+          value: knative.dev/internal/serving
 
         securityContext:
           allowPrivilegeEscalation: false
diff --git a/go.mod b/go.mod
index 3a3cfb5d7..087111ef6 100644
--- a/go.mod
+++ b/go.mod
@@ -33,9 +33,9 @@ require (
 	k8s.io/client-go v0.18.12
 	k8s.io/code-generator v0.18.12
 	k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29
-	knative.dev/caching v0.0.0-20201217015204-c3efd692dc36
+	knative.dev/caching v0.0.0-20201221023403-116224f358cd
 	knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24
-	knative.dev/networking v0.0.0-20201217015204-ceef42482365
-	knative.dev/pkg v0.0.0-20201217152402-7226f4f447a8
+	knative.dev/networking v0.0.0-20201223042504-b9e08949dfbc
+	knative.dev/pkg v0.0.0-20201224024804-27db5ac24cfb
 	sigs.k8s.io/yaml v1.2.0
 )
diff --git a/go.sum b/go.sum
index 6e0b88881..a25abfa2a 100644
--- a/go.sum
+++ b/go.sum
@@ -11,9 +11,7 @@ cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0 h1:RmDygqvj27Zf3fCQjQRtLyC7KwFcHkeJitcO0OoGOcA=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0 h1:Dg9iHVQfrhq82rUNu9ZxUDrJLaxFUe/HlCVaLyRruq8=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
 cloud.google.com/go v0.72.0 h1:eWRCuwubtDrCJG0oSUMgnsbD4CmPFQF2ei4OFbXvwww=
 cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
@@ -33,7 +31,6 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0 h1:STgFzyU5/8miMl0//zKh2aQeTyeaUH3WN9bSUiJ09bA=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d h1:LblfooH1lKOpp1hIhukktmSAxFkqMPFk9KR6iZ0MJNI=
 contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d/go.mod h1:IshRmMJBhDfFj5Y67nVhMYTTIze91RUeT73ipWKs/GY=
@@ -224,7 +221,6 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc=
-github.com/evanphx/json-patch v4.5.0+incompatible h1:ouOWdg56aJriqS0huScTkVXPC5IcNrDCXZ6OoTAWu7M=
 github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
 github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -237,7 +233,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
 github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -343,7 +338,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
@@ -366,7 +360,6 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -396,7 +389,6 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf
 github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -521,7 +513,6 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 h1:g+4J5sZg6osfvEfkRZxJ1em0VT95/UOZgi/l7zi1/oE=
 github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.17/go.mod h1:WgzbA6oji13JREwiNsRDNfl7jYdPnmz+VEuLrA+/48M=
@@ -593,7 +584,6 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
 github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxSfWAKL3wpBW7V8scJMt8N8gnaMCS9E/cA=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/openzipkin/zipkin-go v0.2.2 h1:nY8Hti+WKaP0cRsSeQ026wU03QsM762XBeCXBb9NAWI=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.5 h1:UwtQQx2pyPIgWYHRg+epgdx1/HnBQTgN3/oIYEJTQzU=
 github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE=
@@ -637,7 +627,6 @@ github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
 github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.14.0 h1:RHRyE8UocrbjU+6UvRzwi6HjiDfxrrBU91TtbKzkGp4=
 github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
 github.com/prometheus/common v0.15.0 h1:4fgOnadei3EZvgRwxJ7RMpG1k1pOZth5Pc13tyspaKM=
 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s=
@@ -749,14 +738,12 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4-0.20200608061201-1901b56b9515/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -766,11 +753,9 @@ go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
-go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
@@ -874,7 +859,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
 golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11 h1:lwlPPsmjDKK0J6eG6xDWd5XPehI0R024zxjDnw3esPA=
 golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -882,9 +866,7 @@ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAG
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 h1:ld7aEMNHoBnnDAX15v1T6z31v8HwR2A9FYOuAhWqkwc=
 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 h1:Lm4OryKCca1vehdsWogr9N4t7NfZxLbJoc/H0w4K4S4=
@@ -896,9 +878,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 h1:qwRHBd0NqMbJxfbotnDhm2ByMI1Shq4Y6oRJo21SGJA=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -953,10 +933,8 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f h1:Fqb3ao1hUmOR3GkUOg/Y+BadLwykBIzs5q8Ez2SbHyc=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211 h1:9UQO31fZ+0aKQOFldThf7BKPMJTiBfWycGh/u3UoO88=
 golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3 h1:kzM6+9dur93BcC2kVlYl34cHU+TYZLanmpSJHVMmL64=
@@ -967,7 +945,6 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -1038,10 +1015,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3 h1:DywqrEscRX7O2phNjkT0L6lhHKGBoMLCNX+XcAe7t6s=
 golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a h1:+77BOOi9CMFjpy3D2P/OnfSSmC/Hx/fGAQJUAQaM2gc=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58 h1:1Bs6RVeBFtLZ8Yi1Hk07DiOqzvwLD/4hln4iahvFlag=
 golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -1052,11 +1027,9 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
 gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
-gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca h1:PupagGYwj8+I4ubCxcmcBRk3VlUWtTg5huQpZR9flmE=
 gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485 h1:OB/uP/Puiu5vS5QMRPrXCDWUPb+kt8f1KW8oQzFejQw=
 gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
-gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6 h1:4WsZyVtkthqrHTbDCJfiTs8IWNYE4uvsSDgaV6xpp+o=
 gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
 gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e h1:jRyg0XfpwWlhEV8mDfdNGBeSJM2fuyh9Yjrnd8kF2Ts=
@@ -1091,7 +1064,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.2/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@@ -1127,10 +1099,8 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d h1:92D1fum1bJLKSdr11OJ+54YeCMCGYIygTA7R/YZxH5M=
 google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e h1:wYR00/Ht+i/79g/gzhdehBgLIJCklKoc8Q/NebdzzpY=
 google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a h1:GnJAhasbD8HiT8DZMvsEx3QLVy/X0icq/MGr0MqRJ2M=
 google.golang.org/genproto v0.0.0-20201211151036-40ec1c210f7a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -1151,7 +1121,6 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1 h1:SfXqXS5hkufcdZ/mHtYCh53P2b+92WQq/DZcKLgsFRs=
 google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0 h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=
@@ -1213,19 +1182,16 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.5 h1:nI5egYTGJakVyOryqLs1cQO5dO0ksin5XXs2pspk75k=
 honnef.co/go/tools v0.0.1-2020.1.5/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4=
 k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY=
 k8s.io/api v0.18.12 h1:97X6znOXMVgCKivTAgpBXGBGlCe3gbM++yFdldgBCaE=
 k8s.io/api v0.18.12/go.mod h1:3sS78jmUoGHwERyMbEhxP6owcQ77UxGo+Yy+dKNWrh0=
 k8s.io/apiextensions-apiserver v0.18.12 h1:b0jTgW/qwqZBMIJTMxkLvvAtNRDZboG5yZiIbOFgQv8=
 k8s.io/apiextensions-apiserver v0.18.12/go.mod h1:nihADkPed1L37Vxpz2/BrtxO9mCtINH23aNtUe/CRLo=
-k8s.io/apimachinery v0.18.8 h1:jimPrycCqgx2QPearX3to1JePz7wSbVLq+7PdBTTwQ0=
 k8s.io/apimachinery v0.18.8/go.mod h1:6sQd+iHEqmOtALqOFjSWp2KZ9F0wlU/nWm0ZgsYWMig=
 k8s.io/apimachinery v0.18.12 h1:bLFXU4IxOu06F6Z6PV7eqtapXFb1G2q0ni0XBNFtJH8=
 k8s.io/apimachinery v0.18.12/go.mod h1:PF5taHbXgTEJLU+xMypMmYTXTWPJ5LaW8bfsisxnEXk=
 k8s.io/apiserver v0.18.8/go.mod h1:12u5FuGql8Cc497ORNj79rhPdiXQC4bf53X/skR/1YM=
 k8s.io/apiserver v0.18.12/go.mod h1:uFOeW4LlxS6KDgLWy3n3gh0DhC6m41QIFgL33ouk+4w=
-k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM=
 k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU=
 k8s.io/client-go v0.18.12 h1:MDGRE2tGidz29g45dI4kfelJo+aRmDqWx0Way8mD88A=
 k8s.io/client-go v0.18.12/go.mod h1:0aC8XkA09dX/goYqHQJ/kVv0zL1t+weOZt3pmz9LpxA=
@@ -1233,7 +1199,6 @@ k8s.io/cloud-provider v0.18.8/go.mod h1:cn9AlzMPVIXA4HHLVbgGUigaQlZyHSZ7WAwDEFNr
 k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+38s=
 k8s.io/code-generator v0.18.12 h1:/cSUfqlYZ90y0WDxxWfwfTXUGkJer2Gt1L3AIaVvviQ=
 k8s.io/code-generator v0.18.12/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
-k8s.io/component-base v0.18.8 h1:BW5CORobxb6q5mb+YvdwQlyXXS6NVH5fDXWbU7tf2L8=
 k8s.io/component-base v0.18.8/go.mod h1:00frPRDas29rx58pPCxNkhUfPbwajlyyvu8ruNgSErU=
 k8s.io/component-base v0.18.12 h1:1BfsKoZZgSU1GanVsCDgMkCVPnT0B8iaHV1Ui0ror6Y=
 k8s.io/component-base v0.18.12/go.mod h1:pRGKXsx2KWfsJqlDi4sbCc1jpaB87rXIIqupjhr5wj0=
@@ -1250,7 +1215,6 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0 h1:Foj74zO6RbjjP4hBEKjnYtjjAhGg4jNynUdYF6fJrok=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKfj0lK8EeCP7K1iUG65v09OM0/WG5E=
-k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 h1:Oh3Mzx5pJ+yIumsAD0MOECPVeXsVot0UkiaCGVyfGQY=
 k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29 h1:NeQXVJ2XFSkRoPzRo8AId01ZER+j8oV4SZADT4iBOXQ=
 k8s.io/kube-openapi v0.0.0-20200410145947-bcb3869e6f29/go.mod h1:F+5wygcW0wmRTnM3cOgIqGivxkwSWIWT5YdsDbeAOaU=
@@ -1259,15 +1223,15 @@ k8s.io/legacy-cloud-providers v0.18.8/go.mod h1:tgp4xYf6lvjrWnjQwTOPvWQE9IVqSBGP
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 h1:v8ud2Up6QK1lNOKFgiIVrZdMg7MpmSnvtrOieolJKoE=
 k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-knative.dev/caching v0.0.0-20201217015204-c3efd692dc36 h1:Mauvk5dMxJsoScIoD/jH/GXKriz67w6bITcIUGRyf1g=
-knative.dev/caching v0.0.0-20201217015204-c3efd692dc36/go.mod h1:4ilQORs+ZBMOQWu6oWGJvQFz/NP3N63DwheA6O8UNVE=
+knative.dev/caching v0.0.0-20201221023403-116224f358cd h1:73rkMpAj6VVCdIKW8yKQKg2hj99n3Thzdipv60CrPM4=
+knative.dev/caching v0.0.0-20201221023403-116224f358cd/go.mod h1:upxMcX1I08HDdYA1nusUFzkgwV88C0hKbgGWYnzsgmc=
 knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24 h1:kIztWfvnIFV8Lhlea02K3YO2mIzcDyQNzrBLn0Oq9sA=
 knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI=
-knative.dev/networking v0.0.0-20201217015204-ceef42482365 h1:/afRCNB+tOirJ+hWWI4LCU58PZQd0WbaZhMLFp2qe9g=
-knative.dev/networking v0.0.0-20201217015204-ceef42482365/go.mod h1:eFbYgJ+mBmsauvUB+Kxn9tXCCdyo/TL1mkZLgJaBJ2c=
-knative.dev/pkg v0.0.0-20201216162758-261c9b4624df/go.mod h1:VjrwVhfEZUnn6FruncHcBm854FldnRpekpyBbYtBvZM=
-knative.dev/pkg v0.0.0-20201217152402-7226f4f447a8 h1:Ti4QhRNR6WSKiobT9gWuJZT3odRQC4v8LcO5tVfsNNI=
-knative.dev/pkg v0.0.0-20201217152402-7226f4f447a8/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
+knative.dev/networking v0.0.0-20201223042504-b9e08949dfbc h1:I9oJW2LwMaZ/e2MwClWLTVxSVF9457o4qSJTzGK6CP8=
+knative.dev/networking v0.0.0-20201223042504-b9e08949dfbc/go.mod h1:MTHF/89uQ3XDklu7Uny5TuobSC9UkHBWmMvFWgnZ5Rk=
+knative.dev/pkg v0.0.0-20201218185703-e41409af6cff/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
+knative.dev/pkg v0.0.0-20201224024804-27db5ac24cfb h1:XVcmpSvfDMZ5Z+1pebSm5Msq5sQey/V4NHF2+dFNU1o=
+knative.dev/pkg v0.0.0-20201224024804-27db5ac24cfb/go.mod h1:hckgW978SdzPA2H5EDvRPY8xsnPuDZLJLbPf8Jte7Q0=
 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/apis/serving/register.go b/pkg/apis/serving/register.go
index dbc1b7425..7bcfaaaa5 100644
--- a/pkg/apis/serving/register.go
+++ b/pkg/apis/serving/register.go
@@ -75,6 +75,10 @@ const (
 	// which Service they are created.
 	ServiceLabelKey = GroupName + "/service"
 
+	// DomainMappingLabelKey is the label key attached to Ingress resources to indicate
+	// which DomainMapping triggered their creation.
+	DomainMappingLabelKey = GroupName + "/domainmapping"
+
 	// ConfigurationGenerationLabelKey is the label key attached to a Revision indicating the
 	// metadata generation of the Configuration that created this revision
 	ConfigurationGenerationLabelKey = GroupName + "/configurationGeneration"
diff --git a/pkg/apis/serving/v1/configuration_validation.go b/pkg/apis/serving/v1/configuration_validation.go
index 2509a3094..76b7d7922 100644
--- a/pkg/apis/serving/v1/configuration_validation.go
+++ b/pkg/apis/serving/v1/configuration_validation.go
@@ -41,8 +41,6 @@ func (c *Configuration) Validate(ctx context.Context) (errs *apis.FieldError) {
 		errs = errs.Also(c.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec"))
 	}
 
-	errs = errs.Also(c.Status.Validate(apis.WithinStatus(ctx)).ViaField("status"))
-
 	if apis.IsInUpdate(ctx) {
 		original := apis.GetBaseline(ctx).(*Configuration)
 		// Don't validate annotations(creator and lastModifier) when configuration owned by service
@@ -63,16 +61,6 @@ func (cs *ConfigurationSpec) Validate(ctx context.Context) *apis.FieldError {
 	return cs.Template.Validate(ctx).ViaField("template")
 }
 
-// Validate implements apis.Validatable
-func (cs *ConfigurationStatus) Validate(ctx context.Context) *apis.FieldError {
-	return cs.ConfigurationStatusFields.Validate(ctx)
-}
-
-// Validate implements apis.Validatable
-func (csf *ConfigurationStatusFields) Validate(ctx context.Context) *apis.FieldError {
-	return nil
-}
-
 // validateLabels function validates configuration labels
 func (c *Configuration) validateLabels() (errs *apis.FieldError) {
 	for key, val := range c.GetLabels() {
diff --git a/pkg/apis/serving/v1/route_lifecycle.go b/pkg/apis/serving/v1/route_lifecycle.go
index 5e810b636..2bf0ad833 100644
--- a/pkg/apis/serving/v1/route_lifecycle.go
+++ b/pkg/apis/serving/v1/route_lifecycle.go
@@ -70,6 +70,13 @@ func (rs *RouteStatus) MarkServiceNotOwned(name string) {
 		fmt.Sprintf("There is an existing placeholder Service %q that we do not own.", name))
 }
 
+// MarkIngressRolloutInProgress changes the IngressReady condition to be unknown to reflect
+// that a gradual rollout of the latest new revision (or stacked revisions) is in progress.
+func (rs *RouteStatus) MarkIngressRolloutInProgress() {
+	routeCondSet.Manage(rs).MarkUnknown(RouteConditionIngressReady,
+		"RolloutInProgress", "A gradual rollout of the latest revision(s) is in progress.")
+}
+
 // MarkIngressNotConfigured changes the IngressReady condition to be unknown to reflect
 // that the Ingress does not yet have a Status
 func (rs *RouteStatus) MarkIngressNotConfigured() {
diff --git a/pkg/apis/serving/v1/route_validation.go b/pkg/apis/serving/v1/route_validation.go
index 936d5f411..bb79ec71d 100644
--- a/pkg/apis/serving/v1/route_validation.go
+++ b/pkg/apis/serving/v1/route_validation.go
@@ -32,7 +32,6 @@ func (r *Route) Validate(ctx context.Context) *apis.FieldError {
 	errs := serving.ValidateObjectMetadata(ctx, r.GetObjectMeta()).Also(
 		r.validateLabels().ViaField("labels")).ViaField("metadata")
 	errs = errs.Also(r.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec"))
-	errs = errs.Also(r.Status.Validate(apis.WithinStatus(ctx)).ViaField("status"))
 
 	if apis.IsInUpdate(ctx) {
 		original := apis.GetBaseline(ctx).(*Route)
@@ -192,21 +191,6 @@ func (tt *TrafficTarget) validateURL(ctx context.Context, errs *apis.FieldError)
 	return errs
 }
 
-// Validate implements apis.Validatable.
-func (rs *RouteStatus) Validate(ctx context.Context) *apis.FieldError {
-	return rs.RouteStatusFields.Validate(ctx)
-}
-
-// Validate implements apis.Validatable.
-func (rsf *RouteStatusFields) Validate(ctx context.Context) *apis.FieldError {
-	// TODO(mattmoor): Validate other status fields.
-
-	if len(rsf.Traffic) != 0 {
-		return validateTrafficList(ctx, rsf.Traffic).ViaField("traffic")
-	}
-	return nil
-}
-
 func validateClusterVisibilityLabel(label string) (errs *apis.FieldError) {
 	if label != serving.VisibilityClusterLocal {
 		errs = apis.ErrInvalidValue(label, network.VisibilityLabelKey)
diff --git a/pkg/apis/serving/v1/service_validation.go b/pkg/apis/serving/v1/service_validation.go
index deab3be5c..7e0cd9525 100644
--- a/pkg/apis/serving/v1/service_validation.go
+++ b/pkg/apis/serving/v1/service_validation.go
@@ -41,8 +41,6 @@ func (s *Service) Validate(ctx context.Context) (errs *apis.FieldError) {
 		errs = errs.Also(s.Spec.Validate(apis.WithinSpec(ctx)).ViaField("spec"))
 	}
 
-	errs = errs.Also(s.Status.Validate(apis.WithinStatus(ctx)).ViaField("status"))
-
 	if apis.IsInUpdate(ctx) {
 		original := apis.GetBaseline(ctx).(*Service)
 		errs = errs.Also(apis.ValidateCreatorAndModifier(original.Spec, s.Spec, original.GetAnnotations(),
@@ -62,12 +60,6 @@ func (ss *ServiceSpec) Validate(ctx context.Context) *apis.FieldError {
 		ss.RouteSpec.Validate(WithDefaultConfigurationName(ctx)))
 }
 
-// Validate implements apis.Validatable
-func (ss *ServiceStatus) Validate(ctx context.Context) *apis.FieldError {
-	return ss.ConfigurationStatusFields.Validate(ctx).Also(
-		ss.RouteStatusFields.Validate(ctx))
-}
-
 // validateLabels function validates service labels
 func (s *Service) validateLabels() (errs *apis.FieldError) {
 	for key, val := range s.GetLabels() {
diff --git a/pkg/apis/serving/v1alpha1/domainmapping_validation.go b/pkg/apis/serving/v1alpha1/domainmapping_validation.go
index 2cdd683e1..0f25adfbb 100644
--- a/pkg/apis/serving/v1alpha1/domainmapping_validation.go
+++ b/pkg/apis/serving/v1alpha1/domainmapping_validation.go
@@ -18,7 +18,10 @@ package v1alpha1
 
 import (
 	"context"
+	"fmt"
 
+	"k8s.io/apimachinery/pkg/util/validation"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 	"knative.dev/pkg/apis"
 	"knative.dev/serving/pkg/apis/serving"
 )
@@ -39,6 +42,11 @@ func (dm *DomainMapping) validateMetadata(ctx context.Context) (errs *apis.Field
 		errs = errs.Also(apis.ErrDisallowedFields("generateName"))
 	}
 
+	err := validation.IsFullyQualifiedDomainName(field.NewPath("name"), dm.Name)
+	if err != nil {
+		errs = errs.Also(apis.ErrGeneric(fmt.Sprintf("invalid name %q: %s", dm.Name, err.ToAggregate()), "name"))
+	}
+
 	if apis.IsInUpdate(ctx) {
 		original := apis.GetBaseline(ctx).(*DomainMapping)
 		errs = errs.Also(
diff --git a/pkg/reconciler/domainmapping/reconciler.go b/pkg/reconciler/domainmapping/reconciler.go
index f0da3bdfa..fbf5b1e83 100644
--- a/pkg/reconciler/domainmapping/reconciler.go
+++ b/pkg/reconciler/domainmapping/reconciler.go
@@ -94,7 +94,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, dm *v1alpha1.DomainMappi
 
 	// Reconcile the Ingress resource corresponding to the requested Mapping.
 	logger.Debugf("Mapping %s to ref %s/%s (host: %q, svc: %q)", url, dm.Spec.Ref.Namespace, dm.Spec.Ref.Name, targetHost, targetBackendSvc)
-	desired := resources.MakeIngress(dm, targetBackendSvc, targetHost, ingressClass)
+	desired := resources.MakeIngress(dm, targetBackendSvc, targetHost, ingressClass, nil /* tls */)
 	ingress, err := r.reconcileIngress(ctx, dm, desired)
 	if err != nil {
 		return err
diff --git a/pkg/reconciler/domainmapping/resources/certificate.go b/pkg/reconciler/domainmapping/resources/certificate.go
new file mode 100644
index 000000000..0feef6a1d
--- /dev/null
+++ b/pkg/reconciler/domainmapping/resources/certificate.go
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resources
+
+import (
+	networkingv1alpha1 "knative.dev/networking/pkg/apis/networking/v1alpha1"
+	"knative.dev/pkg/kmeta"
+	"knative.dev/serving/pkg/apis/serving"
+	"knative.dev/serving/pkg/apis/serving/v1alpha1"
+	routeresources "knative.dev/serving/pkg/reconciler/route/resources"
+)
+
+// MakeCertificate creates a Certificate for the DomainMapping.
+//
+// This function delegates entirely to routeresources.MakeCertificate,
+// but we keep it here to hide the `certName`, and `dnsName` logic
+// from the caller.
+func MakeCertificate(dm *v1alpha1.DomainMapping, certClass string) *networkingv1alpha1.Certificate {
+	certName := kmeta.ChildName(dm.GetName(), "")
+	return routeresources.MakeCertificate(
+		dm, serving.DomainMappingLabelKey, dm.Name, certName, certClass)
+}
diff --git a/pkg/reconciler/domainmapping/resources/ingress.go b/pkg/reconciler/domainmapping/resources/ingress.go
index 99411dc59..b739eb7c1 100644
--- a/pkg/reconciler/domainmapping/resources/ingress.go
+++ b/pkg/reconciler/domainmapping/resources/ingress.go
@@ -25,7 +25,9 @@ import (
 	"knative.dev/networking/pkg/apis/networking"
 	netv1alpha1 "knative.dev/networking/pkg/apis/networking/v1alpha1"
 	"knative.dev/pkg/kmeta"
+	"knative.dev/serving/pkg/apis/serving"
 	servingv1alpha1 "knative.dev/serving/pkg/apis/serving/v1alpha1"
+	routeresources "knative.dev/serving/pkg/reconciler/route/resources"
 )
 
 // MakeIngress creates an Ingress object for a DomainMapping.  The Ingress is
@@ -33,7 +35,7 @@ import (
 // backend is always in the same namespace also (as this is required by
 // KIngress).  The created ingress will contain a RewriteHost rule to cause the
 // given hostName to be used as the host.
-func MakeIngress(dm *servingv1alpha1.DomainMapping, backendServiceName, hostName, ingressClass string) *netv1alpha1.Ingress {
+func MakeIngress(dm *servingv1alpha1.DomainMapping, backendServiceName, hostName, ingressClass string, tls []netv1alpha1.IngressTLS, acmeChallenges ...netv1alpha1.HTTP01Challenge) *netv1alpha1.Ingress {
 	return &netv1alpha1.Ingress{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      kmeta.ChildName(dm.GetName(), ""),
@@ -43,14 +45,18 @@ func MakeIngress(dm *servingv1alpha1.DomainMapping, backendServiceName, hostName
 			}, dm.GetAnnotations()), func(key string) bool {
 				return key == corev1.LastAppliedConfigAnnotation
 			}),
+			Labels: kmeta.UnionMaps(dm.Labels, map[string]string{
+				serving.DomainMappingLabelKey: dm.Name,
+			}),
 			OwnerReferences: []metav1.OwnerReference{*kmeta.NewControllerRef(dm)},
 		},
 		Spec: netv1alpha1.IngressSpec{
+			TLS: tls,
 			Rules: []netv1alpha1.IngressRule{{
 				Hosts:      []string{dm.Name},
 				Visibility: netv1alpha1.IngressVisibilityExternalIP,
 				HTTP: &netv1alpha1.HTTPIngressRuleValue{
-					Paths: []netv1alpha1.HTTPIngressPath{{
+					Paths: append([]netv1alpha1.HTTPIngressPath{{
 						RewriteHost: hostName,
 						Splits: []netv1alpha1.IngressBackendSplit{{
 							Percent: 100,
@@ -63,7 +69,7 @@ func MakeIngress(dm *servingv1alpha1.DomainMapping, backendServiceName, hostName
 								ServicePort:      intstr.FromInt(80),
 							},
 						}},
-					}},
+					}}, routeresources.MakeACMEIngressPaths(acmeChallenges, dm.GetName())...),
 				},
 			}},
 		},
diff --git a/pkg/reconciler/route/resources/certificate.go b/pkg/reconciler/route/resources/certificate.go
index 7bf6dc340..fb79001cf 100644
--- a/pkg/reconciler/route/resources/certificate.go
+++ b/pkg/reconciler/route/resources/certificate.go
@@ -32,6 +32,31 @@ import (
 	"knative.dev/serving/pkg/reconciler/route/resources/names"
 )
 
+// MakeCertificate creates a Certificate, inheriting the certClass
+// annotations from the owner, as well as the namespaces. If owner
+// does not have a certClass, use the provided `certClass` parameter.
+func MakeCertificate(owner kmeta.OwnerRefableAccessor, ownerLabelKey string, dnsName string, certName string, certClass string) *networkingv1alpha1.Certificate {
+	return &networkingv1alpha1.Certificate{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:            certName,
+			Namespace:       owner.GetNamespace(),
+			OwnerReferences: []metav1.OwnerReference{*kmeta.NewControllerRef(owner)},
+			Annotations: kmeta.FilterMap(kmeta.UnionMaps(map[string]string{
+				networking.CertificateClassAnnotationKey: certClass,
+			}, owner.GetAnnotations()), func(key string) bool {
+				return key == corev1.LastAppliedConfigAnnotation
+			}),
+			Labels: map[string]string{
+				ownerLabelKey: owner.GetName(),
+			},
+		},
+		Spec: networkingv1alpha1.CertificateSpec{
+			DNSNames:   []string{dnsName},
+			SecretName: certName,
+		},
+	}
+}
+
 // MakeCertificates creates an array of Certificate for the Route to request TLS certificates.
 // domainTagMap is an one-to-one mapping between domain and tag, for major domain (tag-less),
 // the value is an empty string
@@ -56,26 +81,7 @@ func MakeCertificates(route *v1.Route, domainTagMap map[string]string, certClass
 		if tag != "" {
 			certName += fmt.Sprint("-", adler32.Checksum([]byte(tag)))
 		}
-
-		certs = append(certs, &networkingv1alpha1.Certificate{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:            certName,
-				Namespace:       route.Namespace,
-				OwnerReferences: []metav1.OwnerReference{*kmeta.NewControllerRef(route)},
-				Annotations: kmeta.FilterMap(kmeta.UnionMaps(map[string]string{
-					networking.CertificateClassAnnotationKey: certClass,
-				}, route.Annotations), func(key string) bool {
-					return key == corev1.LastAppliedConfigAnnotation
-				}),
-				Labels: map[string]string{
-					serving.RouteLabelKey: route.Name,
-				},
-			},
-			Spec: networkingv1alpha1.CertificateSpec{
-				DNSNames:   []string{dnsName},
-				SecretName: certName,
-			},
-		})
+		certs = append(certs, MakeCertificate(route, serving.RouteLabelKey, dnsName, certName, certClass))
 	}
 	return certs
 }
diff --git a/pkg/reconciler/route/resources/ingress.go b/pkg/reconciler/route/resources/ingress.go
index 16dfd2866..689c6a311 100644
--- a/pkg/reconciler/route/resources/ingress.go
+++ b/pkg/reconciler/route/resources/ingress.go
@@ -135,7 +135,6 @@ func makeIngressSpec(
 	sort.Strings(names)
 	// The routes are matching rule based on domain name to traffic split targets.
 	rules := make([]netv1alpha1.IngressRule, 0, len(names))
-	challengeHosts := getChallengeHosts(acmeChallenges)
 
 	featuresConfig := config.FromContextOrDefaults(ctx).Features
 
@@ -188,7 +187,7 @@ func makeIngressSpec(
 			// If this is a public rule, we need to configure ACME challenge paths.
 			if visibility == netv1alpha1.IngressVisibilityExternalIP {
 				rule.HTTP.Paths = append(
-					makeACMEIngressPaths(challengeHosts, domains), rule.HTTP.Paths...)
+					MakeACMEIngressPaths(acmeChallenges, domains...), rule.HTTP.Paths...)
 			}
 			rules = append(rules, rule)
 		}
@@ -231,7 +230,10 @@ func routeDomain(ctx context.Context, targetName string, r *servingv1.Route, vis
 	return domains, err
 }
 
-func makeACMEIngressPaths(challenges map[string]netv1alpha1.HTTP01Challenge, domains []string) []netv1alpha1.HTTPIngressPath {
+// MakeACMEIngressPaths returns a set of netv1alpha1.HTTPIngressPath
+// that can be used to perform ACME challenges.
+func MakeACMEIngressPaths(acmeChallenges []netv1alpha1.HTTP01Challenge, domains ...string) []netv1alpha1.HTTPIngressPath {
+	challenges := getChallengeHosts(acmeChallenges)
 	paths := make([]netv1alpha1.HTTPIngressPath, 0, len(challenges))
 	for _, domain := range domains {
 		challenge, ok := challenges[domain]
diff --git a/pkg/reconciler/route/route.go b/pkg/reconciler/route/route.go
index 4b9e67af7..c6906de36 100644
--- a/pkg/reconciler/route/route.go
+++ b/pkg/reconciler/route/route.go
@@ -147,13 +147,18 @@ func (c *Reconciler) ReconcileKind(ctx context.Context, r *v1.Route) pkgreconcil
 	}
 
 	// Reconcile ingress and its children resources.
-	ingress, _, err := c.reconcileIngress(ctx, r, traffic, tls, ingressClassForRoute(ctx, r), acmeChallenges...)
+	ingress, effectiveRO, err := c.reconcileIngress(ctx, r, traffic, tls, ingressClassForRoute(ctx, r), acmeChallenges...)
 	if err != nil {
 		return err
 	}
 
+	roInProgress := !effectiveRO.Done()
 	if ingress.GetObjectMeta().GetGeneration() != ingress.Status.ObservedGeneration {
 		r.Status.MarkIngressNotConfigured()
+	} else if roInProgress {
+		logger.Info("Rollout is in progress")
+		// Rollout in progress, so mark the status as such.
+		r.Status.MarkIngressRolloutInProgress()
 	} else {
 		r.Status.PropagateIngressStatus(ingress.Status)
 	}
@@ -163,6 +168,20 @@ func (c *Reconciler) ReconcileKind(ctx context.Context, r *v1.Route) pkgreconcil
 		return err
 	}
 
+	// We do it here, rather than in the similar check above,
+	// since we might be inside a rollout and Ingress
+	// is not yet ready and that takes priority, so the `roInProgress` branch
+	// wil not be triggered.
+	if roInProgress {
+		// Update the route.Status.Traffic to contain correct traffic
+		// distribution based on rollout status.
+		r.Status.Traffic, err = traffic.GetRevisionTrafficTargets(ctx, r, effectiveRO)
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+
 	logger.Info("Route successfully synced")
 	return nil
 }
@@ -320,8 +339,8 @@ func (c *Reconciler) configureTraffic(ctx context.Context, r *v1.Route) (*traffi
 
 	logger.Info("All referred targets are routable, marking AllTrafficAssigned with traffic information.")
 
-	// Domain should already be present
-	r.Status.Traffic, err = t.GetRevisionTrafficTargets(ctx, r)
+	// Pass empty rollout here. We'll recompute this if there is a rollout in progress.
+	r.Status.Traffic, err = t.GetRevisionTrafficTargets(ctx, r, &traffic.Rollout{})
 	if err != nil {
 		return nil, err
 	}
diff --git a/pkg/reconciler/route/traffic/rollout.go b/pkg/reconciler/route/traffic/rollout.go
index 4a8fe18a9..9c068312d 100644
--- a/pkg/reconciler/route/traffic/rollout.go
+++ b/pkg/reconciler/route/traffic/rollout.go
@@ -107,9 +107,20 @@ func (cur *Rollout) RolloutsByTag(t string) []*ConfigurationRollout {
 	return ret
 }
 
-// Done returns true if there is no active rollout going on
+// Done returns true if all the Configuration rollouts in this
+// Rollout have completed.
+func (cur *Rollout) Done() bool {
+	for i := range cur.Configurations {
+		if !cur.Configurations[i].done() {
+			return false
+		}
+	}
+	return true
+}
+
+// done returns true if there is no active rollout going on
 // for the configuration.
-func (cur *ConfigurationRollout) Done() bool {
+func (cur *ConfigurationRollout) done() bool {
 	// Zero or just one revision.
 	return len(cur.Revisions) < 2
 }
@@ -147,7 +158,9 @@ func (cur *Rollout) ObserveReady(ctx context.Context, nowTS int64, durationSecs
 			// given possible time drift, we'll ensure that at least 1s is returned.
 			minStepSec := math.Max(1, math.Ceil(time.Duration(nowTS-c.StepParams.StartTime).Seconds()))
 			c.computeProperties(float64(nowTS), minStepSec, durationSecs)
-			logger.Debugf("Rollout properties for %s: %#v", c.ConfigurationName, c.StepParams)
+			logger.Debugf("Computed rollout properties for %s: %#v", c.ConfigurationName, c.StepParams)
+		} else {
+			logger.Debugf("Existing rollout properties for %s: %#v", c.ConfigurationName, c.StepParams)
 		}
 	}
 }
@@ -381,6 +394,8 @@ func stepConfig(ctx context.Context, goal, prev *ConfigurationRollout, nowTS int
 	// Otherwise we start a rollout, which means we need to stamp the starttime,
 	// the rest of the fields will remain unset and `ObserveReady` will
 	// compute them when the ingress becomes ready.
+	logger.Debugf("Starting a new revision rollout for configuration %s and revision %s at %d",
+		goal.ConfigurationName, goal.Revisions[0].RevisionName, nowTS)
 	ret.StepParams.StartTime = nowTS
 
 	// Go backwards and find first revision with traffic assignment > 0.
@@ -421,8 +436,14 @@ func stepConfig(ctx context.Context, goal, prev *ConfigurationRollout, nowTS int
 // Pre: minStepSec >= 1, in seconds.
 // Pre: durationSecs > 1, in seconds.
 func (cur *ConfigurationRollout) computeProperties(nowTS, minStepSec, durationSecs float64) {
-	// First compute number of steps.
-	numSteps := durationSecs / minStepSec
+	// First compute number of steps. If it takes more time to step 1% than the
+	// whole allotted time for the rollout, do it in 1 step.
+	// Take into account that we already used minStepSecs to move first
+	// 1% so the overall rollout duration is shorter by this amount.
+	// If it took longer than duration it might be negative, so cap it
+	// at 1s, so we just do 1 step.
+	durationSecs = math.Max(1, durationSecs-minStepSec)
+	numSteps := math.Max(1, durationSecs/minStepSec)
 	pf := float64(cur.Percent)
 
 	// The smallest step is 1%, so if we can fit more steps
@@ -436,7 +457,9 @@ func (cur *ConfigurationRollout) computeProperties(nowTS, minStepSec, durationSe
 	// For bigger jumps this might yield slightly bigger moves
 	// but rounding down makes 1.9 => 1, which basically doubles the rollout time.
 	// E.g. 100% in 4 steps. 1% -> 26% -> 51% -> 76% -> 100%.
-	stepSize := math.Round((pf - 1) / numSteps)
+	// In addition, ensure that we don't have step size larger than total
+	//  percentage for the configuration.
+	stepSize := math.Min(pf-1, math.Round((pf-1)/numSteps))
 
 	// The time we sleep between the steps.
 	stepDuration := durationSecs / numSteps * float64(time.Second)
diff --git a/pkg/reconciler/route/traffic/traffic.go b/pkg/reconciler/route/traffic/traffic.go
index 4ab7c19ce..1af1c348e 100644
--- a/pkg/reconciler/route/traffic/traffic.go
+++ b/pkg/reconciler/route/traffic/traffic.go
@@ -25,6 +25,7 @@ import (
 
 	net "knative.dev/networking/pkg/apis/networking"
 	netv1alpha1 "knative.dev/networking/pkg/apis/networking/v1alpha1"
+	"knative.dev/pkg/apis"
 	"knative.dev/pkg/ptr"
 	"knative.dev/serving/pkg/apis/serving"
 	v1 "knative.dev/serving/pkg/apis/serving/v1"
@@ -87,39 +88,93 @@ func BuildTrafficConfiguration(configLister listers.ConfigurationLister, revList
 	return builder.build()
 }
 
-// GetRevisionTrafficTargets returns a list of TrafficTarget flattened to the RevisionName, and having ConfigurationName cleared out.
-func (cfg *Config) GetRevisionTrafficTargets(ctx context.Context, r *v1.Route) ([]v1.TrafficTarget, error) {
-	results := make([]v1.TrafficTarget, len(cfg.revisionTargets))
-	for i, tt := range cfg.revisionTargets {
-		var pp *int64
-		if tt.Percent != nil {
-			pp = ptr.Int64(*tt.Percent)
+func rolloutConfig(cfgName string, ros []*ConfigurationRollout) *ConfigurationRollout {
+	for _, ro := range ros {
+		if ro.ConfigurationName == cfgName {
+			return ro
 		}
+	}
+	// Technically impossible with valid inputs.
+	return nil
+}
+
+func (cfg *Config) computeURL(ctx context.Context, r *v1.Route, tt *RevisionTarget) (*apis.URL, error) {
+	meta := r.ObjectMeta.DeepCopy()
+
+	hostname, err := domains.HostnameFromTemplate(ctx, meta.Name, tt.Tag)
+	if err != nil {
+		return nil, err
+	}
+
+	labels.SetVisibility(meta, cfg.Visibility[tt.Tag] == netv1alpha1.IngressVisibilityClusterLocal)
+
+	// HTTP is currently the only supported scheme.
+	fullDomain, err := domains.DomainNameFromTemplate(ctx, *meta, hostname)
+	if err != nil {
+		return nil, err
+	}
+	return domains.URL(domains.HTTPScheme, fullDomain), nil
+}
 
+func (cfg *Config) targetToStatus(ctx context.Context, r *v1.Route, tt *RevisionTarget,
+	revs []RevisionRollout, results []v1.TrafficTarget) (_ []v1.TrafficTarget, err error) {
+	var url *apis.URL
+	// Do this once per tag.
+	if tt.Tag != "" {
+		url, err = cfg.computeURL(ctx, r, tt)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	for i := range revs {
+		rr := &revs[i]
 		// We cannot `DeepCopy` here, since tt.TrafficTarget might contain both
 		// configuration and revision.
-		results[i] = v1.TrafficTarget{
+		result := v1.TrafficTarget{
 			Tag:            tt.Tag,
-			RevisionName:   tt.RevisionName,
-			Percent:        pp,
+			RevisionName:   rr.RevisionName,
+			Percent:        ptr.Int64(int64(rr.Percent)),
 			LatestRevision: tt.LatestRevision,
 		}
-		if tt.Tag != "" {
-			meta := r.ObjectMeta.DeepCopy()
 
-			hostname, err := domains.HostnameFromTemplate(ctx, meta.Name, tt.Tag)
-			if err != nil {
-				return nil, err
-			}
+		if tt.Tag != "" {
+			result.URL = url
+		}
+		results = append(results, result)
+	}
+	return results, nil
+}
 
-			labels.SetVisibility(meta, cfg.Visibility[tt.Tag] == netv1alpha1.IngressVisibilityClusterLocal)
+// GetRevisionTrafficTargets returns a list of TrafficTarget flattened to the RevisionName, and having ConfigurationName cleared out.
+func (cfg *Config) GetRevisionTrafficTargets(ctx context.Context, r *v1.Route, ro *Rollout) ([]v1.TrafficTarget, error) {
+	results := make([]v1.TrafficTarget, 0, len(cfg.revisionTargets))
+	for i := range cfg.revisionTargets {
+		tt := &cfg.revisionTargets[i]
+		var (
+			roCfg *ConfigurationRollout
+			revs  []RevisionRollout
+			err   error
+		)
+
+		if tt.LatestRevision != nil && *tt.LatestRevision {
+			cfgs := ro.RolloutsByTag(tt.Tag)
+			roCfg = rolloutConfig(tt.ConfigurationName, cfgs)
+		}
 
-			// HTTP is currently the only supported scheme.
-			fullDomain, err := domains.DomainNameFromTemplate(ctx, *meta, hostname)
-			if err != nil {
-				return nil, err
-			}
-			results[i].URL = domains.URL(domains.HTTPScheme, fullDomain)
+		// Not a rollout, or just a revision target. Setup mock revision rollout
+		// with a single element.
+		if roCfg == nil {
+			revs = []RevisionRollout{{
+				RevisionName: tt.RevisionName,
+				Percent:      int(*tt.Percent),
+			}}
+		} else {
+			revs = roCfg.Revisions
+		}
+		results, err = cfg.targetToStatus(ctx, r, tt, revs, results)
+		if err != nil {
+			return nil, err
 		}
 	}
 	return results, nil
diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go
index 2daf7bdda..3d9695ef8 100644
--- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go
+++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_types.go
@@ -100,6 +100,10 @@ type IngressSpec struct {
 	// +optional
 	Rules []IngressRule `json:"rules,omitempty"`
 
+	// HTTPOption is the option of HTTP. It has the following two values:
+	// `HTTPOptionEnabled`, `HTTPOptionRedirected`
+	HTTPOption HTTPOption `json:"httpOption,omitempty"`
+
 	// DeprecatedVisibility was used for the fallback when spec.rules.visibility
 	// isn't set.
 	//
@@ -109,6 +113,16 @@ type IngressSpec struct {
 	DeprecatedVisibility IngressVisibility `json:"visibility,omitempty"`
 }
 
+type HTTPOption string
+
+const (
+	// The knative ingress will be able to serve HTTP connections.
+	HTTPOptionEnabled HTTPOption = "Enabled"
+	// The knative will return redirection HTTP status for the clients,
+	// asking the clients to redirect their requests to HTTPS.
+	HTTPOptionRedirected HTTPOption = "Redirected"
+)
+
 // IngressVisibility describes whether the Ingress should be exposed to
 // public gateways or not.
 type IngressVisibility string
diff --git a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go
index 1e3e43210..ed708d420 100644
--- a/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go
+++ b/vendor/knative.dev/networking/pkg/apis/networking/v1alpha1/ingress_validation.go
@@ -50,6 +50,7 @@ func (is *IngressSpec) Validate(ctx context.Context) *apis.FieldError {
 	for idx, tls := range is.TLS {
 		all = all.Also(tls.Validate(ctx).ViaFieldIndex("tls", idx))
 	}
+	all = all.Also(is.HTTPOption.Validate(ctx))
 	return all
 }
 
@@ -166,3 +167,13 @@ func (t *IngressTLS) Validate(ctx context.Context) *apis.FieldError {
 	}
 	return all
 }
+
+func (t HTTPOption) Validate(ctx context.Context) (all *apis.FieldError) {
+	switch t {
+	case "", HTTPOptionEnabled, HTTPOptionRedirected:
+		break
+	default:
+		all = all.Also(apis.ErrInvalidValue(t, "httpOption"))
+	}
+	return all
+}
diff --git a/vendor/knative.dev/pkg/configmap/informed_watcher.go b/vendor/knative.dev/pkg/configmap/informer/informed_watcher.go
similarity index 92%
rename from vendor/knative.dev/pkg/configmap/informed_watcher.go
rename to vendor/knative.dev/pkg/configmap/informer/informed_watcher.go
index 16447b634..2231ee52f 100644
--- a/vendor/knative.dev/pkg/configmap/informed_watcher.go
+++ b/vendor/knative.dev/pkg/configmap/informer/informed_watcher.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package configmap
+package informer
 
 import (
 	"errors"
@@ -31,6 +31,7 @@ import (
 	"k8s.io/client-go/informers/internalinterfaces"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
+	"knative.dev/pkg/configmap"
 )
 
 // NewInformedWatcherFromFactory watches a Kubernetes namespace for ConfigMap changes.
@@ -38,7 +39,7 @@ func NewInformedWatcherFromFactory(sif informers.SharedInformerFactory, namespac
 	return &InformedWatcher{
 		sif:      sif,
 		informer: sif.Core().V1().ConfigMaps(),
-		ManualWatcher: ManualWatcher{
+		ManualWatcher: configmap.ManualWatcher{
 			Namespace: namespace,
 		},
 		defaults: make(map[string]*corev1.ConfigMap),
@@ -97,22 +98,22 @@ type InformedWatcher struct {
 	// Embedding this struct allows us to reuse the logic
 	// of registering and notifying observers. This simplifies the
 	// InformedWatcher to just setting up the Kubernetes informer.
-	ManualWatcher
+	configmap.ManualWatcher
 }
 
 // Asserts that InformedWatcher implements Watcher.
-var _ Watcher = (*InformedWatcher)(nil)
+var _ configmap.Watcher = (*InformedWatcher)(nil)
 
 // Asserts that InformedWatcher implements DefaultingWatcher.
-var _ DefaultingWatcher = (*InformedWatcher)(nil)
+var _ configmap.DefaultingWatcher = (*InformedWatcher)(nil)
 
 // WatchWithDefault implements DefaultingWatcher.
-func (i *InformedWatcher) WatchWithDefault(cm corev1.ConfigMap, o ...Observer) {
+func (i *InformedWatcher) WatchWithDefault(cm corev1.ConfigMap, o ...configmap.Observer) {
 	i.defaults[cm.Name] = &cm
 
-	i.m.Lock()
+	i.Lock()
 	started := i.started
-	i.m.Unlock()
+	i.Unlock()
 	if started {
 		// TODO make both Watch and WatchWithDefault work after the InformedWatcher has started.
 		// This likely entails changing this to `o(&cm)` and having Watch check started, if it has
@@ -130,11 +131,12 @@ func (i *InformedWatcher) Start(stopCh <-chan struct{}) error {
 	// Pretend that all the defaulted ConfigMaps were just created. This is done before we start
 	// the informer to ensure that if a defaulted ConfigMap does exist, then the real value is
 	// processed after the default one.
-	for k := range i.observers {
+	i.ForEach(func(k string, _ []configmap.Observer) error {
 		if def, ok := i.defaults[k]; ok {
 			i.addConfigMapEvent(def)
 		}
-	}
+		return nil
+	})
 
 	if err := i.registerCallbackAndStartInformer(stopCh); err != nil {
 		return err
@@ -149,8 +151,8 @@ func (i *InformedWatcher) Start(stopCh <-chan struct{}) error {
 }
 
 func (i *InformedWatcher) registerCallbackAndStartInformer(stopCh <-chan struct{}) error {
-	i.m.Lock()
-	defer i.m.Unlock()
+	i.Lock()
+	defer i.Unlock()
 	if i.started {
 		return errors.New("watcher already started")
 	}
@@ -168,19 +170,19 @@ func (i *InformedWatcher) registerCallbackAndStartInformer(stopCh <-chan struct{
 }
 
 func (i *InformedWatcher) checkObservedResourcesExist() error {
-	i.m.RLock()
-	defer i.m.RUnlock()
+	i.RLock()
+	defer i.RUnlock()
 	// Check that all objects with Observers exist in our informers.
-	for k := range i.observers {
+	return i.ForEach(func(k string, _ []configmap.Observer) error {
 		if _, err := i.informer.Lister().ConfigMaps(i.Namespace).Get(k); err != nil {
 			if _, ok := i.defaults[k]; ok && k8serrors.IsNotFound(err) {
 				// It is defaulted, so it is OK that it doesn't exist.
-				continue
+				return nil
 			}
 			return err
 		}
-	}
-	return nil
+		return nil
+	})
 }
 
 func (i *InformedWatcher) addConfigMapEvent(obj interface{}) {
diff --git a/vendor/knative.dev/pkg/configmap/manual_watcher.go b/vendor/knative.dev/pkg/configmap/manual_watcher.go
index b1eb27633..bd28e7c23 100644
--- a/vendor/knative.dev/pkg/configmap/manual_watcher.go
+++ b/vendor/knative.dev/pkg/configmap/manual_watcher.go
@@ -27,7 +27,7 @@ type ManualWatcher struct {
 	Namespace string
 
 	// Guards observers
-	m         sync.RWMutex
+	sync.RWMutex
 	observers map[string][]Observer
 }
 
@@ -35,8 +35,8 @@ var _ Watcher = (*ManualWatcher)(nil)
 
 // Watch implements Watcher
 func (w *ManualWatcher) Watch(name string, o ...Observer) {
-	w.m.Lock()
-	defer w.m.Unlock()
+	w.Lock()
+	defer w.Unlock()
 
 	if w.observers == nil {
 		w.observers = make(map[string][]Observer, 1)
@@ -44,6 +44,16 @@ func (w *ManualWatcher) Watch(name string, o ...Observer) {
 	w.observers[name] = append(w.observers[name], o...)
 }
 
+// Watch implements Watcher
+func (w *ManualWatcher) ForEach(f func(string, []Observer) error) error {
+	for k, v := range w.observers {
+		if err := f(k, v); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // Start implements Watcher
 func (w *ManualWatcher) Start(<-chan struct{}) error {
 	return nil
@@ -55,8 +65,8 @@ func (w *ManualWatcher) OnChange(configMap *corev1.ConfigMap) {
 		return
 	}
 	// Within our namespace, take the lock and see if there are any registered observers.
-	w.m.RLock()
-	defer w.m.RUnlock()
+	w.RLock()
+	defer w.RUnlock()
 	// Iterate over the observers and invoke their callbacks.
 	for _, o := range w.observers[configMap.Name] {
 		o(configMap)
diff --git a/vendor/knative.dev/pkg/depcheck/depcheck.go b/vendor/knative.dev/pkg/depcheck/depcheck.go
index 14d5c6674..034617451 100644
--- a/vendor/knative.dev/pkg/depcheck/depcheck.go
+++ b/vendor/knative.dev/pkg/depcheck/depcheck.go
@@ -75,11 +75,12 @@ func (g graph) path(name string) []string {
 	return append(base, name)
 }
 
-func buildGraph(importpaths ...string) (graph, error) {
-	g := make(graph, len(importpaths))
+func buildGraph(importpath string, buildFlags ...string) (graph, error) {
+	g := make(graph, 1)
 	pkgs, err := packages.Load(&packages.Config{
-		Mode: packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles | packages.NeedImports | packages.NeedDeps | packages.NeedModule,
-	}, importpaths...)
+		Mode:       packages.NeedName | packages.NeedFiles | packages.NeedCompiledGoFiles | packages.NeedImports | packages.NeedDeps | packages.NeedModule,
+		BuildFlags: buildFlags,
+	}, importpath)
 	if err != nil {
 		return nil, err
 	}
@@ -101,10 +102,10 @@ func buildGraph(importpaths ...string) (graph, error) {
 
 // CheckNoDependency checks that the given import paths (ip) does not
 // depend (transitively) on certain banned imports.
-func CheckNoDependency(ip string, banned []string) error {
-	g, err := buildGraph(ip)
+func CheckNoDependency(ip string, banned []string, buildFlags ...string) error {
+	g, err := buildGraph(ip, buildFlags...)
 	if err != nil {
-		return fmt.Errorf("buildGraph(queue) = %w", err)
+		return fmt.Errorf("buildGraph(%q) = %w", ip, err)
 	}
 	for _, dip := range banned {
 		if g.contains(dip) {
@@ -117,11 +118,11 @@ func CheckNoDependency(ip string, banned []string) error {
 
 // AssertNoDependency checks that the given import paths (the keys) do not
 // depend (transitively) on certain banned imports (the values)
-func AssertNoDependency(t *testing.T, banned map[string][]string) {
+func AssertNoDependency(t *testing.T, banned map[string][]string, buildFlags ...string) {
 	t.Helper()
 	for ip, banned := range banned {
 		t.Run(ip, func(t *testing.T) {
-			if err := CheckNoDependency(ip, banned); err != nil {
+			if err := CheckNoDependency(ip, banned, buildFlags...); err != nil {
 				t.Error("CheckNoDependency() =", err)
 			}
 		})
@@ -133,10 +134,10 @@ func AssertNoDependency(t *testing.T, banned map[string][]string) {
 // Note: while perhaps counterintuitive we allow the value to be a superset
 // of the actual imports to that folks can use a constant that holds blessed
 // import paths.
-func CheckOnlyDependencies(ip string, allowed map[string]struct{}) error {
-	g, err := buildGraph(ip)
+func CheckOnlyDependencies(ip string, allowed map[string]struct{}, buildFlags ...string) error {
+	g, err := buildGraph(ip, buildFlags...)
 	if err != nil {
-		return fmt.Errorf("buildGraph(queue) = %w", err)
+		return fmt.Errorf("buildGraph(%q) = %w", ip, err)
 	}
 	for _, name := range g.order() {
 		if _, ok := allowed[name]; !ok {
@@ -152,7 +153,7 @@ func CheckOnlyDependencies(ip string, allowed map[string]struct{}) error {
 // Note: while perhaps counterintuitive we allow the value to be a superset
 // of the actual imports to that folks can use a constant that holds blessed
 // import paths.
-func AssertOnlyDependencies(t *testing.T, allowed map[string][]string) {
+func AssertOnlyDependencies(t *testing.T, allowed map[string][]string, buildFlags ...string) {
 	t.Helper()
 	for ip, allow := range allowed {
 		// Always include our own package in the set of allowed dependencies.
@@ -161,7 +162,7 @@ func AssertOnlyDependencies(t *testing.T, allowed map[string][]string) {
 			allowed[x] = struct{}{}
 		}
 		t.Run(ip, func(t *testing.T) {
-			if err := CheckOnlyDependencies(ip, allowed); err != nil {
+			if err := CheckOnlyDependencies(ip, allowed, buildFlags...); err != nil {
 				t.Error("CheckOnlyDependencies() =", err)
 			}
 		})
diff --git a/vendor/knative.dev/pkg/injection/sharedmain/main.go b/vendor/knative.dev/pkg/injection/sharedmain/main.go
index 72cab9496..b2067bb1b 100644
--- a/vendor/knative.dev/pkg/injection/sharedmain/main.go
+++ b/vendor/knative.dev/pkg/injection/sharedmain/main.go
@@ -38,7 +38,7 @@ import (
 	"k8s.io/client-go/rest"
 
 	kubeclient "knative.dev/pkg/client/injection/kube/client"
-	"knative.dev/pkg/configmap"
+	cminformer "knative.dev/pkg/configmap/informer"
 	"knative.dev/pkg/controller"
 	"knative.dev/pkg/injection"
 	"knative.dev/pkg/leaderelection"
@@ -290,12 +290,12 @@ func CheckK8sClientMinimumVersionOrDie(ctx context.Context, logger *zap.SugaredL
 
 // SetupConfigMapWatchOrDie establishes a watch of the configmaps in the system
 // namespace that are labeled to be watched or dies by calling log.Fatalw.
-func SetupConfigMapWatchOrDie(ctx context.Context, logger *zap.SugaredLogger) *configmap.InformedWatcher {
+func SetupConfigMapWatchOrDie(ctx context.Context, logger *zap.SugaredLogger) *cminformer.InformedWatcher {
 	kc := kubeclient.Get(ctx)
 	// Create ConfigMaps watcher with optional label-based filter.
 	var cmLabelReqs []labels.Requirement
 	if cmLabel := system.ResourceLabel(); cmLabel != "" {
-		req, err := configmap.FilterConfigByLabelExists(cmLabel)
+		req, err := cminformer.FilterConfigByLabelExists(cmLabel)
 		if err != nil {
 			logger.Fatalw("Failed to generate requirement for label "+cmLabel, zap.Error(err))
 		}
@@ -303,13 +303,13 @@ func SetupConfigMapWatchOrDie(ctx context.Context, logger *zap.SugaredLogger) *c
 		cmLabelReqs = append(cmLabelReqs, *req)
 	}
 	// TODO(mattmoor): This should itself take a context and be injection-based.
-	return configmap.NewInformedWatcher(kc, system.Namespace(), cmLabelReqs...)
+	return cminformer.NewInformedWatcher(kc, system.Namespace(), cmLabelReqs...)
 }
 
 // WatchLoggingConfigOrDie establishes a watch of the logging config or dies by
 // calling log.Fatalw. Note, if the config does not exist, it will be defaulted
 // and this method will not die.
-func WatchLoggingConfigOrDie(ctx context.Context, cmw *configmap.InformedWatcher, logger *zap.SugaredLogger, atomicLevel zap.AtomicLevel, component string) {
+func WatchLoggingConfigOrDie(ctx context.Context, cmw *cminformer.InformedWatcher, logger *zap.SugaredLogger, atomicLevel zap.AtomicLevel, component string) {
 	if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(ctx, logging.ConfigMapName(),
 		metav1.GetOptions{}); err == nil {
 		cmw.Watch(logging.ConfigMapName(), logging.UpdateLevelFromConfigMap(logger, atomicLevel, component))
@@ -321,7 +321,7 @@ func WatchLoggingConfigOrDie(ctx context.Context, cmw *configmap.InformedWatcher
 // WatchObservabilityConfigOrDie establishes a watch of the observability config
 // or dies by calling log.Fatalw. Note, if the config does not exist, it will be
 // defaulted and this method will not die.
-func WatchObservabilityConfigOrDie(ctx context.Context, cmw *configmap.InformedWatcher, profilingHandler *profiling.Handler, logger *zap.SugaredLogger, component string) {
+func WatchObservabilityConfigOrDie(ctx context.Context, cmw *cminformer.InformedWatcher, profilingHandler *profiling.Handler, logger *zap.SugaredLogger, component string) {
 	if _, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(ctx, metrics.ConfigMapName(),
 		metav1.GetOptions{}); err == nil {
 		cmw.Watch(metrics.ConfigMapName(),
@@ -351,7 +351,7 @@ func SecretFetcher(ctx context.Context) metrics.SecretFetcher {
 // ControllersAndWebhooksFromCtors returns a list of the controllers and a list
 // of the webhooks created from the given constructors.
 func ControllersAndWebhooksFromCtors(ctx context.Context,
-	cmw *configmap.InformedWatcher,
+	cmw *cminformer.InformedWatcher,
 	ctors ...injection.ControllerConstructor) ([]*controller.Impl, []interface{}) {
 
 	// Check whether the context has been infused with a leader elector builder.
diff --git a/vendor/knative.dev/pkg/metrics/config.go b/vendor/knative.dev/pkg/metrics/config.go
index d4ae24ad5..c4c9c7f84 100644
--- a/vendor/knative.dev/pkg/metrics/config.go
+++ b/vendor/knative.dev/pkg/metrics/config.go
@@ -22,7 +22,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"strconv"
 	"strings"
 	"time"
@@ -65,6 +64,12 @@ const (
 	prometheusHostEnvName = "METRICS_PROMETHEUS_HOST"
 )
 
+var (
+	// TestOverrideBundleCount is a variable for testing to reduce the size (number of metrics) buffered before
+	// Stackdriver will send a bundled metric report. Only applies if non-zero.
+	TestOverrideBundleCount = 0
+)
+
 // Metrics backend "enum".
 const (
 	// stackdriver is used for Stackdriver backend
@@ -208,7 +213,7 @@ func createMetricsConfig(ctx context.Context, ops ExporterOptions) (*metricsConf
 	}
 
 	switch lb := metricsBackend(strings.ToLower(backend)); lb {
-	case stackdriver, prometheus, openCensus:
+	case stackdriver, prometheus, openCensus, none:
 		mc.backendDestination = lb
 	default:
 		return nil, fmt.Errorf("unsupported metrics backend value %q", backend)
@@ -248,37 +253,8 @@ func createMetricsConfig(ctx context.Context, ops ExporterOptions) (*metricsConf
 		mc.prometheusPort = pp
 		mc.prometheusHost = prometheusHost()
 	case stackdriver:
-		// If stackdriverClientConfig is not provided for stackdriver backend destination, OpenCensus will try to
-		// use the application default credentials. If that is not available, Opencensus would fail to create the
-		// metrics exporter.
-		scc := NewStackdriverClientConfigFromMap(m)
-		mc.stackdriverClientConfig = *scc
-		mc.isStackdriverBackend = true
-		var allowCustomMetrics bool
-		var err error
-		mc.stackdriverMetricTypePrefix = path.Join(mc.domain, mc.component)
-
-		customMetricsSubDomain := m[stackdriverCustomMetricSubDomainKey]
-		if customMetricsSubDomain == "" {
-			customMetricsSubDomain = defaultCustomMetricSubDomain
-		}
-		mc.stackdriverCustomMetricTypePrefix = path.Join(customMetricTypePrefix, customMetricsSubDomain, mc.component)
-		if ascmStr := m[allowStackdriverCustomMetricsKey]; ascmStr != "" {
-			allowCustomMetrics, err = strconv.ParseBool(ascmStr)
-			if err != nil {
-				return nil, fmt.Errorf("invalid %s value %q", allowStackdriverCustomMetricsKey, ascmStr)
-			}
-		}
-
-		mc.recorder = sdCustomMetricsRecorder(mc, allowCustomMetrics)
-
-		if scc.UseSecret {
-			secret, err := getStackdriverSecret(ctx, ops.Secrets)
-			if err != nil {
-				return nil, err
-			}
-
-			mc.secret = secret
+		if err := sdinit(ctx, m, &mc, ops); err != nil {
+			return nil, err
 		}
 	}
 
diff --git a/vendor/knative.dev/pkg/metrics/config_observability.go b/vendor/knative.dev/pkg/metrics/config_observability.go
index ae622c928..2c320bbff 100644
--- a/vendor/knative.dev/pkg/metrics/config_observability.go
+++ b/vendor/knative.dev/pkg/metrics/config_observability.go
@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	// The following is used to set the default log url template
+	// DefaultLogURLTemplate is used to set the default log url template
 	DefaultLogURLTemplate = ""
 
 	// DefaultRequestLogTemplate is the default format for emitting request logs.
diff --git a/vendor/knative.dev/pkg/metrics/exporter.go b/vendor/knative.dev/pkg/metrics/exporter.go
index 0c680106e..b98a18de1 100644
--- a/vendor/knative.dev/pkg/metrics/exporter.go
+++ b/vendor/knative.dev/pkg/metrics/exporter.go
@@ -23,6 +23,7 @@ import (
 	"strings"
 	"sync"
 
+	"go.opencensus.io/resource"
 	"go.opencensus.io/stats/view"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
@@ -161,13 +162,13 @@ func UpdateExporter(ctx context.Context, ops ExporterOptions, logger *zap.Sugare
 		flushGivenExporter(curMetricsExporter)
 		e, f, err := newMetricsExporter(newConfig, logger)
 		if err != nil {
-			logger.Errorw("Failed to update a new metrics exporter based on metric config", newConfig, zap.Error(err))
+			logger.Errorw("Failed to update a new metrics exporter based on metric config", zap.Error(err), "config", newConfig)
 			return err
 		}
 		existingConfig := curMetricsConfig
 		curMetricsExporter = e
 		if err := setFactory(f); err != nil {
-			logger.Errorw("Failed to update metrics factory when loading metric config", newConfig, zap.Error(err))
+			logger.Errorw("Failed to update metrics factory when loading metric config", zap.Error(err), "config", newConfig)
 			return err
 		}
 		logger.Infof("Successfully updated the metrics exporter; old config: %v; new config %v", existingConfig, newConfig)
@@ -212,7 +213,10 @@ func newMetricsExporter(config *metricsConfig, logger *zap.SugaredLogger) (view.
 		openCensus:  newOpenCensusExporter,
 		prometheus:  newPrometheusExporter,
 		none: func(*metricsConfig, *zap.SugaredLogger) (view.Exporter, ResourceExporterFactory, error) {
-			return nil, nil, nil
+			noneFactory := func(*resource.Resource) (view.Exporter, error) {
+				return &noneExporter{}, nil
+			}
+			return &noneExporter{}, noneFactory, nil
 		},
 	}
 
@@ -272,3 +276,10 @@ func flushGivenExporter(e view.Exporter) bool {
 	}
 	return false
 }
+
+type noneExporter struct {
+}
+
+// NoneExporter implements view.Exporter in the nil case.
+func (*noneExporter) ExportView(*view.Data) {
+}
diff --git a/vendor/knative.dev/pkg/metrics/gcp_metadata.go b/vendor/knative.dev/pkg/metrics/gcp_metadata.go
index ec6ae878e..3c1a6a09a 100644
--- a/vendor/knative.dev/pkg/metrics/gcp_metadata.go
+++ b/vendor/knative.dev/pkg/metrics/gcp_metadata.go
@@ -1,3 +1,5 @@
+// +build !nostackdriver
+
 /*
 Copyright 2019 The Knative Authors
 
diff --git a/vendor/knative.dev/pkg/metrics/nostackdriver.go b/vendor/knative.dev/pkg/metrics/nostackdriver.go
new file mode 100644
index 000000000..b5c71eb77
--- /dev/null
+++ b/vendor/knative.dev/pkg/metrics/nostackdriver.go
@@ -0,0 +1,35 @@
+// +build nostackdriver
+
+/*
+Copyright 2019 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package metrics
+
+import (
+	"context"
+	"errors"
+
+	"go.opencensus.io/stats/view"
+	"go.uber.org/zap"
+)
+
+func sdinit(ctx context.Context, m map[string]string, mc *metricsConfig, ops ExporterOptions) error {
+	return errors.New("Stackdriver support is not included")
+}
+
+func newStackdriverExporter(config *metricsConfig, logger *zap.SugaredLogger) (view.Exporter, ResourceExporterFactory, error) {
+	return nil, nil, errors.New("Stackdriver support is not included")
+}
diff --git a/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go
index ab14ef266..a875accef 100644
--- a/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go
+++ b/vendor/knative.dev/pkg/metrics/stackdriver_exporter.go
@@ -1,3 +1,5 @@
+// +build !nostackdriver
+
 /*
 Copyright 2019 The Knative Authors
 
@@ -20,6 +22,7 @@ import (
 	"context"
 	"fmt"
 	"path"
+	"strconv"
 	"sync"
 	"time"
 
@@ -88,10 +91,6 @@ var (
 	// metricToResourceLabels provides a quick lookup from a custom metric name to the set of tags
 	// which should be promoted to Stackdriver Resource labels via opencensus resources.
 	metricToResourceLabels = map[string]*resourceTemplate{}
-
-	// TestOverrideBundleCount is a variable for testing to reduce the size (number of metrics) buffered before
-	// Stackdriver will send a bundled metric report. Only applies if non-zero.
-	TestOverrideBundleCount = 0
 )
 
 type resourceTemplate struct {
@@ -99,6 +98,42 @@ type resourceTemplate struct {
 	LabelKeys sets.String
 }
 
+func sdinit(ctx context.Context, m map[string]string, mc *metricsConfig, ops ExporterOptions) error {
+	// If stackdriverClientConfig is not provided for stackdriver backend destination, OpenCensus will try to
+	// use the application default credentials. If that is not available, Opencensus would fail to create the
+	// metrics exporter.
+	scc := NewStackdriverClientConfigFromMap(m)
+	mc.stackdriverClientConfig = *scc
+	mc.isStackdriverBackend = true
+	var allowCustomMetrics bool
+	var err error
+	mc.stackdriverMetricTypePrefix = path.Join(mc.domain, mc.component)
+
+	customMetricsSubDomain := m[stackdriverCustomMetricSubDomainKey]
+	if customMetricsSubDomain == "" {
+		customMetricsSubDomain = defaultCustomMetricSubDomain
+	}
+	mc.stackdriverCustomMetricTypePrefix = path.Join(customMetricTypePrefix, customMetricsSubDomain, mc.component)
+	if ascmStr := m[allowStackdriverCustomMetricsKey]; ascmStr != "" {
+		allowCustomMetrics, err = strconv.ParseBool(ascmStr)
+		if err != nil {
+			return fmt.Errorf("invalid %s value %q", allowStackdriverCustomMetricsKey, ascmStr)
+		}
+	}
+
+	mc.recorder = sdCustomMetricsRecorder(*mc, allowCustomMetrics)
+
+	if scc.UseSecret {
+		secret, err := getStackdriverSecret(ctx, ops.Secrets)
+		if err != nil {
+			return err
+		}
+
+		mc.secret = secret
+	}
+	return nil
+}
+
 // SetStackdriverSecretLocation sets the name and namespace of the Secret that can be used to authenticate with Stackdriver.
 // The Secret is only used if both:
 // 1. This function has been explicitly called to set the name and namespace
diff --git a/vendor/knative.dev/pkg/tracing/nostackdriver.go b/vendor/knative.dev/pkg/tracing/nostackdriver.go
new file mode 100644
index 000000000..f504c1ffd
--- /dev/null
+++ b/vendor/knative.dev/pkg/tracing/nostackdriver.go
@@ -0,0 +1,30 @@
+// +build nostackdriver
+
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tracing
+
+import (
+	"errors"
+
+	"go.opencensus.io/trace"
+	"knative.dev/pkg/tracing/config"
+)
+
+func newStackdriver(cfg *config.Config) (trace.Exporter, error) {
+	return nil, errors.New("Stackdriver is not configured")
+}
diff --git a/vendor/knative.dev/pkg/tracing/opencensus.go b/vendor/knative.dev/pkg/tracing/opencensus.go
index 4346593ba..fbe27c048 100644
--- a/vendor/knative.dev/pkg/tracing/opencensus.go
+++ b/vendor/knative.dev/pkg/tracing/opencensus.go
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 package tracing
 
 import (
@@ -7,9 +23,8 @@ import (
 	"os"
 	"sync"
 
-	"contrib.go.opencensus.io/exporter/stackdriver"
 	oczipkin "contrib.go.opencensus.io/exporter/zipkin"
-	zipkin "github.com/openzipkin/zipkin-go"
+	"github.com/openzipkin/zipkin-go"
 	httpreporter "github.com/openzipkin/zipkin-go/reporter/http"
 	"go.opencensus.io/trace"
 	"go.uber.org/zap"
@@ -128,17 +143,14 @@ func WithExporterFull(name, host string, logger *zap.SugaredLogger) ConfigOption
 		var (
 			exporter trace.Exporter
 			closer   io.Closer
+			err      error
 		)
 		switch cfg.Backend {
 		case config.Stackdriver:
-			exp, err := stackdriver.NewExporter(stackdriver.Options{
-				ProjectID: cfg.StackdriverProjectID,
-			})
+			exporter, err = newStackdriver(cfg)
 			if err != nil {
-				logger.Errorw("error reading project-id from metadata", zap.Error(err))
 				return err
 			}
-			exporter = exp
 		case config.Zipkin:
 			// If host isn't specified, then zipkin.NewEndpoint will return an error saying that it
 			// can't find the host named ''. So, if not specified, default it to this machine's
@@ -161,6 +173,7 @@ func WithExporterFull(name, host string, logger *zap.SugaredLogger) ConfigOption
 			reporter := httpreporter.NewReporter(cfg.ZipkinEndpoint)
 			exporter = oczipkin.NewExporter(reporter, zipEP)
 			closer = reporter
+
 		default:
 			// Disables tracing.
 		}
diff --git a/vendor/knative.dev/pkg/tracing/setup.go b/vendor/knative.dev/pkg/tracing/setup.go
index 503e424e3..c5de76489 100644
--- a/vendor/knative.dev/pkg/tracing/setup.go
+++ b/vendor/knative.dev/pkg/tracing/setup.go
@@ -42,7 +42,7 @@ func SetupStaticPublishing(logger *zap.SugaredLogger, serviceName string, cfg *c
 // just ensures that if generated, they are collected appropriately. This is normally done by using
 // tracing.HTTPSpanMiddleware as a middleware HTTP handler. The configuration will be dynamically
 // updated when the ConfigMap is updated.
-func SetupDynamicPublishing(logger *zap.SugaredLogger, configMapWatcher *configmap.InformedWatcher, serviceName, tracingConfigName string) error {
+func SetupDynamicPublishing(logger *zap.SugaredLogger, configMapWatcher configmap.Watcher, serviceName, tracingConfigName string) error {
 	oct := NewOpenCensusTracer(WithExporter(serviceName, logger))
 
 	tracerUpdater := func(name string, value interface{}) {
diff --git a/vendor/knative.dev/pkg/tracing/stackdriver.go b/vendor/knative.dev/pkg/tracing/stackdriver.go
new file mode 100644
index 000000000..b8986a2a7
--- /dev/null
+++ b/vendor/knative.dev/pkg/tracing/stackdriver.go
@@ -0,0 +1,31 @@
+// +build !nostackdriver
+
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package tracing
+
+import (
+	"contrib.go.opencensus.io/exporter/stackdriver"
+	"go.opencensus.io/trace"
+	"knative.dev/pkg/tracing/config"
+)
+
+func newStackdriver(cfg *config.Config) (trace.Exporter, error) {
+	return stackdriver.NewExporter(stackdriver.Options{
+		ProjectID: cfg.StackdriverProjectID,
+	})
+}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 2018b082e..a47bb01de 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -963,7 +963,7 @@ k8s.io/utils/buffer
 k8s.io/utils/integer
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# knative.dev/caching v0.0.0-20201217015204-c3efd692dc36
+# knative.dev/caching v0.0.0-20201221023403-116224f358cd
 ## explicit
 knative.dev/caching/config
 knative.dev/caching/pkg/apis/caching
@@ -987,7 +987,7 @@ knative.dev/caching/pkg/client/listers/caching/v1alpha1
 # knative.dev/hack v0.0.0-20201214230143-4ed1ecb8db24
 ## explicit
 knative.dev/hack
-# knative.dev/networking v0.0.0-20201217015204-ceef42482365
+# knative.dev/networking v0.0.0-20201223042504-b9e08949dfbc
 ## explicit
 knative.dev/networking/config
 knative.dev/networking/pkg
@@ -1021,7 +1021,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-20201217152402-7226f4f447a8
+# knative.dev/pkg v0.0.0-20201224024804-27db5ac24cfb
 ## explicit
 knative.dev/pkg/apiextensions/storageversion
 knative.dev/pkg/apiextensions/storageversion/cmd/migrate
@@ -1065,6 +1065,7 @@ knative.dev/pkg/codegen/cmd/injection-gen/args
 knative.dev/pkg/codegen/cmd/injection-gen/generators
 knative.dev/pkg/configmap
 knative.dev/pkg/configmap/hash-gen
+knative.dev/pkg/configmap/informer
 knative.dev/pkg/configmap/testing
 knative.dev/pkg/controller
 knative.dev/pkg/depcheck


Test patch:
diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml
index 242a60249..5a4ff8fce 100644
--- a/.github/workflows/kind-e2e.yaml
+++ b/.github/workflows/kind-e2e.yaml
@@ -56,6 +56,7 @@ jobs:
     env:
       GOPATH: ${{ github.workspace }}
       GO111MODULE: off
+      GOFLAGS: -tags=nostackdriver
       # https://github.com/google/go-containerregistry/pull/125 allows insecure registry for
       # '*.local' hostnames. This works both for `ko` and our own tag-to-digest resolution logic,
       # thus allowing us to test without bypassing tag-to-digest resolution.
@@ -72,7 +73,11 @@ jobs:
     - name: Install Dependencies
       working-directory: ./
       run: |
-        GO111MODULE=on go get github.com/google/ko/cmd/ko@master
+        echo '::group:: install ko'
+        curl -L https://github.com/google/ko/releases/download/v0.6.0/ko_0.6.0_Linux_x86_64.tar.gz | tar xzf - ko
+        chmod +x ./ko
+        sudo mv ko /usr/local/bin
+        echo '::endgroup::'
 
     - name: Check out code onto GOPATH
       uses: actions/checkout@v2
diff --git a/cmd/queue/nodeps_test.go b/cmd/queue/nodeps_test.go
index df27958df..41b4889c1 100644
--- a/cmd/queue/nodeps_test.go
+++ b/cmd/queue/nodeps_test.go
@@ -24,11 +24,6 @@ import (
 
 func TestNoDeps(t *testing.T) {
 	depcheck.AssertNoDependency(t, map[string][]string{
-		"knative.dev/serving/cmd/queue": {
-			"k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			// TODO(https://github.com/knative/serving/issues/9957): Remove these dependencies.
-			// "k8s.io/client-go/informers",
-			// "k8s.io/client-go/kubernetes",
-		},
-	})
+		"knative.dev/serving/cmd/queue": depcheck.KnownHeavyDependencies,
+	}, "-tags=nostackdriver")
 }
diff --git a/pkg/apis/serving/v1/route_lifecycle_test.go b/pkg/apis/serving/v1/route_lifecycle_test.go
index e2e60b926..28aed45b0 100644
--- a/pkg/apis/serving/v1/route_lifecycle_test.go
+++ b/pkg/apis/serving/v1/route_lifecycle_test.go
@@ -479,3 +479,11 @@ func TestIngressNotConfigured(t *testing.T) {
 
 	apistest.CheckConditionOngoing(r, RouteConditionIngressReady, t)
 }
+
+func TestMarkInRollout(t *testing.T) {
+	r := &RouteStatus{}
+	r.InitializeConditions()
+	r.MarkIngressRolloutInProgress()
+
+	apistest.CheckConditionOngoing(r, RouteConditionIngressReady, t)
+}
diff --git a/pkg/apis/serving/v1/route_validation_test.go b/pkg/apis/serving/v1/route_validation_test.go
index fd11b664a..aa31383e0 100644
--- a/pkg/apis/serving/v1/route_validation_test.go
+++ b/pkg/apis/serving/v1/route_validation_test.go
@@ -191,14 +191,6 @@ func TestTrafficTargetValidation(t *testing.T) {
 			return WithDefaultConfigurationName(apis.WithinSpec(ctx))
 		},
 		want: apis.ErrGeneric(`may not set revisionName "" when latestRevision is false`, "latestRevision"),
-	}, {
-		name: "invalid without revisionName in status",
-		tt: &TrafficTarget{
-			ConfigurationName: "blah",
-			Percent:           ptr.Int64(37),
-		},
-		wc:   apis.WithinStatus,
-		want: apis.ErrMissingField("revisionName"),
 	}, {
 		name: "valid with revisionName and default configurationName",
 		tt: &TrafficTarget{
@@ -364,35 +356,6 @@ func TestRouteValidation(t *testing.T) {
 			},
 		},
 		want: nil,
-	}, {
-		name: "missing url in status",
-		r: &Route{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "valid",
-			},
-			Spec: RouteSpec{
-				Traffic: []TrafficTarget{{
-					Tag:          "bar",
-					RevisionName: "foo",
-					Percent:      ptr.Int64(100),
-				}},
-			},
-			Status: RouteStatus{
-				RouteStatusFields: RouteStatusFields{
-					Traffic: []TrafficTarget{{
-						Tag:          "bar",
-						RevisionName: "foo",
-						Percent:      ptr.Int64(100),
-					}},
-				},
-			},
-		},
-		want: &apis.FieldError{
-			Message: "missing field(s)",
-			Paths: []string{
-				"status.traffic[0].url",
-			},
-		},
 	}, {
 		name: "invalid traffic entry (missing oneof)",
 		r: &Route{
diff --git a/pkg/apis/serving/v1/service_validation_test.go b/pkg/apis/serving/v1/service_validation_test.go
index db90b92ba..38616c2b5 100644
--- a/pkg/apis/serving/v1/service_validation_test.go
+++ b/pkg/apis/serving/v1/service_validation_test.go
@@ -581,50 +581,6 @@ func TestServiceSubresourceUpdate(t *testing.T) {
 		},
 		subresource: "status",
 		want:        nil,
-	}, {
-		name: "status update with invalid status",
-		service: &Service{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: "valid",
-			},
-			Spec: ServiceSpec{
-				ConfigurationSpec: ConfigurationSpec{
-					Template: RevisionTemplateSpec{
-						Spec: RevisionSpec{
-							PodSpec: corev1.PodSpec{
-								Containers: []corev1.Container{{
-									Image: "helloworld:foo",
-								}},
-							},
-							TimeoutSeconds: ptr.Int64(config.DefaultMaxRevisionTimeoutSeconds + 1),
-						},
-					},
-				},
-				RouteSpec: RouteSpec{
-					Traffic: []TrafficTarget{{
-						LatestRevision: ptr.Bool(true),
-						Percent:        ptr.Int64(100),
-					}},
-				},
-			},
-			Status: ServiceStatus{
-				RouteStatusFields: RouteStatusFields{
-					Traffic: []TrafficTarget{{
-						Tag:          "bar",
-						RevisionName: "foo",
-						Percent:      ptr.Int64(50), URL: &apis.URL{
-							Scheme: "http",
-							Host:   "foo.bar.com",
-						},
-					}},
-				},
-			},
-		},
-		subresource: "status",
-		want: &apis.FieldError{
-			Message: "Traffic targets sum to 50, want 100",
-			Paths:   []string{"status.traffic"},
-		},
 	}, {
 		name: "non-status sub resource update with valid revision template",
 		service: &Service{
diff --git a/pkg/apis/serving/v1alpha1/domainmapping_validation_test.go b/pkg/apis/serving/v1alpha1/domainmapping_validation_test.go
index 2aa466dba..8ad625a8a 100644
--- a/pkg/apis/serving/v1alpha1/domainmapping_validation_test.go
+++ b/pkg/apis/serving/v1alpha1/domainmapping_validation_test.go
@@ -33,8 +33,26 @@ func TestDomainMappingValidation(t *testing.T) {
 		dm   *DomainMapping
 		want *apis.FieldError
 	}{{
+		name: "invalid name",
+		want: apis.ErrGeneric("invalid name \"invalid\": name: Invalid value: \"invalid\": should be a domain with at least two segments separated by dots", "metadata.name"),
+		dm: &DomainMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "invalid",
+				Namespace: "ns",
+			},
+			Spec: DomainMappingSpec{
+				Ref: duckv1.KReference{
+					Name:       "some-name.example.com",
+					APIVersion: "serving.knative.dev/v1",
+					Kind:       "Service",
+					Namespace:  "ns",
+				},
+			},
+		},
+	}, {
 		name: "uses GenerateName rather than Name",
-		want: apis.ErrDisallowedFields("metadata.generateName"),
+		want: apis.ErrDisallowedFields("metadata.generateName").Also(
+			apis.ErrGeneric("invalid name \"\": name: Required value", "metadata.name")),
 		dm: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
 				GenerateName: "cant-use-this",
@@ -42,7 +60,7 @@ func TestDomainMappingValidation(t *testing.T) {
 			},
 			Spec: DomainMappingSpec{
 				Ref: duckv1.KReference{
-					Name:       "some-name",
+					Name:       "some-name.example.com",
 					APIVersion: "serving.knative.dev/v1",
 					Kind:       "Service",
 					Namespace:  "ns",
@@ -58,7 +76,7 @@ func TestDomainMappingValidation(t *testing.T) {
 		},
 		dm: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "wrong-ref-ns",
+				Name:      "wrong-ref-ns.example.com",
 				Namespace: "good-namespace",
 			},
 			Spec: DomainMappingSpec{
@@ -75,7 +93,7 @@ func TestDomainMappingValidation(t *testing.T) {
 		want: apis.ErrMissingField("spec.ref.kind"),
 		dm: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "wrong-kind",
+				Name:      "wrong-kind.example.com",
 				Namespace: "ns",
 			},
 			Spec: DomainMappingSpec{
@@ -91,7 +109,7 @@ func TestDomainMappingValidation(t *testing.T) {
 		want: apis.ErrMissingField("spec.ref.apiVersion"),
 		dm: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "wrong-version",
+				Name:      "wrong-version.example.com",
 				Namespace: "ns",
 			},
 			Spec: DomainMappingSpec{
@@ -108,6 +126,7 @@ func TestDomainMappingValidation(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			ctx := context.Background()
 			got := test.dm.Validate(ctx)
+
 			if !cmp.Equal(test.want.Error(), got.Error()) {
 				t.Errorf("Validate (-want, +got):\n%s", cmp.Diff(test.want.Error(), got.Error()))
 			}
@@ -140,7 +159,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		name: "update creator annotation",
 		this: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u2,
@@ -151,7 +170,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		},
 		prev: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u1,
@@ -166,7 +185,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		name: "update creator annotation with spec changes",
 		this: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u2,
@@ -177,7 +196,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		},
 		prev: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u1,
@@ -192,7 +211,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		name: "update lastModifier annotation without spec changes",
 		this: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u1,
@@ -203,7 +222,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		},
 		prev: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u1,
@@ -217,7 +236,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		name: "update lastModifier annotation with spec changes",
 		this: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u1,
@@ -228,7 +247,7 @@ func TestDomainMappingAnnotationUpdate(t *testing.T) {
 		},
 		prev: &DomainMapping{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:      "valid",
+				Name:      "valid.example.com",
 				Namespace: "ns",
 				Annotations: map[string]string{
 					serving.CreatorAnnotation: u1,
diff --git a/pkg/reconciler/domainmapping/resources/certificate_test.go b/pkg/reconciler/domainmapping/resources/certificate_test.go
new file mode 100644
index 000000000..0a860077e
--- /dev/null
+++ b/pkg/reconciler/domainmapping/resources/certificate_test.go
@@ -0,0 +1,116 @@
+/*
+Copyright 2020 The Knative Authors
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resources
+
+import (
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	networkingv1alpha1 "knative.dev/networking/pkg/apis/networking/v1alpha1"
+	duckv1 "knative.dev/pkg/apis/duck/v1"
+	"knative.dev/pkg/kmeta"
+	"knative.dev/serving/pkg/apis/serving"
+	"knative.dev/serving/pkg/apis/serving/v1alpha1"
+	// . "knative.dev/serving/pkg/testing/v1"
+)
+
+func TestMakeCertificate(t *testing.T) {
+	certClass := "cert-class"
+	for _, tc := range []struct {
+		name string
+		dm   v1alpha1.DomainMapping
+		want networkingv1alpha1.Certificate
+	}{{
+		name: "basic",
+		dm: v1alpha1.DomainMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+			},
+			Spec: v1alpha1.DomainMappingSpec{
+				Ref: duckv1.KReference{
+					Namespace: "the-namespace",
+					Name:      "the-name",
+				},
+			},
+		},
+		want: networkingv1alpha1.Certificate{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:        "mapping.com",
+				Namespace:   "the-namespace",
+				Annotations: map[string]string{"networking.knative.dev/certificate.class": certClass},
+				Labels: map[string]string{
+					serving.DomainMappingLabelKey: "mapping.com",
+				},
+			},
+			Spec: networkingv1alpha1.CertificateSpec{
+				DNSNames: []string{
+					"mapping.com",
+				},
+				SecretName: "mapping.com",
+			},
+		},
+	}, {
+		name: "filter last-applied",
+		dm: v1alpha1.DomainMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					corev1.LastAppliedConfigAnnotation: "filtered",
+					"others":                           "kept",
+				},
+			},
+			Spec: v1alpha1.DomainMappingSpec{
+				Ref: duckv1.KReference{
+					Namespace: "the-namespace",
+					Name:      "the-name",
+				},
+			},
+		},
+		want: networkingv1alpha1.Certificate{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					"networking.knative.dev/certificate.class": certClass,
+					"others": "kept",
+				},
+				Labels: map[string]string{
+					serving.DomainMappingLabelKey: "mapping.com",
+				},
+			},
+			Spec: networkingv1alpha1.CertificateSpec{
+				DNSNames: []string{
+					"mapping.com",
+				},
+				SecretName: "mapping.com",
+			},
+		},
+	}} {
+		t.Run(tc.name, func(t *testing.T) {
+			tc.want.OwnerReferences = []metav1.OwnerReference{*kmeta.NewControllerRef(&tc.dm)}
+			got := *MakeCertificate(&tc.dm, certClass)
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("Unexpected certificate (-want, +got):\n%v", diff)
+			}
+		})
+	}
+}
diff --git a/pkg/reconciler/domainmapping/resources/ingress_test.go b/pkg/reconciler/domainmapping/resources/ingress_test.go
index c3120d451..9ae832ef1 100644
--- a/pkg/reconciler/domainmapping/resources/ingress_test.go
+++ b/pkg/reconciler/domainmapping/resources/ingress_test.go
@@ -25,66 +25,211 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	network "knative.dev/networking/pkg"
 	netv1alpha1 "knative.dev/networking/pkg/apis/networking/v1alpha1"
+	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	"knative.dev/pkg/kmeta"
+	"knative.dev/serving/pkg/apis/serving"
 	"knative.dev/serving/pkg/apis/serving/v1alpha1"
 )
 
 func TestMakeIngress(t *testing.T) {
-	dm := &v1alpha1.DomainMapping{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "mapping.com",
-			Namespace: "the-namespace",
-			Annotations: map[string]string{
-				"some.annotation":                  "some.value",
-				corev1.LastAppliedConfigAnnotation: "blah",
+	for _, tc := range []struct {
+		name           string
+		dm             v1alpha1.DomainMapping
+		want           netv1alpha1.Ingress
+		tls            []netv1alpha1.IngressTLS
+		acmeChallenges []netv1alpha1.HTTP01Challenge
+	}{{
+		name: "basic",
+		dm: v1alpha1.DomainMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					"some.annotation":                  "some.value",
+					corev1.LastAppliedConfigAnnotation: "blah",
+				},
+			},
+			Spec: v1alpha1.DomainMappingSpec{
+				Ref: duckv1.KReference{
+					Namespace: "the-namespace",
+					Name:      "the-name",
+				},
 			},
 		},
-		Spec: v1alpha1.DomainMappingSpec{
-			Ref: duckv1.KReference{
+		want: netv1alpha1.Ingress{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
 				Namespace: "the-namespace",
-				Name:      "the-name",
+				Annotations: map[string]string{
+					"networking.knative.dev/ingress.class": "the-ingress-class",
+					"some.annotation":                      "some.value",
+				},
+			},
+			Spec: netv1alpha1.IngressSpec{
+				Rules: []netv1alpha1.IngressRule{{
+					Hosts:      []string{"mapping.com"},
+					Visibility: netv1alpha1.IngressVisibilityExternalIP,
+					HTTP: &netv1alpha1.HTTPIngressRuleValue{
+						Paths: []netv1alpha1.HTTPIngressPath{{
+							RewriteHost: "the-rewrite-host",
+							Splits: []netv1alpha1.IngressBackendSplit{{
+								Percent: 100,
+								AppendHeaders: map[string]string{
+									network.OriginalHostHeader: "mapping.com",
+								},
+								IngressBackend: netv1alpha1.IngressBackend{
+									ServiceName:      "the-target-svc",
+									ServiceNamespace: "the-namespace",
+									ServicePort:      intstr.FromInt(80),
+								},
+							}},
+						}},
+					},
+				}},
 			},
 		},
-	}
-
-	got := MakeIngress(dm, "the-target-svc", "the-rewrite-host", "the-ingress-class")
-
-	want := &netv1alpha1.Ingress{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "mapping.com",
-			Namespace: "the-namespace",
-			Annotations: map[string]string{
-				"networking.knative.dev/ingress.class": "the-ingress-class",
-				"some.annotation":                      "some.value",
+	}, {
+		name: "tls",
+		dm: v1alpha1.DomainMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					"some.annotation":                  "some.value",
+					corev1.LastAppliedConfigAnnotation: "blah",
+				},
+			},
+			Spec: v1alpha1.DomainMappingSpec{
+				Ref: duckv1.KReference{
+					Namespace: "the-namespace",
+					Name:      "the-name",
+				},
 			},
-			OwnerReferences: []metav1.OwnerReference{*kmeta.NewControllerRef(dm)},
 		},
-		Spec: netv1alpha1.IngressSpec{
-			Rules: []netv1alpha1.IngressRule{{
-				Hosts:      []string{"mapping.com"},
-				Visibility: netv1alpha1.IngressVisibilityExternalIP,
-				HTTP: &netv1alpha1.HTTPIngressRuleValue{
-					Paths: []netv1alpha1.HTTPIngressPath{{
-						RewriteHost: "the-rewrite-host",
-						Splits: []netv1alpha1.IngressBackendSplit{{
-							Percent: 100,
-							AppendHeaders: map[string]string{
-								network.OriginalHostHeader: "mapping.com",
-							},
-							IngressBackend: netv1alpha1.IngressBackend{
-								ServiceName:      "the-target-svc",
-								ServiceNamespace: "the-namespace",
-								ServicePort:      intstr.FromInt(80),
-							},
+		tls: []netv1alpha1.IngressTLS{{
+			Hosts:      []string{"mapping.com"},
+			SecretName: "secret",
+		}},
+		want: netv1alpha1.Ingress{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					"networking.knative.dev/ingress.class": "the-ingress-class",
+					"some.annotation":                      "some.value",
+				},
+			},
+			Spec: netv1alpha1.IngressSpec{
+				Rules: []netv1alpha1.IngressRule{{
+					Hosts:      []string{"mapping.com"},
+					Visibility: netv1alpha1.IngressVisibilityExternalIP,
+					HTTP: &netv1alpha1.HTTPIngressRuleValue{
+						Paths: []netv1alpha1.HTTPIngressPath{{
+							RewriteHost: "the-rewrite-host",
+							Splits: []netv1alpha1.IngressBackendSplit{{
+								Percent: 100,
+								AppendHeaders: map[string]string{
+									network.OriginalHostHeader: "mapping.com",
+								},
+								IngressBackend: netv1alpha1.IngressBackend{
+									ServiceName:      "the-target-svc",
+									ServiceNamespace: "the-namespace",
+									ServicePort:      intstr.FromInt(80),
+								},
+							}},
 						}},
-					}},
+					},
+				}},
+				TLS: []netv1alpha1.IngressTLS{{
+					Hosts:      []string{"mapping.com"},
+					SecretName: "secret",
+				}},
+			},
+		},
+	}, {
+		name: "challenges",
+		dm: v1alpha1.DomainMapping{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					"some.annotation":                  "some.value",
+					corev1.LastAppliedConfigAnnotation: "blah",
 				},
-			}},
+			},
+			Spec: v1alpha1.DomainMappingSpec{
+				Ref: duckv1.KReference{
+					Namespace: "the-namespace",
+					Name:      "the-name",
+				},
+			},
 		},
+		acmeChallenges: []netv1alpha1.HTTP01Challenge{{
+			ServiceNamespace: "test-ns",
+			ServiceName:      "cm-solver",
+			ServicePort:      intstr.FromInt(8090),
+			URL: &apis.URL{
+				Scheme: "http",
+				Path:   "/.well-known/acme-challenge/challenge-token",
+				Host:   "mapping.com",
+			},
+		}},
+		want: netv1alpha1.Ingress{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "mapping.com",
+				Namespace: "the-namespace",
+				Annotations: map[string]string{
+					"networking.knative.dev/ingress.class": "the-ingress-class",
+					"some.annotation":                      "some.value",
+				},
+			},
+			Spec: netv1alpha1.IngressSpec{
+				Rules: []netv1alpha1.IngressRule{{
+					Hosts:      []string{"mapping.com"},
+					Visibility: netv1alpha1.IngressVisibilityExternalIP,
+					HTTP: &netv1alpha1.HTTPIngressRuleValue{
+						Paths: []netv1alpha1.HTTPIngressPath{{
+							RewriteHost: "the-rewrite-host",
+							Splits: []netv1alpha1.IngressBackendSplit{{
+								Percent: 100,
+								AppendHeaders: map[string]string{
+									network.OriginalHostHeader: "mapping.com",
+								},
+								IngressBackend: netv1alpha1.IngressBackend{
+									ServiceName:      "the-target-svc",
+									ServiceNamespace: "the-namespace",
+									ServicePort:      intstr.FromInt(80),
+								},
+							}},
+						}, {
+							Path: "/.well-known/acme-challenge/challenge-token",
+							Splits: []netv1alpha1.IngressBackendSplit{{
+								IngressBackend: netv1alpha1.IngressBackend{
+									ServiceNamespace: "test-ns",
+									ServiceName:      "cm-solver",
+									ServicePort:      intstr.FromInt(8090),
+								},
+								Percent: 100,
+							}},
+						}},
+					},
+				}},
+			},
+		},
+	}} {
+		t.Run(tc.name, func(t *testing.T) {
+			tc.want.Labels = kmeta.UnionMaps(tc.dm.Labels, map[string]string{
+				serving.DomainMappingLabelKey: tc.dm.Name,
+			})
+			tc.want.OwnerReferences = []metav1.OwnerReference{*kmeta.NewControllerRef(&tc.dm)}
+			got := *MakeIngress(&tc.dm,
+				"the-target-svc", "the-rewrite-host", "the-ingress-class",
+				tc.tls, tc.acmeChallenges...)
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Errorf("Unexpected Ingress (-want, +got):\n%s", diff)
+			}
+		})
 	}
 
-	if !cmp.Equal(want, got) {
-		t.Errorf("Unexpected Ingress (-want, +got):\n%s", cmp.Diff(want, got))
-	}
 }
diff --git a/pkg/reconciler/domainmapping/table_test.go b/pkg/reconciler/domainmapping/table_test.go
index 7243ae972..a569445e9 100644
--- a/pkg/reconciler/domainmapping/table_test.go
+++ b/pkg/reconciler/domainmapping/table_test.go
@@ -81,7 +81,7 @@ func TestReconcile(t *testing.T) {
 		SkipNamespaceValidation: true, // allow creation of ClusterDomainClaim.
 		WantCreates: []runtime.Object{
 			resources.MakeDomainClaim(domainMapping("default", "first-reconcile.com", withRef("default", "target"))),
-			resources.MakeIngress(domainMapping("default", "first-reconcile.com", withRef("default", "target")), "the-target-svc", "the-target-svc.default.svc.cluster.local", "the-ingress-class"),
+			resources.MakeIngress(domainMapping("default", "first-reconcile.com", withRef("default", "target")), "the-target-svc", "the-target-svc.default.svc.cluster.local", "the-ingress-class", nil /* tls */),
 		},
 		WantEvents: []string{
 			Eventf(corev1.EventTypeNormal, "Created", "Created Ingress %q", "first-reconcile.com"),
@@ -109,7 +109,7 @@ func TestReconcile(t *testing.T) {
 			resources.MakeDomainClaim(domainMapping("default", "first-reconcile.com", withRef("default", "target", withAPIVersionKind("v1", "Service")))),
 			resources.MakeIngress(
 				domainMapping("default", "first-reconcile.com", withRef("default", "target", withAPIVersionKind("v1", "Service"))),
-				"target", "target.default.svc.cluster.local", "the-ingress-class"),
+				"target", "target.default.svc.cluster.local", "the-ingress-class", nil /* tls */),
 		},
 		WantEvents: []string{
 			Eventf(corev1.EventTypeNormal, "Created", "Created Ingress %q", "first-reconcile.com"),
@@ -233,7 +233,7 @@ func TestReconcile(t *testing.T) {
 			),
 		}},
 		WantCreates: []runtime.Object{
-			resources.MakeIngress(domainMapping("default", "first-reconcile.com", withRef("default", "target")), "the-target-svc", "the-target-svc.default.svc.cluster.local", "the-ingress-class"),
+			resources.MakeIngress(domainMapping("default", "first-reconcile.com", withRef("default", "target")), "the-target-svc", "the-target-svc.default.svc.cluster.local", "the-ingress-class", nil /* tls */),
 		},
 		WantEvents: []string{
 			Eventf(corev1.EventTypeNormal, "Created", "Created Ingress %q", "first-reconcile.com"),
@@ -317,7 +317,7 @@ func TestReconcile(t *testing.T) {
 		WantCreates: []runtime.Object{
 			resources.MakeDomainClaim(domainMapping("default", "ingressclass.first-reconcile.com", withRef("default", "target"))),
 			resources.MakeIngress(domainMapping("default", "ingressclass.first-reconcile.com", withRef("default", "target")),
-				"the-target-svc", "the-target-svc.default.svc.cluster.local", "overridden-ingress-class"),
+				"the-target-svc", "the-target-svc.default.svc.cluster.local", "overridden-ingress-class", nil /* tls */),
 		},
 		WantEvents: []string{
 			Eventf(corev1.EventTypeNormal, "Created", "Created Ingress %q", "ingressclass.first-reconcile.com"),
@@ -328,7 +328,7 @@ func TestReconcile(t *testing.T) {
 		Objects: []runtime.Object{
 			ksvc("default", "changed", "changed.default.svc.cluster.local", ""),
 			domainMapping("default", "ingress-exists.org", withRef("default", "changed")),
-			resources.MakeIngress(domainMapping("default", "ingress-exists.org", withRef("default", "changed")), "previous", "previous.default.svc.cluster.local", "the-ingress-class"),
+			resources.MakeIngress(domainMapping("default", "ingress-exists.org", withRef("default", "changed")), "previous", "previous.default.svc.cluster.local", "the-ingress-class", nil /* tls */),
 			resources.MakeDomainClaim(domainMapping("default", "ingress-exists.org", withRef("default", "changed"))),
 		},
 		WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
@@ -636,7 +636,7 @@ func withObservedGeneration(dm *v1alpha1.DomainMapping) {
 }
 
 func ingress(dm *v1alpha1.DomainMapping, ingressClass string, opt ...IngressOption) *netv1alpha1.Ingress {
-	ing := resources.MakeIngress(dm, dm.Spec.Ref.Name, dm.Spec.Ref.Name+"."+dm.Spec.Ref.Namespace+".svc.cluster.local", ingressClass)
+	ing := resources.MakeIngress(dm, dm.Spec.Ref.Name, dm.Spec.Ref.Name+"."+dm.Spec.Ref.Namespace+".svc.cluster.local", ingressClass, nil /* tls */)
 	for _, o := range opt {
 		o(ing)
 	}
diff --git a/pkg/reconciler/gc/reconciler_test.go b/pkg/reconciler/gc/reconciler_test.go
index dd237d9c5..f34fff416 100644
--- a/pkg/reconciler/gc/reconciler_test.go
+++ b/pkg/reconciler/gc/reconciler_test.go
@@ -75,6 +75,7 @@ func TestGCReconcile(t *testing.T) {
 			},
 		}}
 
+	fc := clock.NewFakeClock(time.Now())
 	table := TableTest{{
 		Name: "delete oldest, keep two V2",
 		Objects: []runtime.Object{
@@ -84,15 +85,15 @@ func TestGCReconcile(t *testing.T) {
 				WithConfigObservedGen),
 			rev("keep-two", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(oldest)),
 			rev("keep-two", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			rev("keep-two", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithRoutingStateModified(old)),
 		},
 		WantDeletes: []clientgotesting.DeleteActionImpl{{
diff --git a/pkg/reconciler/gc/v2/gc_test.go b/pkg/reconciler/gc/v2/gc_test.go
index 6c7eea2b1..20387853d 100644
--- a/pkg/reconciler/gc/v2/gc_test.go
+++ b/pkg/reconciler/gc/v2/gc_test.go
@@ -65,6 +65,7 @@ func TestCollectMin(t *testing.T) {
 	old := now.Add(-11 * time.Minute)
 	older := now.Add(-12 * time.Minute)
 	oldest := now.Add(-13 * time.Minute)
+	fc := clock.NewFakeClock(now)
 
 	table := []struct {
 		name        string
@@ -80,7 +81,7 @@ func TestCollectMin(t *testing.T) {
 		revs: []*v1.Revision{
 			rev("none-reserved", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithCreationTimestamp(old)),
 		},
 	}, {
@@ -93,17 +94,17 @@ func TestCollectMin(t *testing.T) {
 			// Stale, oldest should be deleted
 			rev("keep-two", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(oldest)),
 			// Stale, but MinNonActiveRevisions is 1
 			rev("keep-two", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			// Actively referenced by Configuration
 			rev("keep-two", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithRoutingStateModified(old)),
 		},
 		wantDeletes: []clientgotesting.DeleteActionImpl{{
@@ -121,17 +122,17 @@ func TestCollectMin(t *testing.T) {
 			// Stale, oldest should be deleted
 			rev("keep-two", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(oldest)),
 			// Stale, but MinNonActiveRevisions is 1
 			rev("keep-two", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			// Actively referenced by Configuration
 			rev("keep-two", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithRoutingStateModified(old)),
 		},
 		wantDeletes: []clientgotesting.DeleteActionImpl{{
@@ -151,15 +152,15 @@ func TestCollectMin(t *testing.T) {
 		revs: []*v1.Revision{
 			rev("none-reserved", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStatePending),
+				WithRoutingState(v1.RoutingStatePending, fc),
 				WithCreationTimestamp(oldest)),
 			rev("none-reserved", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateUnset),
+				WithRoutingState(v1.RoutingStateUnset, fc),
 				WithCreationTimestamp(older)),
 			rev("none-reserved", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithCreationTimestamp(old)),
 		},
 	}, {
@@ -168,15 +169,15 @@ func TestCollectMin(t *testing.T) {
 		revs: []*v1.Revision{
 			rev("none-stale", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(now)),
 			rev("none-stale", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(now)),
 			rev("none-stale", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(now)),
 		},
 	}, {
@@ -186,15 +187,15 @@ func TestCollectMin(t *testing.T) {
 			rev("keep-oldest", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
 				WithRoutingStateModified(oldest),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRevisionPreserveAnnotation()),
 			rev("keep-oldest", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			rev("keep-oldest", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(old)),
 		},
 		wantDeletes: []clientgotesting.DeleteActionImpl{{
@@ -228,6 +229,7 @@ func TestCollectMax(t *testing.T) {
 	old := now.Add(-11 * time.Minute)
 	older := now.Add(-12 * time.Minute)
 	oldest := now.Add(-13 * time.Minute)
+	fc := clock.NewFakeClock(now)
 
 	table := []struct {
 		name        string
@@ -244,17 +246,17 @@ func TestCollectMax(t *testing.T) {
 			// Under max
 			rev("at max", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			// Under max
 			rev("at max", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			// Actively referenced by Configuration
 			rev("at max", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithRoutingStateModified(old)),
 		},
 	}, {
@@ -267,22 +269,22 @@ func TestCollectMax(t *testing.T) {
 			// Stale and over the max
 			rev("delete oldest", "foo", 5553, MarkRevisionReady,
 				WithRevName("5553"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(oldest)),
 			// Stale but under max
 			rev("delete oldest", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			// Stale but under max
 			rev("delete oldest", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateReserve),
+				WithRoutingState(v1.RoutingStateReserve, fc),
 				WithRoutingStateModified(older)),
 			// Actively referenced by Configuration
 			rev("keep-two", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, fc),
 				WithRoutingStateModified(old)),
 		},
 		wantDeletes: []clientgotesting.DeleteActionImpl{{
@@ -302,16 +304,16 @@ func TestCollectMax(t *testing.T) {
 		revs: []*v1.Revision{
 			rev("keep-two", "foo", 5553, MarkRevisionReady,
 				WithRevName("5553"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, fc)),
 			rev("keep-two", "foo", 5554, MarkRevisionReady,
 				WithRevName("5554"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, fc)),
 			rev("keep-two", "foo", 5555, MarkRevisionReady,
 				WithRevName("5555"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, fc)),
 			rev("keep-two", "foo", 5556, MarkRevisionReady,
 				WithRevName("5556"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, fc)),
 		},
 	}}
 
@@ -327,6 +329,7 @@ func TestCollectSettings(t *testing.T) {
 	old := now.Add(-11 * time.Minute)
 	older := now.Add(-12 * time.Minute)
 	oldest := now.Add(-13 * time.Minute)
+	fc := clock.NewFakeClock(now)
 
 	cfg := cfg("settings-test", "foo", 5556,
 		WithLatestCreated("5556"),
@@ -336,15 +339,15 @@ func TestCollectSettings(t *testing.T) {
 	revs := []*v1.Revision{
 		rev("settings-test", "foo", 5554, MarkRevisionReady,
 			WithRevName("5554"),
-			WithRoutingState(v1.RoutingStateReserve),
+			WithRoutingState(v1.RoutingStateReserve, fc),
 			WithRoutingStateModified(oldest)),
 		rev("settings-test", "foo", 5555, MarkRevisionReady,
 			WithRevName("5555"),
-			WithRoutingState(v1.RoutingStateReserve),
+			WithRoutingState(v1.RoutingStateReserve, fc),
 			WithRoutingStateModified(older)),
 		rev("settings-test", "foo", 5556, MarkRevisionReady,
 			WithRevName("5556"),
-			WithRoutingState(v1.RoutingStateActive),
+			WithRoutingState(v1.RoutingStateActive, fc),
 			WithRoutingStateModified(old)),
 	}
 
diff --git a/pkg/reconciler/labeler/labelerv2_test.go b/pkg/reconciler/labeler/labelerv2_test.go
index 796afa0fa..445a440f1 100644
--- a/pkg/reconciler/labeler/labelerv2_test.go
+++ b/pkg/reconciler/labeler/labelerv2_test.go
@@ -54,6 +54,7 @@ import (
 func TestV2Reconcile(t *testing.T) {
 	now := metav1.Now()
 	fakeTime := now.Time
+	clock := clock.NewFakeClock(fakeTime)
 
 	table := TableTest{{
 		Name: "bad workqueue key",
@@ -107,7 +108,7 @@ func TestV2Reconcile(t *testing.T) {
 				WithConfigAnn("serving.knative.dev/routes", "steady-state")),
 			rev("default", "the-config",
 				WithRevisionAnn("serving.knative.dev/routes", "steady-state"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, clock),
 				WithRoutingStateModified(now.Time)),
 		},
 		Key: "default/steady-state",
@@ -138,7 +139,7 @@ func TestV2Reconcile(t *testing.T) {
 				WithConfigAnn("serving.knative.dev/routes", "transitioning-route")),
 			rev("default", "old",
 				WithRevisionAnn("serving.knative.dev/routes", "transitioning-route"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, clock)),
 			simpleConfig("default", "new"),
 			rev("default", "new"),
 		},
@@ -182,7 +183,7 @@ func TestV2Reconcile(t *testing.T) {
 			simpleConfig("default", "the-config"),
 			rev("default", "the-config",
 				WithRevisionAnn("serving.knative.dev/routes", "add-label-failure"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, clock),
 				WithRoutingStateModified(now.Time)),
 		},
 		WantPatches: []clientgotesting.PatchActionImpl{
@@ -216,7 +217,7 @@ func TestV2Reconcile(t *testing.T) {
 				WithConfigAnn("serving.knative.dev/routes", "config-change")),
 			rev("default", "old-config",
 				WithRevisionAnn("serving.knative.dev/routes", "config-change"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, clock)),
 			simpleConfig("default", "new-config"),
 			rev("default", "new-config"),
 		},
@@ -237,7 +238,7 @@ func TestV2Reconcile(t *testing.T) {
 				WithConfigAnn("serving.knative.dev/routes", "config-update")),
 			rev("default", "the-config",
 				WithRevisionAnn("serving.knative.dev/routes", "config-update"),
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, clock)),
 			rev("default", "the-config",
 				WithRevName("the-config-ecoge")),
 		},
@@ -295,7 +296,7 @@ func TestV2Reconcile(t *testing.T) {
 				WithConfigAnn("serving.knative.dev/routes", "delete-label-failure")),
 			rev("default", "new-config",
 				WithRevisionAnn("serving.knative.dev/routes", "delete-label-failure"),
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, clock),
 				WithRoutingStateModified(now.Time)),
 			rev("default", "old-config"),
 		},
@@ -323,7 +324,7 @@ func TestV2Reconcile(t *testing.T) {
 			rev("default", "new-config",
 				WithRevisionAnn("serving.knative.dev/routes", "delete-label-failure")),
 			rev("default", "old-config",
-				WithRoutingState(v1.RoutingStateActive),
+				WithRoutingState(v1.RoutingStateActive, clock),
 				WithRevisionAnn("serving.knative.dev/routes", "delete-label-failure")),
 		},
 		WantPatches: []clientgotesting.PatchActionImpl{
@@ -337,7 +338,6 @@ func TestV2Reconcile(t *testing.T) {
 	}}
 
 	table.Test(t, MakeFactory(func(ctx context.Context, listers *Listers, cmw configmap.Watcher) controller.Reconciler {
-		clock := clock.NewFakeClock(fakeTime)
 		client := servingclient.Get(ctx)
 		cLister := listers.GetConfigurationLister()
 		cIndexer := listers.IndexerFor(&v1.Configuration{})
diff --git a/pkg/reconciler/revision/table_test.go b/pkg/reconciler/revision/table_test.go
index 5f11ff0db..bf9e72938 100644
--- a/pkg/reconciler/revision/table_test.go
+++ b/pkg/reconciler/revision/table_test.go
@@ -19,11 +19,13 @@ package revision
 import (
 	"context"
 	"testing"
+	"time"
 
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/clock"
 	clientgotesting "k8s.io/client-go/testing"
 
 	caching "knative.dev/caching/pkg/apis/caching/v1alpha1"
@@ -53,6 +55,10 @@ import (
 
 // This is heavily based on the way the OpenShift Ingress controller tests its reconciliation method.
 func TestReconcile(t *testing.T) {
+	// We don't care about the value, but that it does not change,
+	// since it leads to flakes.
+	fc := clock.NewFakeClock(time.Now())
+
 	table := TableTest{{
 		Name: "bad workqueue key",
 		// Make sure Reconcile handles bad keys.
@@ -386,7 +392,7 @@ func TestReconcile(t *testing.T) {
 		Objects: []runtime.Object{
 			Revision("foo", "fix-mutated-pa",
 				WithK8sServiceName("ill-follow-the-sun"), WithLogURL, MarkRevisionReady,
-				WithRoutingState(v1.RoutingStateActive)),
+				WithRoutingState(v1.RoutingStateActive, fc)),
 			pa("foo", "fix-mutated-pa", WithProtocolType(networking.ProtocolH2C),
 				WithTraffic, WithPASKSReady, WithScaleTargetInitialized, WithReachabilityReachable,
 				WithPAStatusService("fix-mutated-pa")),
@@ -399,7 +405,7 @@ func TestReconcile(t *testing.T) {
 				// When our reconciliation has to change the service
 				// we should see the following mutations to status.
 				WithK8sServiceName("fix-mutated-pa"),
-				WithRoutingState(v1.RoutingStateActive), WithLogURL, MarkRevisionReady,
+				WithRoutingState(v1.RoutingStateActive, fc), WithLogURL, MarkRevisionReady,
 				withDefaultContainerStatuses()),
 		}},
 		WantUpdates: []clientgotesting.UpdateActionImpl{{
diff --git a/pkg/reconciler/route/table_test.go b/pkg/reconciler/route/table_test.go
index 2e28f905d..edd9063f2 100644
--- a/pkg/reconciler/route/table_test.go
+++ b/pkg/reconciler/route/table_test.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"testing"
 	"time"
 
@@ -450,10 +451,10 @@ func TestReconcile(t *testing.T) {
 					RevisionName: "config-00001", Percent: 1,
 				}}, fakeCurTime.Add(-3*time.Second),
 					func(r *traffic.Rollout) {
-						const numSteps = 120 / 3 // 40
-						// Step duration is 3s (duration / numSteps = 120/40)
-						r.Configurations[0].StepParams.StepDuration = int64(time.Second) * 120 / numSteps // 3s in ns.
-						r.Configurations[0].StepParams.StepSize = (100 - 1) / numSteps                    // 2
+						const numSteps = (120 - 3) / 3 // 39
+						// Step duration is 3s (duration - 3)/ numSteps = 120/40)
+						r.Configurations[0].StepParams.StepDuration = int64(time.Second) * (120 - 3) / numSteps   // 3s in ns.
+						r.Configurations[0].StepParams.StepSize = int(math.Round((100. - 1) / float64(numSteps))) // 3
 						// StepDuration is 3, and so next step is `now` + 3.
 						r.Configurations[0].StepParams.NextStepTime = fakeCurTime.Add(3 * time.Second).UnixNano()
 					},
@@ -463,6 +464,87 @@ func TestReconcile(t *testing.T) {
 				Route("default", "becomes-ready", WithConfigTarget("config")),
 			),
 		}},
+		WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
+			Object: Route("default", "becomes-ready", WithConfigTarget("config"),
+				// Populated by reconciliation when the route becomes ready.
+				WithURL, WithAddress, WithRouteConditionsAutoTLSDisabled,
+				WithRouteGeneration(2009), WithRouteObservedGeneration,
+				MarkTrafficAssigned, MarkInRollout, WithStatusTraffic(
+					v1.TrafficTarget{
+						RevisionName:   "config-00000",
+						Percent:        ptr.Int64(99),
+						LatestRevision: ptr.Bool(true),
+					},
+					v1.TrafficTarget{
+						RevisionName:   "config-00001",
+						Percent:        ptr.Int64(1),
+						LatestRevision: ptr.Bool(true),
+					})),
+		}},
+		WantEvents: []string{
+			Eventf(corev1.EventTypeNormal, "Created", "Created placeholder service %q", "becomes-ready"),
+		},
+		Key: "default/becomes-ready",
+	}, {
+		Name: "simple route rollout and rollout ends",
+		Ctx:  context.WithValue(context.Background(), rolloutDurationKey, 120),
+		Objects: []runtime.Object{
+			Route("default", "becomes-ready", WithConfigTarget("config"),
+				WithRouteGeneration(2009), MarkInRollout),
+			cfg("default", "config",
+				WithConfigGeneration(1), WithLatestCreated("config-00001"), WithLatestReady("config-00001")),
+			rev("default", "config", 1, MarkRevisionReady, WithRevName("config-00001")),
+			simpleReadyIngress(
+				Route("default", "becomes-ready", WithConfigTarget("config"), WithURL),
+				&traffic.Config{
+					Targets: map[string]traffic.RevisionTargets{
+						traffic.DefaultTarget: {{
+							TrafficTarget: v1.TrafficTarget{
+								ConfigurationName: "config",
+								RevisionName:      "config-00001",
+								Percent:           ptr.Int64(100),
+								LatestRevision:    ptr.Bool(true),
+							},
+						}},
+					},
+				},
+				simpleRollout("config", []traffic.RevisionRollout{{
+					RevisionName: "config-00000", Percent: 1,
+				}, {
+					RevisionName: "config-00001", Percent: 99,
+				}}, fakeCurTime.Add(-3*time.Second),
+					withStepParams(traffic.RolloutParams{
+						NextStepTime: fakeCurTime.Add(-time.Second).UnixNano(),
+						StepSize:     4,
+						StartTime:    fakeCurTime.Add(-time.Hour).UnixNano(),
+						StepDuration: int64(time.Second),
+					})),
+			),
+		},
+		WantCreates: []runtime.Object{
+			simplePlaceholderK8sService(getContext(), Route("default", "becomes-ready", WithConfigTarget("config")), ""),
+		},
+		WantUpdates: []clientgotesting.UpdateActionImpl{{
+			// ingress should be updated with the new rollout data.
+			Object: simpleReadyIngress(
+				Route("default", "becomes-ready", WithConfigTarget("config"), WithURL),
+				&traffic.Config{
+					Targets: map[string]traffic.RevisionTargets{
+						traffic.DefaultTarget: {{
+							TrafficTarget: v1.TrafficTarget{
+								ConfigurationName: "config",
+								RevisionName:      "config-00001",
+								Percent:           ptr.Int64(100),
+								LatestRevision:    ptr.Bool(true),
+							},
+						}},
+					},
+				}),
+		}, {
+			Object: simpleK8sService(
+				Route("default", "becomes-ready", WithConfigTarget("config")),
+			),
+		}},
 		WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
 			Object: Route("default", "becomes-ready", WithConfigTarget("config"),
 				// Populated by reconciliation when the route becomes ready.
@@ -758,7 +840,7 @@ func TestReconcile(t *testing.T) {
 		// A new LatestCreatedRevisionName on the Configuration alone should result in no changes to the Route.
 		Key: "default/new-latest-created",
 	}, {
-		Name: "new latest ready revision. rollout enabled",
+		Name: "new latest ready revision; rollout enabled",
 		Ctx:  context.WithValue(context.Background(), rolloutDurationKey, 120),
 		Objects: []runtime.Object{
 			Route("default", "new-latest-ready", WithConfigTarget("config"),
@@ -833,10 +915,15 @@ func TestReconcile(t *testing.T) {
 		WantStatusUpdates: []clientgotesting.UpdateActionImpl{{
 			Object: Route("default", "new-latest-ready", WithConfigTarget("config"),
 				WithURL, WithAddress, WithRouteConditionsAutoTLSDisabled, WithRouteGeneration(1),
-				MarkTrafficAssigned, MarkIngressReady, WithRouteObservedGeneration, WithRouteFinalizer, WithStatusTraffic(
+				MarkTrafficAssigned, MarkInRollout, WithRouteObservedGeneration, WithRouteFinalizer, WithStatusTraffic(
+					v1.TrafficTarget{
+						RevisionName:   "config-00001",
+						Percent:        ptr.Int64(99),
+						LatestRevision: ptr.Bool(true),
+					},
 					v1.TrafficTarget{
 						RevisionName:   "config-00002",
-						Percent:        ptr.Int64(100),
+						Percent:        ptr.Int64(1),
 						LatestRevision: ptr.Bool(true),
 					})),
 		}},
@@ -2817,3 +2904,11 @@ func simpleRollout(cfg string, revs []traffic.RevisionRollout,
 		}()
 	}
 }
+
+func withStepParams(p traffic.RolloutParams) rolloutOption {
+	return func(ro *traffic.Rollout) {
+		for i := range ro.Configurations {
+			ro.Configurations[i].StepParams = p
+		}
+	}
+}
diff --git a/pkg/reconciler/route/traffic/rollout_test.go b/pkg/reconciler/route/traffic/rollout_test.go
index 1e0b096f3..ad6bba478 100644
--- a/pkg/reconciler/route/traffic/rollout_test.go
+++ b/pkg/reconciler/route/traffic/rollout_test.go
@@ -1009,9 +1009,12 @@ func TestStep(t *testing.T) {
 
 func TestObserveReady(t *testing.T) {
 	const (
-		now       = 200620092020 + 1982
-		oldenDays = 198219841988
-		duration  = 120.
+		now         = 200620092020 + 1982
+		oldenDays   = 198219841988
+		oldenStep   = float64(now-oldenDays) / float64(time.Second)
+		ancientDays = 14921812
+		ancientStep = float64(now-ancientDays) / float64(time.Second)
+		duration    = 120.
 	)
 	ro := Rollout{
 		Configurations: []ConfigurationRollout{{
@@ -1047,6 +1050,15 @@ func TestObserveReady(t *testing.T) {
 				StartTime: oldenDays,
 			},
 			Percent: 50,
+		}, {
+			// This covers the case when duration of a step is larger
+			// than duration of the whole rollout. Which means we'll
+			// do the whole rollout in one final step.
+			ConfigurationName: "días antiguos",
+			StepParams: RolloutParams{
+				StartTime: ancientDays,
+			},
+			Percent: 13,
 		}},
 	}
 
@@ -1065,9 +1077,9 @@ func TestObserveReady(t *testing.T) {
 			Percent:           100,
 			StepParams: RolloutParams{
 				StartTime:    200620092020,
-				StepDuration: 1212121212, // 120/99
+				StepDuration: 1202020202, // (120s-1984ns)/99
 				StepSize:     1,
-				NextStepTime: now + 1212121212,
+				NextStepTime: now + 1202020202,
 			},
 		}, {
 			ConfigurationName: "step-begin > 1s",
@@ -1075,7 +1087,7 @@ func TestObserveReady(t *testing.T) {
 			StepParams: RolloutParams{
 				StartTime:    oldenDays,
 				StepDuration: int64(3 * time.Second),
-				StepSize:     100 / 40,
+				StepSize:     3, // int(100. / ((duration - oldenStep) / oldenStep)),
 				NextStepTime: now + 3*int64(time.Second),
 			},
 		}, {
@@ -1096,6 +1108,15 @@ func TestObserveReady(t *testing.T) {
 				StepSize:     50 / 40,
 				NextStepTime: now + 3*int64(time.Second),
 			},
+		}, {
+			ConfigurationName: "días antiguos",
+			Percent:           13,
+			StepParams: RolloutParams{
+				StartTime:    ancientDays,
+				StepDuration: int64(time.Second), // The minimal possible.
+				StepSize:     12,
+				NextStepTime: now + int64(time.Second),
+			},
 		}},
 	}
 
@@ -1314,6 +1335,9 @@ func TestValidateFailures(t *testing.T) {
 func TestConfigDone(t *testing.T) {
 	r := &Rollout{
 		Configurations: []ConfigurationRollout{{
+			ConfigurationName: "nil",
+			Percent:           100,
+		}, {
 			ConfigurationName: "one",
 			Percent:           100,
 			Revisions: []RevisionRollout{{
@@ -1336,15 +1360,25 @@ func TestConfigDone(t *testing.T) {
 			}},
 		}},
 	}
-	if !r.Configurations[0].Done() {
+	if !r.Configurations[0].done() {
+		t.Error("Nil revision slice rollout is not `Done`")
+	}
+	if !r.Configurations[1].done() {
 		t.Error("Single revision rollout is not `Done`")
 	}
-	if !r.Configurations[1].Done() {
+	if !r.Configurations[2].done() {
 		t.Error("Zero revisions rollout is not `Done`")
 	}
-	if r.Configurations[2].Done() {
+	if r.Configurations[3].done() {
 		t.Error("Many revisions rollout is `Done`")
 	}
+	if r.Done() {
+		t.Error("Whole Rollout was marked done, but it's not")
+	}
+	r.Configurations = r.Configurations[:3]
+	if !r.Done() {
+		t.Error("Updated Rollout without the last one was marked not done, but it is")
+	}
 }
 
 func TestJSONRoundtrip(t *testing.T) {
diff --git a/pkg/reconciler/route/traffic/traffic_test.go b/pkg/reconciler/route/traffic/traffic_test.go
index 7dba88dcc..2c9ef4371 100644
--- a/pkg/reconciler/route/traffic/traffic_test.go
+++ b/pkg/reconciler/route/traffic/traffic_test.go
@@ -1381,7 +1381,81 @@ func TestRoundTripping(t *testing.T) {
 	if tc, err := BuildTrafficConfiguration(configLister, revLister, route); err != nil {
 		t.Error("Unexpected error", err)
 	} else {
-		targets, err := tc.GetRevisionTrafficTargets(getContext(), route)
+		targets, err := tc.GetRevisionTrafficTargets(getContext(), route, &Rollout{})
+		if err != nil {
+			t.Error("Unexpected error:", err)
+		}
+		if got, want := targets, expected; !cmp.Equal(want, got) {
+			t.Errorf("Unexpected traffic diff (-want +got):\n%s", cmp.Diff(want, got))
+		}
+	}
+}
+
+func TestRoundTrippingWithRollout(t *testing.T) {
+	expected := []v1.TrafficTarget{{
+		RevisionName:   "older-rev",
+		Percent:        ptr.Int64(56),
+		LatestRevision: ptr.Bool(true),
+	}, {
+		RevisionName:   goodOldRev.Name,
+		Percent:        ptr.Int64(44),
+		LatestRevision: ptr.Bool(true),
+	}, {
+		Tag:            "beta",
+		RevisionName:   goodNewRev.Name,
+		URL:            domains.URL(domains.HTTPScheme, "beta-test-route.test.example.com"),
+		LatestRevision: ptr.Bool(false),
+		Percent:        ptr.Int64(0),
+	}, {
+		Tag:            "alpha",
+		RevisionName:   niceOldRev.Name,
+		URL:            domains.URL(domains.HTTPScheme, "alpha-test-route.test.example.com"),
+		LatestRevision: ptr.Bool(true),
+		Percent:        ptr.Int64(81),
+	}, {
+		Tag:            "alpha",
+		RevisionName:   niceNewRev.Name,
+		URL:            domains.URL(domains.HTTPScheme, "alpha-test-route.test.example.com"),
+		LatestRevision: ptr.Bool(true),
+		Percent:        ptr.Int64(19),
+	}}
+	route := testRouteWithTrafficTargets(WithSpecTraffic(v1.TrafficTarget{
+		ConfigurationName: goodConfig.Name,
+		LatestRevision:    ptr.Bool(true),
+		Percent:           ptr.Int64(100),
+	}, v1.TrafficTarget{
+		Tag:          "beta",
+		RevisionName: goodNewRev.Name,
+	}, v1.TrafficTarget{
+		Tag:               "alpha",
+		ConfigurationName: niceConfig.Name,
+	}))
+	ro := &Rollout{
+		Configurations: []ConfigurationRollout{{
+			ConfigurationName: goodConfig.Name,
+			Revisions: []RevisionRollout{{
+				RevisionName: "older-rev",
+				Percent:      56,
+			}, {
+				RevisionName: goodOldRev.Name,
+				Percent:      44,
+			}},
+		}, {
+			ConfigurationName: niceConfig.Name,
+			Tag:               "alpha",
+			Revisions: []RevisionRollout{{
+				RevisionName: niceOldRev.Name,
+				Percent:      81,
+			}, {
+				RevisionName: niceNewRev.Name,
+				Percent:      19,
+			}},
+		}},
+	}
+	if tc, err := BuildTrafficConfiguration(configLister, revLister, route); err != nil {
+		t.Error("Unexpected error", err)
+	} else {
+		targets, err := tc.GetRevisionTrafficTargets(getContext(), route, ro)
 		if err != nil {
 			t.Error("Unexpected error:", err)
 		}
diff --git a/pkg/testing/v1/revision.go b/pkg/testing/v1/revision.go
index 409370408..2a1d03345 100644
--- a/pkg/testing/v1/revision.go
+++ b/pkg/testing/v1/revision.go
@@ -108,9 +108,9 @@ func WithRoutingStateModified(t time.Time) RevisionOption {
 }
 
 // WithRoutingState updates the annotation to the provided timestamp.
-func WithRoutingState(s v1.RoutingState) RevisionOption {
+func WithRoutingState(s v1.RoutingState, c clock.Clock) RevisionOption {
 	return func(rev *v1.Revision) {
-		rev.SetRoutingState(s, clock.RealClock{})
+		rev.SetRoutingState(s, c)
 	}
 }
 
diff --git a/pkg/testing/v1/route.go b/pkg/testing/v1/route.go
index a4c7b1a31..c0fdc4d74 100644
--- a/pkg/testing/v1/route.go
+++ b/pkg/testing/v1/route.go
@@ -221,6 +221,11 @@ func MarkIngressReady(r *v1.Route) {
 	})
 }
 
+// MarkInRollout marks the route to be in process of rolling out.
+func MarkInRollout(r *v1.Route) {
+	r.Status.MarkIngressRolloutInProgress()
+}
+
 // MarkIngressNotConfigured calls the method of the same name on .Status
 func MarkIngressNotConfigured(r *v1.Route) {
 	r.Status.MarkIngressNotConfigured()
diff --git a/test/conformance/api/shared/util.go b/test/conformance/api/shared/util.go
index 5dc3f3cf4..002629e80 100644
--- a/test/conformance/api/shared/util.go
+++ b/test/conformance/api/shared/util.go
@@ -181,8 +181,8 @@ func checkResponses(t testing.TB, num, min int, domain string, expectedResponses
 
 // CheckDistribution sends "num" requests to "domain", then validates that
 // we see each body in "expectedResponses" at least "min" times.
-func CheckDistribution(ctx context.Context, t testing.TB, clients *test.Clients, url *url.URL, num, min int, expectedResponses []string) error {
-	client, err := pkgTest.NewSpoofingClient(ctx, clients.KubeClient, t.Logf, url.Hostname(), test.ServingFlags.ResolvableDomain, test.AddRootCAtoTransport(ctx, t.Logf, clients, test.ServingFlags.HTTPS))
+func CheckDistribution(ctx context.Context, t testing.TB, clients *test.Clients, url *url.URL, num, min int, expectedResponses []string, resolvable bool) error {
+	client, err := pkgTest.NewSpoofingClient(ctx, clients.KubeClient, t.Logf, url.Hostname(), resolvable, test.AddRootCAtoTransport(ctx, t.Logf, clients, test.ServingFlags.HTTPS))
 	if err != nil {
 		return err
 	}
diff --git a/test/conformance/api/v1/blue_green_test.go b/test/conformance/api/v1/blue_green_test.go
index 9ab7efaff..c005ed5bc 100644
--- a/test/conformance/api/v1/blue_green_test.go
+++ b/test/conformance/api/v1/blue_green_test.go
@@ -146,15 +146,15 @@ func TestBlueGreenRoute(t *testing.T) {
 	g, egCtx := errgroup.WithContext(context.Background())
 	g.Go(func() error {
 		min := int(math.Floor(test.ConcurrentRequests * test.MinSplitPercentage))
-		return shared.CheckDistribution(egCtx, t, clients, tealURL, test.ConcurrentRequests, min, []string{expectedBlue, expectedGreen})
+		return shared.CheckDistribution(egCtx, t, clients, tealURL, test.ConcurrentRequests, min, []string{expectedBlue, expectedGreen}, test.ServingFlags.ResolvableDomain)
 	})
 	g.Go(func() error {
 		min := int(math.Floor(test.ConcurrentRequests * test.MinDirectPercentage))
-		return shared.CheckDistribution(egCtx, t, clients, blueURL, test.ConcurrentRequests, min, []string{expectedBlue})
+		return shared.CheckDistribution(egCtx, t, clients, blueURL, test.ConcurrentRequests, min, []string{expectedBlue}, test.ServingFlags.ResolvableDomain)
 	})
 	g.Go(func() error {
 		min := int(math.Floor(test.ConcurrentRequests * test.MinDirectPercentage))
-		return shared.CheckDistribution(egCtx, t, clients, greenURL, test.ConcurrentRequests, min, []string{expectedGreen})
+		return shared.CheckDistribution(egCtx, t, clients, greenURL, test.ConcurrentRequests, min, []string{expectedGreen}, test.ServingFlags.ResolvableDomain)
 	})
 	if err := g.Wait(); err != nil {
 		t.Fatal("Error sending requests:", err)
diff --git a/test/conformance/api/v1/util.go b/test/conformance/api/v1/util.go
index cebae4ec1..0a57af5fc 100644
--- a/test/conformance/api/v1/util.go
+++ b/test/conformance/api/v1/util.go
@@ -83,13 +83,13 @@ func validateDomains(t testing.TB, clients *test.Clients, baseDomain *url.URL,
 			minBasePercentage = test.MinDirectPercentage
 		}
 		min := int(math.Floor(test.ConcurrentRequests * minBasePercentage))
-		return shared.CheckDistribution(egCtx, t, clients, baseDomain, test.ConcurrentRequests, min, baseExpected)
+		return shared.CheckDistribution(egCtx, t, clients, baseDomain, test.ConcurrentRequests, min, baseExpected, test.ServingFlags.ResolvableDomain)
 	})
 	for i, subdomain := range subdomains {
 		i, subdomain := i, subdomain
 		g.Go(func() error {
 			min := int(math.Floor(test.ConcurrentRequests * test.MinDirectPercentage))
-			return shared.CheckDistribution(egCtx, t, clients, subdomain, test.ConcurrentRequests, min, []string{targetsExpected[i]})
+			return shared.CheckDistribution(egCtx, t, clients, subdomain, test.ConcurrentRequests, min, []string{targetsExpected[i]}, test.ServingFlags.ResolvableDomain)
 		})
 	}
 	if err := g.Wait(); err != nil {
diff --git a/test/conformance/api/v1alpha1/domain_mapping_test.go b/test/conformance/api/v1alpha1/domain_mapping_test.go
index 98e6906b3..c35e73e11 100644
--- a/test/conformance/api/v1alpha1/domain_mapping_test.go
+++ b/test/conformance/api/v1alpha1/domain_mapping_test.go
@@ -58,8 +58,14 @@ func TestDomainMapping(t *testing.T) {
 
 	// Using fixed hostnames can lead to conflicts when multiple tests run at
 	// once, so include the svc name to avoid collisions.
-	host := svc.Service.Name + ".mapping.com"
+	host := svc.Service.Name + ".example.org"
+	// Set resolvabledomain for custom domain to false by default.
+	resolvableCustomDomain := false
 
+	if test.ServingFlags.CustomDomain != "" {
+		host = svc.Service.Name + "." + test.ServingFlags.CustomDomain
+		resolvableCustomDomain = true
+	}
 	// Point DomainMapping at our service.
 	var dm *v1alpha1.DomainMapping
 	if err := reconciler.RetryTestErrors(func(int) error {
@@ -100,7 +106,7 @@ func TestDomainMapping(t *testing.T) {
 	}
 
 	// Should be able to access the test image text via the mapped domain.
-	if err := shared.CheckDistribution(ctx, t, clients, &url.URL{Host: host, Scheme: "http"}, test.ConcurrentRequests, test.ConcurrentRequests, []string{test.PizzaPlanetText1}); err != nil {
+	if err := shared.CheckDistribution(ctx, t, clients, &url.URL{Host: host, Scheme: "http"}, test.ConcurrentRequests, test.ConcurrentRequests, []string{test.PizzaPlanetText1}, resolvableCustomDomain); err != nil {
 		t.Errorf("CheckDistribution=%v, expected no error", err)
 	}
 
@@ -158,7 +164,7 @@ func TestDomainMapping(t *testing.T) {
 	}
 
 	// Because the second DomainMapping collided with the first, it should not have taken effect.
-	if err := shared.CheckDistribution(ctx, t, clients, &url.URL{Host: host, Scheme: "http"}, test.ConcurrentRequests, test.ConcurrentRequests, []string{test.PizzaPlanetText1}); err != nil {
+	if err := shared.CheckDistribution(ctx, t, clients, &url.URL{Host: host, Scheme: "http"}, test.ConcurrentRequests, test.ConcurrentRequests, []string{test.PizzaPlanetText1}, resolvableCustomDomain); err != nil {
 		t.Errorf("CheckDistribution=%v, expected no error", err)
 	}
 
@@ -181,7 +187,7 @@ func TestDomainMapping(t *testing.T) {
 	}
 
 	// The domain name should now point to the second service.
-	if err := shared.CheckDistribution(ctx, t, clients, &url.URL{Host: host, Scheme: "http"}, test.ConcurrentRequests, test.ConcurrentRequests, []string{test.PizzaPlanetText2}); err != nil {
+	if err := shared.CheckDistribution(ctx, t, clients, &url.URL{Host: host, Scheme: "http"}, test.ConcurrentRequests, test.ConcurrentRequests, []string{test.PizzaPlanetText2}, resolvableCustomDomain); err != nil {
 		t.Errorf("CheckDistribution=%v, expected no error", err)
 	}
 }
diff --git a/test/e2e-auto-tls-tests.sh b/test/e2e-auto-tls-tests.sh
index 6b142d06d..0fca3c78d 100755
--- a/test/e2e-auto-tls-tests.sh
+++ b/test/e2e-auto-tls-tests.sh
@@ -222,4 +222,7 @@ delete_dns_record
 subheader "Cleanup auto tls"
 cleanup_auto_tls_common
 
+# Remove the kail log file if the test flow passes.
+# This is for preventing too many large log files to be uploaded to GCS in CI.
+rm "${KAIL_LOG_FILE}"
 success
diff --git a/test/e2e-common.sh b/test/e2e-common.sh
index e4f35aa59..1bc3da366 100644
--- a/test/e2e-common.sh
+++ b/test/e2e-common.sh
@@ -29,6 +29,8 @@ CONTOUR_VERSION=""
 CERTIFICATE_CLASS=""
 # Only build linux/amd64 bit images
 KO_FLAGS="--platform=linux/amd64"
+# The file name to store logs captured by kail
+KAIL_LOG_FILE="${ARTIFACTS}/k8s.log-$(basename "${E2E_SCRIPT}").txt"
 
 HTTPS=0
 MESH=0
@@ -386,7 +388,7 @@ function test_setup() {
   fi
 
   # Capture all logs.
-  kail > ${ARTIFACTS}/k8s.log-$(basename ${E2E_SCRIPT}).txt &
+  kail > "${KAIL_LOG_FILE}" &
   local kail_pid=$!
   # Clean up kail so it doesn't interfere with job shutting down
   add_trap "kill $kail_pid || true" EXIT
diff --git a/test/e2e-tests.sh b/test/e2e-tests.sh
index ee889153d..ec3b8f260 100755
--- a/test/e2e-tests.sh
+++ b/test/e2e-tests.sh
@@ -142,4 +142,7 @@ go_test_e2e -timeout=25m -failfast -parallel=1 ./test/ha \
 
 (( failed )) && fail_test
 
+# Remove the kail log file if the test flow passes.
+# This is for preventing too many large log files to be uploaded to GCS in CI.
+rm "${KAIL_LOG_FILE}"
 success
diff --git a/test/e2e-upgrade-tests.sh b/test/e2e-upgrade-tests.sh
index f4f25fba5..5c37169f5 100755
--- a/test/e2e-upgrade-tests.sh
+++ b/test/e2e-upgrade-tests.sh
@@ -120,4 +120,7 @@ echo "done" > /tmp/autoscaling-tbc-signal
 header "Waiting for prober test"
 wait ${PROBER_PID} || fail_test "Prober failed"
 
+# Remove the kail log file if the test flow passes.
+# This is for preventing too many large log files to be uploaded to GCS in CI.
+rm "${KAIL_LOG_FILE}"
 success
diff --git a/test/e2e_flags.go b/test/e2e_flags.go
index 52f3b8415..cc8030ae4 100644
--- a/test/e2e_flags.go
+++ b/test/e2e_flags.go
@@ -34,6 +34,7 @@ var ServingFlags = initializeServingFlags()
 // ServingEnvironmentFlags holds the e2e flags needed only by the serving repo.
 type ServingEnvironmentFlags struct {
 	ResolvableDomain    bool   // Resolve Route controller's `domainSuffix`
+	CustomDomain        string // Indicaates the `domainSuffix` for custom domain test.
 	HTTPS               bool   // Indicates where the test service will be created with https
 	IngressClass        string // Indicates the class of Ingress provider to test.
 	CertificateClass    string // Indicates the class of Certificate provider to test.
@@ -58,6 +59,15 @@ func initializeServingFlags() *ServingEnvironmentFlags {
 		f.ResolvableDomain = fl.Value.(flag.Getter).Get().(bool)
 	}
 
+	if fl := flag.Lookup("customdomain"); fl == nil {
+		flag.StringVar(&f.CustomDomain,
+			"customdomain",
+			"",
+			"Set this flag to the custom domain suffix for domainmapping test.")
+	} else {
+		f.CustomDomain = fl.Value.String()
+	}
+
 	if fl := flag.Lookup("https"); fl == nil {
 		flag.BoolVar(&f.HTTPS,
 			"https",
diff --git a/test/performance/benchmarks/rollout-probe/continuous/main.go b/test/performance/benchmarks/rollout-probe/continuous/main.go
index 088344ad2..a5d1fd57a 100644
--- a/test/performance/benchmarks/rollout-probe/continuous/main.go
+++ b/test/performance/benchmarks/rollout-probe/continuous/main.go
@@ -95,7 +95,7 @@ func main() {
 	q.Input.ThresholdInputs = append(q.Input.ThresholdInputs, t.analyzers...)
 
 	// Send 1k QPS for the given duration with a 30s request timeout.
-	rate := vegeta.Rate{Freq: 1000, Per: time.Second}
+	rate := vegeta.Rate{Freq: 3600, Per: time.Second}
 	targeter := vegeta.NewStaticTargeter(t.target)
 	attacker := vegeta.NewAttacker(vegeta.Timeout(30 * time.Second))
 
@@ -106,11 +106,21 @@ func main() {
 		serving.ServiceLabelKey: *target,
 	})
 	log.Print("Selector: ", selector)
+
+	// Setup background metric processes
 	deploymentStatus := metrics.FetchDeploymentsStatus(ctx, namespace, selector, time.Second)
+	routeStatus := metrics.FetchRouteStatus(ctx, namespace, *target, time.Second)
+
 	// Start the attack!
 	results := attacker.Attack(targeter, rate, *duration, "rollout-test")
+	firstRev := ""
+
 	// After a minute, update the Ksvc.
-	updateSvc := time.After(time.Minute)
+	updateSvc := time.After(30 * time.Second)
+
+	// Since we might qfatal in the end, this would not execute the deferred calls
+	// thus failing the restore. So bind and execute explicitly.
+	var restoreFn func()
 LOOP:
 	for {
 		select {
@@ -120,17 +130,34 @@ LOOP:
 			break LOOP
 
 		case <-updateSvc:
-			log.Println("Updating the service: ", *target)
+			log.Println("Updating the service:", *target)
 			sc := servingclient.Get(ctx)
 			svc, err := sc.ServingV1().Services(namespace).Get(context.Background(), *target, metav1.GetOptions{})
 			if err != nil {
 				log.Fatalf("Error getting ksvc %s: %v", *target, err)
 			}
+			svc = svc.DeepCopy()
 			// Make sure we start with a single instance.
+
+			// At the end of the benchmark, restore to the previous value.
+			if prev := svc.Spec.Template.Annotations["autoscaling.knative.dev/minScale"]; prev != "" {
+				restoreFn = func() {
+					restore, err := sc.ServingV1().Services(namespace).Get(context.Background(), *target, metav1.GetOptions{})
+					if err != nil {
+						log.Println("Error getting service", err)
+						return
+					}
+					restore = restore.DeepCopy()
+					restore.Spec.Template.Annotations["autoscaling.knative.dev/minScale"] = prev
+					_, err = sc.ServingV1().Services(namespace).Update(
+						context.Background(), restore, metav1.UpdateOptions{})
+					log.Printf("Restoring the service to initial minScale = %s, err: %#v", prev, err)
+				}
+			}
 			svc.Spec.Template.Annotations["autoscaling.knative.dev/minScale"] = "1"
 			_, err = sc.ServingV1().Services(namespace).Update(context.Background(), svc, metav1.UpdateOptions{})
 			if err != nil {
-				log.Fatalf("Error updating ksvc %s: %v", *target, err)
+				fatalf("Error updating ksvc %s: %v", *target, err)
 			}
 			log.Println("Successfully updated the service.")
 		case res, ok := <-results:
@@ -147,8 +174,30 @@ LOOP:
 				"dp": float64(ds.DesiredReplicas),
 				"ap": float64(ds.ReadyReplicas),
 			})
+		case rs := <-routeStatus:
+			if firstRev == "" {
+				firstRev = rs.Traffic[0].RevisionName
+			}
+			v := make(map[string]float64, 2)
+			if len(rs.Traffic) == 1 {
+				// If the name matches the first revision then it's before
+				// we started the rollout. If not, then the rollout is
+				// 100% complete.
+				if rs.Traffic[0].RevisionName == firstRev {
+					v["t1"] = float64(*rs.Traffic[0].Percent)
+				} else {
+					v["t2"] = float64(*rs.Traffic[0].Percent)
+				}
+			} else {
+				v["t1"] = float64(*rs.Traffic[0].Percent)
+				v["t2"] = float64(*rs.Traffic[1].Percent)
+			}
+			q.AddSamplePoint(mako.XTime(rs.Time), v)
 		}
 	}
+	if restoreFn != nil {
+		restoreFn()
+	}
 
 	// Walk over our accumulated per-second error rates and report them as
 	// sample points.  The key is seconds since the Unix epoch, and the value
diff --git a/test/performance/benchmarks/rollout-probe/continuous/rollout-probe-setup.yaml b/test/performance/benchmarks/rollout-probe/continuous/rollout-probe-setup.yaml
index f081a2a28..911225f42 100644
--- a/test/performance/benchmarks/rollout-probe/continuous/rollout-probe-setup.yaml
+++ b/test/performance/benchmarks/rollout-probe/continuous/rollout-probe-setup.yaml
@@ -51,7 +51,7 @@ spec:
           limits:
             cpu: 50m
             memory: 50Mi
-      containerConcurrency: 1
+      containerConcurrency: 5
 ---
 apiVersion: serving.knative.dev/v1
 kind: Service
@@ -92,5 +92,5 @@ spec:
           limits:
             cpu: 50m
             memory: 50Mi
-      containerConcurrency: 1
+      containerConcurrency: 5
 ---
diff --git a/test/performance/benchmarks/rollout-probe/dev.config b/test/performance/benchmarks/rollout-probe/dev.config
index bcfa6164c..643931d19 100644
--- a/test/performance/benchmarks/rollout-probe/dev.config
+++ b/test/performance/benchmarks/rollout-probe/dev.config
@@ -71,3 +71,11 @@ metric_info_list: {
   value_key: "ap"
   label: "available-pods"
 }
+metric_info_list: {
+  value_key: "t1"
+  label: "tarffic-old"
+}
+metric_info_list: {
+  value_key: "t2"
+  label: "tarffic-new"
+}
diff --git a/test/performance/benchmarks/rollout-probe/prod.config b/test/performance/benchmarks/rollout-probe/prod.config
index 37afee7ab..34f0dc3d9 100644
--- a/test/performance/benchmarks/rollout-probe/prod.config
+++ b/test/performance/benchmarks/rollout-probe/prod.config
@@ -71,3 +71,11 @@ metric_info_list: {
   value_key: "ap"
   label: "available-pods"
 }
+metric_info_list: {
+  value_key: "t1"
+  label: "tarffic-old"
+}
+metric_info_list: {
+  value_key: "t2"
+  label: "tarffic-new"
+}
diff --git a/test/performance/metrics/request.go b/test/performance/metrics/request.go
index c0e12689e..5befc627f 100644
--- a/test/performance/metrics/request.go
+++ b/test/performance/metrics/request.go
@@ -17,6 +17,8 @@ limitations under the License.
 package metrics
 
 import (
+	"log"
+
 	"github.com/google/mako/go/quickstore"
 	vegeta "github.com/tsenart/vegeta/v12/lib"
 
@@ -50,6 +52,7 @@ func HandleResult(q *quickstore.Quickstore, res vegeta.Result, latencyKey string
 		// the details page for each Mako run.
 		q.AddError(mako.XTime(res.Timestamp), res.Error)
 		isAnError = 1
+		log.Printf("Error from the app: %#v", res.Error)
 	} else {
 		// Add a sample points for the target benchmark's latency stat
 		// with the latency of the request this result is for.
diff --git a/test/performance/metrics/runtime.go b/test/performance/metrics/runtime.go
index e49cc4bbd..7f0e0c2bb 100644
--- a/test/performance/metrics/runtime.go
+++ b/test/performance/metrics/runtime.go
@@ -27,6 +27,8 @@ import (
 	netv1alpha1 "knative.dev/networking/pkg/apis/networking/v1alpha1"
 	sksinformer "knative.dev/networking/pkg/client/injection/informers/networking/v1alpha1/serverlessservice"
 	deploymentinformer "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment"
+	v1 "knative.dev/serving/pkg/apis/serving/v1"
+	routeinformer "knative.dev/serving/pkg/client/injection/informers/serving/v1/route"
 
 	// Mysteriously required to support GCP auth (required by k8s libs).
 	// Apparently just importing it is enough. @_@ side effects @_@. https://github.com/kubernetes/client-go/issues/242
@@ -68,6 +70,33 @@ func FetchDeploymentStatus(
 	})
 }
 
+// RouteStatus contains the traffic distribution at the probe time.
+type RouteStatus struct {
+	Traffic []v1.TrafficTarget
+	Time    time.Time
+}
+
+// FetchRouteStatus returns a channel that will contain the traffic distribution
+// at regular time intervals.
+func FetchRouteStatus(ctx context.Context, namespace, name string, duration time.Duration) <-chan RouteStatus {
+	rl := routeinformer.Get(ctx).Lister().Routes(namespace)
+	ch := make(chan RouteStatus)
+	startTick(duration, ctx.Done(), func(t time.Time) error {
+		r, err := rl.Get(name)
+		r.DeepCopy()
+		if err != nil {
+			return err
+		}
+		rs := RouteStatus{
+			Traffic: r.Status.Traffic,
+			Time:    t,
+		}
+		ch <- rs
+		return nil
+	})
+	return ch
+}
+
 func fetchStatusInternal(ctx context.Context, duration time.Duration,
 	f func() ([]*appsv1.Deployment, error)) <-chan DeploymentStatus {
 	ch := make(chan DeploymentStatus)
diff --git a/test/performance/performance-tests.sh b/test/performance/performance-tests.sh
index 56b1c20d2..e7da657cc 100755
--- a/test/performance/performance-tests.sh
+++ b/test/performance/performance-tests.sh
@@ -71,12 +71,19 @@ function update_knative() {
   # Update the activator hpa minReplicas to 10
   kubectl patch hpa -n knative-serving activator \
     --patch '{"spec": {"minReplicas": 10}}'
+
   # Update the scale-to-zero grace period to 10s
   kubectl patch configmap/config-autoscaler \
     -n knative-serving \
     --type merge \
     -p '{"data":{"scale-to-zero-grace-period":"10s"}}'
 
+  # Ensure gradual rollout is enabled.
+  kubectl patch configmap/config-network\
+    -n knative-serving \
+    --type merge \
+    -p '{"data":{"rolloutDuration":"240"}}'
+
   echo ">> Setting up 'prod' config-mako"
   cat <<EOF | kubectl apply -f -
 apiVersion: v1
diff --git a/third_party/cert-manager-latest/net-certmanager.yaml b/third_party/cert-manager-latest/net-certmanager.yaml
index 8f32cd39f..7059bfdea 100644
--- a/third_party/cert-manager-latest/net-certmanager.yaml
+++ b/third_party/cert-manager-latest/net-certmanager.yaml
@@ -18,7 +18,7 @@ metadata:
   # These are the permissions needed by the `cert-manager` `Certificate` implementation.
   name: knative-serving-certmanager
   labels:
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
     serving.knative.dev/controller: "true"
     networking.knative.dev/certificate-provider: cert-manager
 rules:
@@ -49,7 +49,7 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: config.webhook.net-certmanager.networking.internal.knative.dev
   labels:
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
 webhooks:
   - admissionReviewVersions:
       - v1beta1
@@ -86,7 +86,7 @@ metadata:
   name: net-certmanager-webhook-certs
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
 
 ---
 # Copyright 2020 The Knative Authors
@@ -109,7 +109,7 @@ metadata:
   name: config-certmanager
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
     networking.knative.dev/certificate-provider: cert-manager
 data:
   _example: |
@@ -156,7 +156,7 @@ metadata:
   name: networking-certmanager
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
     networking.knative.dev/certificate-provider: cert-manager
 spec:
   selector:
@@ -168,14 +168,14 @@ spec:
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
       labels:
         app: networking-certmanager
-        serving.knative.dev/release: "v20201218-331d448"
+        serving.knative.dev/release: "v20210101-d4e4184"
     spec:
       serviceAccountName: controller
       containers:
         - name: networking-certmanager
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/controller@sha256:f3ab8c6e8e52ecd9ba72b9fa8a40a4ca89bfba78f4c020b54485251b6f968510
+          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/controller@sha256:bf1dfbc1d6dec1a487f1f261edae616c7677e0f568f5aa788ca55f706e70a124
           resources:
             requests:
               cpu: 30m
@@ -213,7 +213,7 @@ kind: Service
 metadata:
   labels:
     app: networking-certmanager
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
     networking.knative.dev/certificate-provider: cert-manager
   name: networking-certmanager
   namespace: knative-serving
@@ -250,7 +250,7 @@ metadata:
   name: net-certmanager-webhook
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
 spec:
   selector:
     matchLabels:
@@ -263,14 +263,14 @@ spec:
       labels:
         app: net-certmanager-webhook
         role: net-certmanager-webhook
-        serving.knative.dev/release: "v20201218-331d448"
+        serving.knative.dev/release: "v20210101-d4e4184"
     spec:
       serviceAccountName: controller
       containers:
         - name: webhook
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/webhook@sha256:755d449cefe053c777d94442f1dd3098a2a70d9a5ac3501051560d859dcb04fa
+          image: gcr.io/knative-nightly/knative.dev/net-certmanager/cmd/webhook@sha256:c88dc359671e7693ee882722854ee43de13190c50d5094a2f425ce8006494098
           resources:
             requests:
               cpu: 20m
@@ -329,7 +329,7 @@ metadata:
   namespace: knative-serving
   labels:
     role: net-certmanager-webhook
-    serving.knative.dev/release: "v20201218-331d448"
+    serving.knative.dev/release: "v20210101-d4e4184"
 spec:
   ports:
     # Define metrics and profiling for them to be accessible within service meshes.
diff --git a/third_party/contour-latest/contour.yaml b/third_party/contour-latest/contour.yaml
index 314a662af..79d9f13aa 100644
--- a/third_party/contour-latest/contour.yaml
+++ b/third_party/contour-latest/contour.yaml
@@ -1482,7 +1482,7 @@ spec:
     spec:
       containers:
         - name: contour
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: Always
           command:
             - contour
@@ -1709,7 +1709,7 @@ spec:
             - --contour-key-file=/certs/tls.key
             - --config-path=/config/contour.yaml
           command: ["contour"]
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: IfNotPresent
           name: contour
           ports:
@@ -1798,7 +1798,7 @@ spec:
           args:
             - envoy
             - shutdown-manager
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -1875,7 +1875,7 @@ spec:
             - --envoy-key-file=/certs/tls.key
           command:
             - contour
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: IfNotPresent
           name: envoy-initconfig
           volumeMounts:
@@ -2097,7 +2097,7 @@ spec:
     spec:
       containers:
         - name: contour
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: Always
           command:
             - contour
@@ -2217,7 +2217,7 @@ spec:
             - --contour-key-file=/certs/tls.key
             - --config-path=/config/contour.yaml
           command: ["contour"]
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: IfNotPresent
           name: contour
           ports:
@@ -2306,7 +2306,7 @@ spec:
           args:
             - envoy
             - shutdown-manager
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -2383,7 +2383,7 @@ spec:
             - --envoy-key-file=/certs/tls.key
           command:
             - contour
-          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:980cb989c30f3b054f0f036353f6ac1c2e6af629adfc35e92a94a5c161b74a79
+          image: gcr.io/knative-nightly/github.com/projectcontour/contour/cmd/contour@sha256:1583a4c034cfb81a824660c377e23751f91358a9fcf63e0b5a6cf3d60fa96112
           imagePullPolicy: IfNotPresent
           name: envoy-initconfig
           volumeMounts:
diff --git a/third_party/contour-latest/net-contour.yaml b/third_party/contour-latest/net-contour.yaml
index 6f5ae71f0..67fe30769 100644
--- a/third_party/contour-latest/net-contour.yaml
+++ b/third_party/contour-latest/net-contour.yaml
@@ -33,7 +33,7 @@ metadata:
   namespace: knative-serving
   labels:
     networking.knative.dev/ingress-provider: contour
-    serving.knative.dev/release: "v20201218-f99d5ae0"
+    serving.knative.dev/release: "v20210101-47e72ff3"
 data:
   _example: |
     ################################
@@ -103,7 +103,7 @@ spec:
         - name: controller
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-contour/cmd/controller@sha256:70c89faed029f8a65c420edcbc803c7ec0c79745b483d9680ab7e9eeb6adc920
+          image: gcr.io/knative-nightly/knative.dev/net-contour/cmd/controller@sha256:41eba25f803191f018a6b5429b2284470d5e339f22798d36240327e21a5053b8
           resources:
             requests:
               cpu: 40m
diff --git a/third_party/istio-latest/net-istio.yaml b/third_party/istio-latest/net-istio.yaml
index 2738dd86c..cd6693238 100644
--- a/third_party/istio-latest/net-istio.yaml
+++ b/third_party/istio-latest/net-istio.yaml
@@ -1,4 +1,4 @@
-# Generated when HEAD was 8ad22ab7d65699cd86ba0bd01ae185dffd750f46
+# Generated when HEAD was 22067c7b3c590234e39c530f95803a04813a0e39
 #
 # Copyright 2019 The Knative Authors
 #
@@ -20,7 +20,7 @@ metadata:
   # These are the permissions needed by the Istio Ingress implementation.
   name: knative-serving-istio
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     serving.knative.dev/controller: "true"
     networking.knative.dev/ingress-provider: istio
 rules:
@@ -50,7 +50,7 @@ metadata:
   name: knative-ingress-gateway
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   selector:
@@ -87,7 +87,7 @@ metadata:
   name: knative-local-gateway
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   selector:
@@ -106,7 +106,7 @@ metadata:
   name: knative-local-gateway
   namespace: istio-system
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   type: ClusterIP
@@ -126,7 +126,7 @@ metadata:
   name: "webhook"
   namespace: "knative-serving"
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   selector:
@@ -141,7 +141,7 @@ metadata:
   name: "istio-webhook"
   namespace: "knative-serving"
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   selector:
@@ -170,7 +170,7 @@ kind: MutatingWebhookConfiguration
 metadata:
   name: webhook.istio.networking.internal.knative.dev
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 webhooks:
   - admissionReviewVersions:
@@ -206,7 +206,7 @@ kind: ValidatingWebhookConfiguration
 metadata:
   name: config.webhook.istio.networking.internal.knative.dev
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 webhooks:
   - admissionReviewVersions:
@@ -244,7 +244,7 @@ metadata:
   name: istio-webhook-certs
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 
 ---
@@ -268,7 +268,7 @@ metadata:
   name: config-istio
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 data:
   _example: |
@@ -315,6 +315,10 @@ data:
     # To use only Istio service mesh and no knative-local-gateway, replace
     # all local-gateway.* entries by the following entry.
     local-gateway.mesh: "mesh"
+
+    # If true, knative will use the Istio VirtualService's status to determine
+    # endpoint readiness. Otherwise, probe as usual.
+    enable-virtualservice-status: "false"
   # TODO(nghia): Extract the .svc.cluster.local suffix into its own config.
 
 ---
@@ -338,7 +342,7 @@ metadata:
   name: networking-istio
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   selector:
@@ -354,14 +358,14 @@ spec:
         sidecar.istio.io/inject: "false"
       labels:
         app: networking-istio
-        serving.knative.dev/release: "v20201218-8ad22ab7"
+        serving.knative.dev/release: "v20210101-22067c7b"
     spec:
       serviceAccountName: controller
       containers:
         - name: networking-istio
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/controller@sha256:7dc86d2f207f4cdcdde333c44e85dad25ce452f7f901d6934978af3b6ac2b60d
+          image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/controller@sha256:9010459b0a1f7630adaee1f35eb9c26c5d246acdc55bd712b44bb222bbf9c395
           resources:
             requests:
               cpu: 30m
@@ -418,7 +422,7 @@ metadata:
   name: istio-webhook
   namespace: knative-serving
   labels:
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   selector:
@@ -432,14 +436,14 @@ spec:
       labels:
         app: istio-webhook
         role: istio-webhook
-        serving.knative.dev/release: "v20201218-8ad22ab7"
+        serving.knative.dev/release: "v20210101-22067c7b"
     spec:
       serviceAccountName: controller
       containers:
         - name: webhook
           # This is the Go import path for the binary that is containerized
           # and substituted here.
-          image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/webhook@sha256:5883bfcb760f1004a9ef06422336b8f4a6456b2d5d30e5fe9fce9dbe05a8593d
+          image: gcr.io/knative-nightly/knative.dev/net-istio/cmd/webhook@sha256:e07dde7ba1da7e6eae1595830794f144d4bae9c7b802c2483ac7ac1646a4ff90
           resources:
             requests:
               cpu: 20m
@@ -493,7 +497,7 @@ metadata:
   namespace: knative-serving
   labels:
     role: istio-webhook
-    serving.knative.dev/release: "v20201218-8ad22ab7"
+    serving.knative.dev/release: "v20210101-22067c7b"
     networking.knative.dev/ingress-provider: istio
 spec:
   ports:
diff --git a/third_party/kourier-latest/kourier.yaml b/third_party/kourier-latest/kourier.yaml
index f620e2123..2949ea4ec 100644
--- a/third_party/kourier-latest/kourier.yaml
+++ b/third_party/kourier-latest/kourier.yaml
@@ -18,7 +18,7 @@ metadata:
   name: kourier-system
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 
 ---
 # Copyright 2020 The Knative Authors
@@ -42,7 +42,7 @@ metadata:
   namespace: knative-serving
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -51,7 +51,7 @@ metadata:
   namespace: knative-serving
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 rules:
   - apiGroups: [""]
     resources: ["events"]
@@ -78,7 +78,7 @@ metadata:
   name: 3scale-kourier
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -110,7 +110,7 @@ metadata:
   namespace: knative-serving
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 spec:
   replicas: 1
   selector:
@@ -122,7 +122,7 @@ spec:
         app: 3scale-kourier-control
     spec:
       containers:
-        - image: gcr.io/knative-nightly/knative.dev/net-kourier/cmd/kourier@sha256:cf44b3818377a6e5ede4cafffa7a3788eb269187d96b3180d7d2f077f47df56c
+        - image: gcr.io/knative-nightly/knative.dev/net-kourier/cmd/kourier@sha256:1324b3734e6b3bed406b49ff306e4a7350110f55f54c21e5f0bf68d31192889a
           name: kourier-control
           env:
             - name: CERTS_SECRET_NAMESPACE
@@ -158,7 +158,7 @@ metadata:
   namespace: knative-serving
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 spec:
   ports:
     - name: grpc-xds
@@ -191,7 +191,7 @@ metadata:
   namespace: kourier-system
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 spec:
   selector:
     matchLabels:
@@ -257,7 +257,7 @@ metadata:
   namespace: kourier-system
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 spec:
   ports:
     - name: http2
@@ -279,7 +279,7 @@ metadata:
   namespace: kourier-system
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 spec:
   ports:
     - name: http2
@@ -297,7 +297,7 @@ metadata:
   namespace: kourier-system
   labels:
     networking.knative.dev/ingress-provider: kourier
-    serving.knative.dev/release: "v20201218-50a79df5"
+    serving.knative.dev/release: "v20210104-997dd405"
 data:
   envoy-bootstrap.yaml: |
     dynamic_resources:
diff --git a/vendor/knative.dev/pkg/metrics/testing.go b/vendor/knative.dev/pkg/metrics/testing.go
index eb048f9cb..28b2e5878 100644
--- a/vendor/knative.dev/pkg/metrics/testing.go
+++ b/vendor/knative.dev/pkg/metrics/testing.go
@@ -16,6 +16,10 @@ limitations under the License.
 
 package metrics
 
+const (
+	testComponent = "testComponent"
+)
+
 // InitForTesting initialize the necessary global variables for unit tests.
 func InitForTesting() {
 	setCurMetricsConfig(&metricsConfig{