Merge branch 'main' into jtc/merge-main-at-d7849c79-to-github

internal/controller/authenticator/authncache/cache_test.go

@@ -55,7 +55,7 @@ func TestCache(t *testing.T) {
 		{APIGroup: "b", Kind: "b", Name: "a"},
 		{APIGroup: "b", Kind: "b", Name: "b"},
 	}
-	for tries := 0; tries < 10; tries++ {
+	for range 10 {
 		cache := New()
 		for _, i := range rand.Perm(len(keysInExpectedOrder)) {
 			cache.Store(keysInExpectedOrder[i], nil)

internal/controller/authenticator/cachecleaner/cachecleaner_test.go

@@ -133,7 +133,6 @@ func TestController(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			// When we have t.Parallel() here, this test blocks pretty consistently...y tho?
 

internal/controller/authenticator/jwtcachefiller/jwtcachefiller_test.go

@@ -1031,7 +1031,7 @@ func TestController(t *testing.T) {
 			},
 			// no explicit logs, this is an issue of config, the user must provide TLS config for the
 			// custom cert provided for this server.
-			wantSyncLoopErr:  testutil.WantX509UntrustedCertErrorString(`could not perform oidc discovery on provider issuer: Get "`+goodIssuer+`/.well-known/openid-configuration": %s`, "Acme Co"),
+			wantSyncLoopErr:  testutil.WantSprintfErrorString(`could not perform oidc discovery on provider issuer: Get "%s/.well-known/openid-configuration": tls: failed to verify certificate: x509: certificate signed by unknown authority`, goodIssuer),
 			wantCacheEntries: 0,
 		},
 		{
@@ -1663,7 +1663,6 @@ func TestController(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1781,7 +1780,6 @@ func TestController(t *testing.T) {
 				tt.wantGroupsClaim,
 				goodIssuer,
 			) {
-				test := test
 				t.Run(test.name, func(t *testing.T) {
 					t.Parallel()
 

internal/controller/authenticator/webhookcachefiller/webhookcachefiller_test.go

@@ -1306,7 +1306,6 @@ func TestController(t *testing.T) {
 		},
 	}
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
@@ -1465,7 +1464,6 @@ func TestNewWebhookAuthenticator(t *testing.T) {
 	}
 
 	for _, tt := range tests {
-		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			var conditions []*metav1.Condition