chore(deps): bump dependencies versions in go.mod (#4454)

Kong · Aug 23, 2023 · a78a623 · a78a623
1 parent 23ea18c
commit a78a623
Show file tree

Hide file tree

Showing 14 changed files with 58 additions and 95 deletions.
diff --git a/go.mod b/go.mod
@@ -173,10 +173,10 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e
-	golang.org/x/mod v0.10.0 // indirect
-	golang.org/x/oauth2 v0.11.0 // indirect
+	golang.org/x/crypto v0.11.0 // indirect
+	golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/oauth2 v0.10.0 // indirect
 	golang.org/x/sync v0.3.0
 	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/term v0.11.0 // indirect

diff --git a/go.sum b/go.sum
@@ -455,8 +455,8 @@ golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4
 golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA=
-golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
+golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b h1:r+vk0EmXNmekl0S0BascoeeoHk/L7wmaW2QF90K+kYI=
+golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

diff --git a/internal/dataplane/parser/parser_test.go b/internal/dataplane/parser/parser_test.go
@@ -311,9 +311,8 @@ func TestSecretConfigurationPlugin(t *testing.T) {
 		Services: []*corev1.Service{
 			{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:        "foo-svc",
-					Namespace:   "default",
-					Annotations: map[string]string{},
+					Name:      "foo-svc",
+					Namespace: "default",
 				},
 			},
 		},
@@ -3802,9 +3801,8 @@ func TestPluginAnnotations(t *testing.T) {
 		services := []*corev1.Service{
 			{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:        "foo-svc",
-					Namespace:   "default",
-					Annotations: map[string]string{},
+					Name:      "foo-svc",
+					Namespace: "default",
 				},
 			},
 		}
@@ -3901,9 +3899,8 @@ func TestPluginAnnotations(t *testing.T) {
 		services := []*corev1.Service{
 			{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:        "foo-svc",
-					Namespace:   "default",
-					Annotations: map[string]string{},
+					Name:      "foo-svc",
+					Namespace: "default",
 				},
 			},
 		}
@@ -3991,9 +3988,8 @@ func TestPluginAnnotations(t *testing.T) {
 		services := []*corev1.Service{
 			{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:        "foo-svc",
-					Namespace:   "default",
-					Annotations: map[string]string{},
+					Name:      "foo-svc",
+					Namespace: "default",
 				},
 			},
 		}

diff --git a/internal/dataplane/parser/translate_httproute_test.go b/internal/dataplane/parser/translate_httproute_test.go
@@ -1475,11 +1475,7 @@ func HTTPMethodPointer(method gatewayv1beta1.HTTPMethod) *gatewayv1beta1.HTTPMet
 }
 
 func k8sObjectInfoOfHTTPRoute(route *gatewayv1beta1.HTTPRoute) util.K8sObjectInfo {
-	// parsers always provide the annotations map, even if route didn't have any
 	anotations := route.Annotations
-	if anotations == nil {
-		anotations = make(map[string]string)
-	}
 
 	return util.K8sObjectInfo{
 		Name:        route.Name,

diff --git a/internal/dataplane/parser/translate_routes_helpers_test.go b/internal/dataplane/parser/translate_routes_helpers_test.go
@@ -41,9 +41,8 @@ func TestGenerateKongRoutesFromRouteRule_TCP(t *testing.T) {
 			expected: []kongstate.Route{
 				{
 					Ingress: util.K8sObjectInfo{
-						Name:        "mytcproute-name",
-						Namespace:   "mynamespace",
-						Annotations: map[string]string{},
+						Name:      "mytcproute-name",
+						Namespace: "mynamespace",
 					},
 					Route: kong.Route{
 						Name: lo.ToPtr("tcproute.mynamespace.mytcproute-name.0.0"),
@@ -106,9 +105,8 @@ func TestGenerateKongRoutesFromRouteRule_UDP(t *testing.T) {
 			expected: []kongstate.Route{
 				{
 					Ingress: util.K8sObjectInfo{
-						Name:        "myudproute-name",
-						Namespace:   "mynamespace",
-						Annotations: map[string]string{},
+						Name:      "myudproute-name",
+						Namespace: "mynamespace",
 					},
 					Route: kong.Route{
 						Name: lo.ToPtr("udproute.mynamespace.myudproute-name.0.0"),
@@ -169,9 +167,8 @@ func TestGenerateKongRoutesFromRouteRule_TLS(t *testing.T) {
 			expected: []kongstate.Route{
 				{
 					Ingress: util.K8sObjectInfo{
-						Name:        "mytlsroute-name",
-						Namespace:   "mynamespace",
-						Annotations: map[string]string{},
+						Name:      "mytlsroute-name",
+						Namespace: "mynamespace",
 					},
 					Route: kong.Route{
 						Name: lo.ToPtr("tlsroute.mynamespace.mytlsroute-name.0.0"),
@@ -203,9 +200,8 @@ func TestGenerateKongRoutesFromRouteRule_TLS(t *testing.T) {
 			expected: []kongstate.Route{
 				{
 					Ingress: util.K8sObjectInfo{
-						Name:        "mytlsroute-name",
-						Namespace:   "mynamespace",
-						Annotations: map[string]string{},
+						Name:      "mytlsroute-name",
+						Namespace: "mynamespace",
 					},
 					Route: kong.Route{
 						Name: lo.ToPtr("tlsroute.mynamespace.mytlsroute-name.0.0"),

diff --git a/internal/dataplane/parser/translate_utils_test.go b/internal/dataplane/parser/translate_utils_test.go
@@ -182,9 +182,8 @@ func TestGetPermittedForReferenceGrantFrom(t *testing.T) {
 	grants := []*gatewayv1beta1.ReferenceGrant{
 		{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:        uuid.NewString(),
-				Annotations: map[string]string{},
-				Namespace:   "fitrat",
+				Name:      uuid.NewString(),
+				Namespace: "fitrat",
 			},
 			Spec: gatewayv1beta1.ReferenceGrantSpec{
 				From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -214,9 +213,8 @@ func TestGetPermittedForReferenceGrantFrom(t *testing.T) {
 		},
 		{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:        uuid.NewString(),
-				Annotations: map[string]string{},
-				Namespace:   "cholpon",
+				Name:      uuid.NewString(),
+				Namespace: "cholpon",
 			},
 			Spec: gatewayv1beta1.ReferenceGrantSpec{
 				From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -332,9 +330,8 @@ func TestGenerateKongServiceFromBackendRef(t *testing.T) {
 	grants := []*gatewayv1beta1.ReferenceGrant{
 		{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:        uuid.NewString(),
-				Annotations: map[string]string{},
-				Namespace:   "fitrat",
+				Name:      uuid.NewString(),
+				Namespace: "fitrat",
 			},
 			Spec: gatewayv1beta1.ReferenceGrantSpec{
 				From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -364,9 +361,8 @@ func TestGenerateKongServiceFromBackendRef(t *testing.T) {
 		},
 		{
 			ObjectMeta: metav1.ObjectMeta{
-				Name:        uuid.NewString(),
-				Annotations: map[string]string{},
-				Namespace:   "cholpon",
+				Name:      uuid.NewString(),
+				Namespace: "cholpon",
 			},
 			Spec: gatewayv1beta1.ReferenceGrantSpec{
 				From: []gatewayv1beta1.ReferenceGrantFrom{

diff --git a/internal/dataplane/parser/translators/grpcroute_atc_test.go b/internal/dataplane/parser/translators/grpcroute_atc_test.go
@@ -124,7 +124,6 @@ func TestGenerateKongExpressionRoutesFromGRPCRouteRule(t *testing.T) {
 					Ingress: util.K8sObjectInfo{
 						Name:             "multiple-matches",
 						Namespace:        "default",
-						Annotations:      map[string]string{},
 						GroupVersionKind: grpcRouteGVK,
 					},
 					ExpressionRoutes: true,
@@ -138,7 +137,6 @@ func TestGenerateKongExpressionRoutesFromGRPCRouteRule(t *testing.T) {
 					Ingress: util.K8sObjectInfo{
 						Name:             "multiple-matches",
 						Namespace:        "default",
-						Annotations:      map[string]string{},
 						GroupVersionKind: grpcRouteGVK,
 					},
 					ExpressionRoutes: true,

diff --git a/internal/dataplane/parser/translators/grpcroute_test.go b/internal/dataplane/parser/translators/grpcroute_test.go
@@ -165,7 +165,6 @@ func TestGenerateKongRoutesFromGRPCRouteRule(t *testing.T) {
 					Ingress: util.K8sObjectInfo{
 						Name:             "multiple-matches",
 						Namespace:        "default",
-						Annotations:      map[string]string{},
 						GroupVersionKind: grpcRouteGVK,
 					},
 					Route: kong.Route{
@@ -182,7 +181,6 @@ func TestGenerateKongRoutesFromGRPCRouteRule(t *testing.T) {
 					Ingress: util.K8sObjectInfo{
 						Name:             "multiple-matches",
 						Namespace:        "default",
-						Annotations:      map[string]string{},
 						GroupVersionKind: grpcRouteGVK,
 					},
 					Route: kong.Route{

diff --git a/internal/util/objectmeta_test.go b/internal/util/objectmeta_test.go
@@ -24,9 +24,8 @@ func TestFromK8sObject(t *testing.T) {
 				},
 			},
 			want: K8sObjectInfo{
-				Name:        "name",
-				Namespace:   "namespace",
-				Annotations: map[string]string{},
+				Name:      "name",
+				Namespace: "namespace",
 			},
 		},
 		{

diff --git a/test/integration/tcproute_test.go b/test/integration/tcproute_test.go
@@ -133,8 +133,7 @@ func TestTCPRouteEssentials(t *testing.T) {
 	tcpPortDefault := gatewayv1alpha2.PortNumber(ktfkong.DefaultTCPServicePort)
 	tcpRoute := &gatewayv1alpha2.TCPRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1alpha2.TCPRouteSpec{
 			CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{
@@ -515,8 +514,7 @@ func TestTCPRouteReferenceGrant(t *testing.T) {
 	remoteNamespace := gatewayv1alpha2.Namespace(otherNs.Name)
 	tcproute := &gatewayv1alpha2.TCPRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1alpha2.TCPRouteSpec{
 			CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{
@@ -560,8 +558,7 @@ func TestTCPRouteReferenceGrant(t *testing.T) {
 	t.Logf("creating a ReferenceGrant that permits tcproute access from %s to services in %s", ns.Name, otherNs.Name)
 	grant := &gatewayv1beta1.ReferenceGrant{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1beta1.ReferenceGrantSpec{
 			From: []gatewayv1beta1.ReferenceGrantFrom{

diff --git a/test/integration/tlsroute_test.go b/test/integration/tlsroute_test.go
@@ -211,8 +211,7 @@ func TestTLSRouteEssentials(t *testing.T) {
 	t.Logf("creating a tlsroute to access deployment %s via kong", deployment.Name)
 	tlsRoute := &gatewayv1alpha2.TLSRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1alpha2.TLSRouteSpec{
 			CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{
@@ -561,8 +560,7 @@ func TestTLSRouteReferenceGrant(t *testing.T) {
 	t.Logf("creating a ReferenceGrant that permits tcproute access from %s to services in %s", ns.Name, otherNs.Name)
 	grant := &gatewayv1beta1.ReferenceGrant{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1beta1.ReferenceGrantSpec{
 			From: []gatewayv1beta1.ReferenceGrantFrom{
@@ -611,8 +609,7 @@ func TestTLSRouteReferenceGrant(t *testing.T) {
 	t.Logf("creating a tlsroute to access deployment %s via kong", deployment.Name)
 	tlsroute := &gatewayv1alpha2.TLSRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1alpha2.TLSRouteSpec{
 			CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{
@@ -787,8 +784,7 @@ func TestTLSRoutePassthrough(t *testing.T) {
 	sectionName := gatewayv1alpha2.SectionName("tls-passthrough")
 	tlsroute := &gatewayv1alpha2.TLSRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1alpha2.TLSRouteSpec{
 			CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{

diff --git a/test/integration/udproute_test.go b/test/integration/udproute_test.go
@@ -151,8 +151,7 @@ func TestUDPRouteEssentials(t *testing.T) {
 	udpPortDefault := gatewayv1alpha2.PortNumber(ktfkong.DefaultUDPServicePort)
 	udpRoute := &gatewayv1alpha2.UDPRoute{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        uuid.NewString(),
-			Annotations: map[string]string{},
+			Name: uuid.NewString(),
 		},
 		Spec: gatewayv1alpha2.UDPRouteSpec{
 			CommonRouteSpec: gatewayv1alpha2.CommonRouteSpec{

diff --git a/third_party/go.mod b/third_party/go.mod
@@ -3,16 +3,16 @@ module github.com/kong/kubernetes-ingress-controller/tools
 go 1.19
 
 require (
-	github.com/GoogleContainerTools/skaffold/v2 v2.5.0
-	github.com/elastic/crd-ref-docs v0.0.8
-	github.com/go-delve/delve v1.20.2
-	github.com/golangci/golangci-lint v1.52.2
+	github.com/GoogleContainerTools/skaffold/v2 v2.6.2
+	github.com/elastic/crd-ref-docs v0.0.9
+	github.com/go-delve/delve v1.21.0
+	github.com/golangci/golangci-lint v1.53.3
 	github.com/jstemmer/go-junit-report/v2 v2.0.0
 	gotest.tools/gotestsum v1.10.0
 	honnef.co/go/tools v0.4.3
-	k8s.io/code-generator v0.27.2
-	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230221102149-f6f37e6cc1ec
-	sigs.k8s.io/controller-tools v0.12.0
+	k8s.io/code-generator v0.27.4
+	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230728161957-7f0c6dc440f3
+	sigs.k8s.io/controller-tools v0.12.1
 	sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
 )
 
@@ -163,7 +163,7 @@ require (
 	github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
 	github.com/gobuffalo/flect v1.0.2 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/goccy/go-yaml v1.9.8 // indirect
+	github.com/goccy/go-yaml v1.11.0 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.4.3 // indirect