Merge pull request #110811 from Abirdcfly/clock

Update golangci-lint to 1.46.2 and fix errors Kubernetes-commit: b3be343bc8d7b74d1da44cf51df7a4bf73f63ed6
kubernetes · Jul 7, 2022 · c8e11c6 · c8e11c6
2 parents de1be2b + 2ca7984
commit c8e11c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/azure/azure_test.go b/azure/azure_test.go
@@ -3050,12 +3050,12 @@ func TestCanCombineSharedAndPrivateRulesInSameGroup(t *testing.T) {
 		t.Fatalf("Expected security rule %q but it was not present", expectedRuleName13)
 	}
 
-	_, securityRule2, rule2Found = findSecurityRuleByName(*sg.SecurityRules, expectedRuleName2)
+	_, _, rule2Found = findSecurityRuleByName(*sg.SecurityRules, expectedRuleName2)
 	if !rule2Found {
 		t.Fatalf("Expected security rule %q but it was not present", expectedRuleName2)
 	}
 
-	_, securityRule4, rule4Found = findSecurityRuleByName(*sg.SecurityRules, expectedRuleName4)
+	_, _, rule4Found = findSecurityRuleByName(*sg.SecurityRules, expectedRuleName4)
 	if !rule4Found {
 		t.Fatalf("Expected security rule %q but it was not present", expectedRuleName4)
 	}

diff --git a/go.mod b/go.mod
@@ -24,7 +24,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8
 	google.golang.org/api v0.60.0
 	gopkg.in/gcfg.v1 v1.2.0
-	k8s.io/api v0.0.0-20220630195203-f18d381b8d01
+	k8s.io/api v0.0.0-20220706052006-33ab20e5ed38
 	k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48
 	k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc
 	k8s.io/cloud-provider v0.0.0-20220630204106-9a26d4868f3a
@@ -101,7 +101,7 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20220630195203-f18d381b8d01
+	k8s.io/api => k8s.io/api v0.0.0-20220706052006-33ab20e5ed38
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48
 	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220630201059-472a3106c94f
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc

diff --git a/go.sum b/go.sum
@@ -794,8 +794,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20220630195203-f18d381b8d01 h1:lsctqpUULMfNVvYZM+wge9s20nTyR4RO3TIWuLo845E=
-k8s.io/api v0.0.0-20220630195203-f18d381b8d01/go.mod h1:8xLknj7VYyQxjY6zTjssvX0nZGgprHTz/PCRvwsupmQ=
+k8s.io/api v0.0.0-20220706052006-33ab20e5ed38 h1:LEBGmSV3LP+g4DAiEiLjuoqTDEDMWS/zSXz5sljIhQA=
+k8s.io/api v0.0.0-20220706052006-33ab20e5ed38/go.mod h1:8xLknj7VYyQxjY6zTjssvX0nZGgprHTz/PCRvwsupmQ=
 k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48 h1:iPALyE8SMNRKOKR4sLdS7o3H01SB+wwuOdQH4EJ0kSg=
 k8s.io/apimachinery v0.0.0-20220630194836-a86969209a48/go.mod h1:vKWzUhIiF0QCkg/XOm3IS9daPl07j7FOqnNdmmHazTw=
 k8s.io/client-go v0.0.0-20220630195635-a16e76eb69cc h1:adt+isvukAibGqNS//V4r2SocMAoKSnas6I4EB0YFwE=