diff --git a/pkg/client/istio/clientset/versioned/fake/register.go b/pkg/client/istio/clientset/versioned/fake/register.go
index 980e3d2261..acc57ea1a9 100644
--- a/pkg/client/istio/clientset/versioned/fake/register.go
+++ b/pkg/client/istio/clientset/versioned/fake/register.go
@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//   import (
-//     "k8s.io/client-go/kubernetes"
-//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//   )
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
 //
-//   kclientset, _ := kubernetes.NewForConfig(c)
-//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/pkg/client/istio/clientset/versioned/scheme/register.go b/pkg/client/istio/clientset/versioned/scheme/register.go
index 6f2a312b25..1b5130494f 100644
--- a/pkg/client/istio/clientset/versioned/scheme/register.go
+++ b/pkg/client/istio/clientset/versioned/scheme/register.go
@@ -37,14 +37,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
 // of clientsets, like in:
 //
-//   import (
-//     "k8s.io/client-go/kubernetes"
-//     clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-//     aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
-//   )
+//	import (
+//	  "k8s.io/client-go/kubernetes"
+//	  clientsetscheme "k8s.io/client-go/kubernetes/scheme"
+//	  aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme"
+//	)
 //
-//   kclientset, _ := kubernetes.NewForConfig(c)
-//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//	kclientset, _ := kubernetes.NewForConfig(c)
+//	_ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
diff --git a/pkg/reconciler/ingress/doc.go b/pkg/reconciler/ingress/doc.go
index c4597b76db..e1f0dd733c 100644
--- a/pkg/reconciler/ingress/doc.go
+++ b/pkg/reconciler/ingress/doc.go
@@ -15,9 +15,7 @@ limitations under the License.
 */
 
 /*
-
 Package ingress implements a kubernetes controller which tracks Ingress resource
 and reconcile VirtualService as its child resource.
-
 */
 package ingress
diff --git a/pkg/reconciler/ingress/ingress.go b/pkg/reconciler/ingress/ingress.go
index 15dd2c2b72..98329d8f43 100644
--- a/pkg/reconciler/ingress/ingress.go
+++ b/pkg/reconciler/ingress/ingress.go
@@ -521,6 +521,7 @@ func isIngressPublic(ing *v1alpha1.Ingress) bool {
 
 // areVirtualServicesReady checks if *all* the provided virtual services have a status, and if so if it's ready.
 // The return values are (hasStatus, ready), where:
+//
 //	hasStatus indicates whether all the virtualServices have a status field
 //	ready indicates whether they all have been reconciled and are able to receive requests
 func (r *Reconciler) areVirtualServicesReady(ctx context.Context, vses []*v1alpha3.VirtualService) (hasStatus, ready bool) {
@@ -547,6 +548,7 @@ func (r *Reconciler) areVirtualServicesReady(ctx context.Context, vses []*v1alph
 
 // isVirtualServiceReady checks if a virtual service has a status, and if so if it's ready.
 // The return values are (hasStatus, ready, err), where:
+//
 //	hasStatus indicates whether the virtualService has a status field
 //	ready indicates whether it's been reconciled and able to receive requests
 //	err indicates an error occurred while looking up the status.
diff --git a/pkg/reconciler/ingress/ingress_test.go b/pkg/reconciler/ingress/ingress_test.go
index 59a80ba5d2..110fe2178c 100644
--- a/pkg/reconciler/ingress/ingress_test.go
+++ b/pkg/reconciler/ingress/ingress_test.go
@@ -90,9 +90,10 @@ const (
 )
 
 // ingressfinalizer is the name that we put into the resource finalizer list, e.g.
-//  metadata:
-//    finalizers:
-//    - ingresses.networking.internal.knative.dev
+//
+//	metadata:
+//	  finalizers:
+//	  - ingresses.networking.internal.knative.dev
 var (
 	ingressResource  = v1alpha1.Resource("ingresses")
 	ingressFinalizer = ingressResource.String()
diff --git a/test/e2e/clients.go b/test/e2e/clients.go
index e2edc47d9b..77b4e70e65 100644
--- a/test/e2e/clients.go
+++ b/test/e2e/clients.go
@@ -13,6 +13,7 @@ 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 e2e
 
 import (