[main] Upgrade to latest dependencies

.golangci.yaml

@@ -17,7 +17,6 @@ run:
     - ".pb.go$"
 
 output:
-  uniq-by-line: true
   sort-results: true
   sort-order:
   - linter
@@ -46,6 +45,7 @@ linters-settings:
       disabled: true
 
 issues:
+  uniq-by-line: true
   exclude-rules:
     - path: test # Excludes /test, *_test.go etc.
       linters:

go.mod

@@ -6,12 +6,12 @@ require (
 	github.com/google/go-cmp v0.6.0
 	github.com/projectcontour/contour v1.30.1
 	go.uber.org/zap v1.27.0
-	k8s.io/api v0.30.6
-	k8s.io/apimachinery v0.30.6
-	k8s.io/client-go v0.30.6
-	knative.dev/hack v0.0.0-20241227080210-e92a16ae0893
-	knative.dev/networking v0.0.0-20241223132331-43a6a77176e5
-	knative.dev/pkg v0.0.0-20241223131119-4c901591eb4a
+	k8s.io/api v0.31.4
+	k8s.io/apimachinery v0.31.4
+	k8s.io/client-go v0.31.4
+	knative.dev/hack v0.0.0-20250109131303-f8be0ccdff36
+	knative.dev/networking v0.0.0-20250110041416-61c6cb642bc9
+	knative.dev/pkg v0.0.0-20250110150618-accfe3649188
 	sigs.k8s.io/yaml v1.4.0
 )
 
@@ -25,8 +25,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/go-kit/log v0.2.1 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
@@ -59,30 +59,32 @@ require (
 	github.com/prometheus/statsd_exporter v0.22.7 // indirect
 	github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.31.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
 	golang.org/x/oauth2 v0.23.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/term v0.26.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/sync v0.10.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/term v0.28.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
-	golang.org/x/tools v0.27.0 // indirect
+	golang.org/x/tools v0.28.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/api v0.183.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.68.0 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
+	google.golang.org/grpc v1.69.2 // indirect
+	google.golang.org/protobuf v1.36.2 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.30.6 // indirect
-	k8s.io/code-generator v0.30.6 // indirect
+	k8s.io/apiextensions-apiserver v0.31.4 // indirect
+	k8s.io/code-generator v0.31.4 // indirect
 	k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 // indirect
 	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect

pkg/reconciler/contour/contour.go

@@ -164,16 +164,13 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ing *v1alpha1.Ingress) r
 	logger = logger.With(zap.Bool("have-endpoint-probe", haveEndpointProbe))
 
 	info := resources.ServiceNames(ctx, ing)
-	serviceNames := make(sets.String, len(info))
+	serviceNames := sets.List(sets.KeySet(info))
 	serviceToProtocol := make(map[string]string, len(info))
-	for name := range info {
-		serviceNames.Insert(name)
-	}
-	logger = logger.With(zap.Strings("services", serviceNames.List()))
+	logger = logger.With(zap.Strings("services", serviceNames))
 
 	// Establish the protocol for each Service, and ensure that their Endpoints are
 	// populated with Ready addresses before we reprogram Contour.
-	for _, name := range serviceNames.List() {
+	for _, name := range serviceNames {
 		if err := r.tracker.TrackReference(tracker.Reference{
 			APIVersion: "v1",
 			Kind:       "Service",

pkg/reconciler/contour/resources/httpproxy.go

@@ -42,7 +42,7 @@ import (
 
 type ServiceInfo struct {
 	Port            intstr.IntOrString
-	RawVisibilities sets.String
+	RawVisibilities sets.Set[string]
 	// If the Host header sent to this service needs to be rewritten,
 	// then track that so we can send it for probing.
 	RewriteHost string
@@ -52,7 +52,7 @@ type ServiceInfo struct {
 }
 
 func (si *ServiceInfo) Visibilities() (vis []v1alpha1.IngressVisibility) {
-	for _, v := range si.RawVisibilities.List() {
+	for _, v := range sets.List(si.RawVisibilities) {
 		vis = append(vis, v1alpha1.IngressVisibility(v))
 	}
 	return
@@ -67,7 +67,7 @@ func ServiceNames(ctx context.Context, ing *v1alpha1.Ingress) map[string]Service
 				if !ok {
 					si = ServiceInfo{
 						Port:            split.ServicePort,
-						RawVisibilities: sets.NewString(),
+						RawVisibilities: sets.New[string](),
 						HasPath:         path.Path != "",
 						RewriteHost:     path.RewriteHost,
 					}

pkg/reconciler/contour/resources/httpproxy_test.go

@@ -3264,7 +3264,7 @@ func TestServiceNames(t *testing.T) {
 	tests := []struct {
 		name string
 		ing  *v1alpha1.Ingress
-		want sets.String
+		want sets.Set[string]
 	}{{
 		name: "empty",
 		ing: &v1alpha1.Ingress{
@@ -3306,16 +3306,13 @@ func TestServiceNames(t *testing.T) {
 				}},
 			},
 		},
-		want: sets.NewString("goo", "boo", "doo"),
+		want: sets.New("goo", "boo", "doo"),
 	}}
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			sns := ServiceNames(context.Background(), test.ing)
-			got := make(sets.String, len(sns))
-			for key := range sns {
-				got.Insert(key)
-			}
+			got := sets.KeySet(sns)
 			if !cmp.Equal(test.want, got) {
 				t.Error("ServiceNames (-want, +got):", cmp.Diff(test.want, got))
 			}

pkg/reconciler/contour/resources/kingress.go

@@ -85,7 +85,7 @@ func MakeEndpointProbeIngress(ctx context.Context, ing *v1alpha1.Ingress, previo
 				if !ok {
 					si = ServiceInfo{
 						Port:            intstr.FromInt(svc.Port),
-						RawVisibilities: sets.NewString(),
+						RawVisibilities: sets.New[string](),
 						HasPath:         hasPath,
 					}
 				}
@@ -96,12 +96,8 @@ func MakeEndpointProbeIngress(ctx context.Context, ing *v1alpha1.Ingress, previo
 	}
 
 	// Give the services a deterministic ordering.
-	order := make(sets.String, len(sns))
-	for key := range sns {
-		order.Insert(key)
-	}
-
-	l := order.List()
+	order := sets.KeySet(sns)
+	l := sets.List(order)
 	logging.FromContext(ctx).Debugf("Endpoints probe will cover services: %v", l)
 
 	probeHosts := make([]string, 0, len(l))