Update to Go 1.20 and latest KRTE for e2e tests

E2Es broke a few days ago, likely when test-infra upgraded to 1.20. I
also couldn't run staticcheck on my Google workstation, which has 1.20,
with the same failure message. Upgrading staticcheck fixed the problem;
I also took the opportunity to match the test-infra krte image as well
as the Golang version (which caused some minor reformatting).

Tested: couldn't build on my workstation on Go 1.20 before this change;
can after it.

Author: adrianludwin

Makefile

@@ -206,6 +206,7 @@ staticcheck: build-staticcheck
 	$(STATICCHECK) ${DIRS}
 
 build-staticcheck:
+	@echo "If this next step fails, try updating honnef.co/go/tools in go.mod"
 	go build -o $(STATICCHECK) honnef.co/go/tools/cmd/staticcheck
 
 # Generate code
@@ -220,6 +221,8 @@ check-generate: generate
 # Use the version of controller-gen that's checked into vendor/ (see
 # hack/tools.go to see how it got there).
 controller-gen:
+	@echo "Go version (for logging posterity):"
+	@go version
 	go build -o $(CONTROLLER_GEN) sigs.k8s.io/controller-tools/cmd/controller-gen
 
 ###################### DEPLOYABLE ARTIFACTS AND ACTIONS #########################

go.mod

@@ -1,6 +1,6 @@
 module sigs.k8s.io/hierarchical-namespaces
 
-go 1.17
+go 1.20
 
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.0
@@ -14,7 +14,7 @@ require (
 	github.com/spf13/cobra v1.2.1
 	go.opencensus.io v0.23.0
 	go.uber.org/zap v1.19.1
-	honnef.co/go/tools v0.3.0
+	honnef.co/go/tools v0.4.0
 	k8s.io/api v0.23.2
 	k8s.io/apiextensions-apiserver v0.23.2
 	k8s.io/apimachinery v0.23.2
@@ -32,7 +32,7 @@ require (
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/logger v0.2.1 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/BurntSushi/toml v0.4.1 // indirect
+	github.com/BurntSushi/toml v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/aws/aws-sdk-go v1.23.20 // indirect
@@ -89,16 +89,16 @@ require (
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20220218215828-6cf2b201936e // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
-	golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect
+	golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect
+	golang.org/x/mod v0.7.0 // indirect
+	golang.org/x/net v0.3.0 // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20220406163625-3f8b81556e12 // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
-	golang.org/x/text v0.3.7
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/term v0.3.0 // indirect
+	golang.org/x/text v0.5.0
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
-	golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a // indirect
+	golang.org/x/tools v0.4.1-0.20221208213631-3f74d914ae6d // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/api v0.44.0 // indirect

go.sum

@@ -16,7 +16,7 @@ PROW_TMP := $(shell mktemp -d)
 #
 # Also, when you do this, please also upgrade the version of Kind we download
 # in prow-run-e2e.sh in this directory.
-KRTE_IMG ?= gcr.io/k8s-staging-test-infra/krte:v20220322-c5eee43783-master
+KRTE_IMG ?= gcr.io/k8s-staging-test-infra/krte:v20230207-ce569a5e37-master
 
 # The variant of HNC to test; this can be default, ha, or omitted (defaults to
 # "default"). See prow-run-e2e.sh for details.

hack/Makefile

@@ -358,6 +358,7 @@ func (r *Reconciler) writeInstance(ctx context.Context, log logr.Logger, inst *a
 
 // deleteInstance deletes the anchor instance. Note: Make sure there's no
 // finalizers on the instance before calling this function.
+//
 //lint:ignore U1000 Ignore for now, as it may be used again in the future
 func (r *Reconciler) deleteInstance(ctx context.Context, inst *api.SubnamespaceAnchor) error {
 	if err := r.Delete(ctx, inst); err != nil {

internal/anchor/reconciler.go

@@ -132,12 +132,12 @@ func (n *Namespace) canUseResources(u v1.ResourceList) error {
 // UseResources can be called in the following scenarios:
 //   - Called by the HRQ admission controller when a request is allowed
 //   - Called by the HRQ ResourceQuota reconciler when it observes `local`
-//  usages are different from ResourceQuota.Status.Used
+//     usages are different from ResourceQuota.Status.Used
 //   - Called by the HRQ Namespace reconciler to remove `local` usages of a
-//  namespace from the subtree usages of the previous ancestors of the namespace.
+//     namespace from the subtree usages of the previous ancestors of the namespace.
 //   - Called by the SetParent to remove `local` usages of a namespace from
-//  the subtree usages of the previous ancestors of the namespace and add the
-//  usages to the new ancestors following a parent update
+//     the subtree usages of the previous ancestors of the namespace and add the
+//     usages to the new ancestors following a parent update
 func (n *Namespace) UseResources(newUsage v1.ResourceList) {
 	oldUsage := n.quotas.used.local
 

internal/forest/namespacehrq.go

@@ -13,21 +13,22 @@ import (
 // subnamespace as well:
 // * If the string element is a hyphen ('-'), the namespace is a root.
 // * If the string element is a lowercase letter, the referenced namespace is a normal parent.
-//   * If the referenced namespace is not in len(desc), it will not exist and we'll set
-//   ParentMissing on the child.
+//   - If the referenced namespace is not in len(desc), it will not exist and we'll set
+//     ParentMissing on the child.
+//
 // * If the string element is an uppercase letter, that namespaces will be the parent and the
 // *current* namespace will be a subnamespace.
 //
 // Examples:
-// * "-"   -> creates a single namespace "a" that is a root
-// * "-a"  -> creates the tree a <- b
-// * "-A"  -> creates the tree a <- b where b is a subnamespace of a
-// * "z"   -> creates the tree z <- a where z does not exist and a has ParentMissing
-// * "-aa" -> creates namespace `a` with two children, `b` and `c`
-// * "-aA" -> as above, but c is a subnamespace and b is a full namespace
-// * "ba"  -> creates a cycle
-// * "-aa-dd" -> creates two trees, one with root `a` and children `b` and `c`, the other with root
-//               `d` and children `e` and `f`
+//   - "-"   -> creates a single namespace "a" that is a root
+//   - "-a"  -> creates the tree a <- b
+//   - "-A"  -> creates the tree a <- b where b is a subnamespace of a
+//   - "z"   -> creates the tree z <- a where z does not exist and a has ParentMissing
+//   - "-aa" -> creates namespace `a` with two children, `b` and `c`
+//   - "-aA" -> as above, but c is a subnamespace and b is a full namespace
+//   - "ba"  -> creates a cycle
+//   - "-aa-dd" -> creates two trees, one with root `a` and children `b` and `c`, the other with root
+//     `d` and children `e` and `f`
 func Create(desc string) *forest.Forest {
 	const upper = 'A'
 	const lower = 'a'

internal/foresttest/foresttest.go

@@ -447,6 +447,7 @@ func setTypeConfig(ctx context.Context, group, resource string, mode api.Synchro
 
 // updateTypeConfig is like setTypeConfig but it doesn't wait to confirm that the change was
 // successful.
+//
 //lint:ignore U1000 Ignore for now, as it may be used again in the future
 func updateTypeConfig(ctx context.Context, group, resource string, mode api.SynchronizationMode) {
 	updateTypeConfigWithOffset(ctx, 1, group, resource, mode)

internal/hncconfig/reconciler_test.go

@@ -32,10 +32,10 @@ type RQEnqueuer interface {
 
 // HierarchicalResourceQuotaReconciler reconciles a HierarchicalResourceQuota object. It has three key
 // purposes:
-// 1. Update the in-memory forest with all the limits defined in the HRQ spec, so that they can be
-//    used during admission control to reject requests.
-// 2. Write all the usages from the in-memory forest back to the HRQ status.
-// 3. Enqueue all relevant RQs when an HRQ changes.
+//  1. Update the in-memory forest with all the limits defined in the HRQ spec, so that they can be
+//     used during admission control to reject requests.
+//  2. Write all the usages from the in-memory forest back to the HRQ status.
+//  3. Enqueue all relevant RQs when an HRQ changes.
 type HierarchicalResourceQuotaReconciler struct {
 	client.Client
 	Log logr.Logger

internal/hrq/hrqreconciler.go

@@ -2,8 +2,8 @@ package hrq
 
 import (
 	"context"
+	"crypto/rand"
 	"fmt"
-	"math/rand"
 	"strings"
 
 	"github.com/go-logr/logr"