Updates dependencies

.tool-versions

@@ -1 +1 @@
-golang 1.19.13
+golang 1.23.3

Dockerfile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by the Apache
 # license that can be found in the LICENSE file.
 
-FROM golang:1.19.5-alpine3.16 AS builder
+FROM golang:1.23.3-alpine3.20 AS builder
 
 WORKDIR /app
 
@@ -14,7 +14,7 @@ COPY . .
 
 RUN go build -o nginx-loadbalancer-kubernetes ./cmd/nginx-loadbalancer-kubernetes/main.go
 
-FROM alpine:3.16
+FROM alpine:3.20
 
 WORKDIR /opt/nginx-loadbalancer-kubernetes
 

go.mod

@@ -4,55 +4,58 @@
 
 module github.com/nginxinc/kubernetes-nginx-ingress
 
-go 1.19
+go 1.23.3
 
 require (
-	github.com/nginxinc/nginx-plus-go-client v0.10.0
-	github.com/sirupsen/logrus v1.9.0
-	k8s.io/api v0.26.0
-	k8s.io/apimachinery v0.26.0
-	k8s.io/client-go v0.26.0
+	github.com/sirupsen/logrus v1.9.3
+	k8s.io/api v0.31.2
+	k8s.io/apimachinery v0.31.2
+	k8s.io/client-go v0.31.2
+	github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
 )
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.2 // indirect
+	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	golang.org/x/net v0.26.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/term v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/protobuf v1.34.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/klog/v2 v2.80.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	k8s.io/klog/v2 v2.130.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace (

internal/application/nginx_client_interface.go

@@ -5,7 +5,7 @@
 
 package application
 
-import nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
+import nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
 
 // NginxClientInterface defines the functions used on the NGINX Plus client, abstracting away the full details of that client.
 type NginxClientInterface interface {

internal/application/nginx_http_border_client.go

@@ -8,7 +8,7 @@ package application
 import (
 	"fmt"
 	"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
-	nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
+	nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
 )
 
 // NginxHttpBorderClient implements the BorderClient interface for HTTP upstreams.

internal/application/nginx_stream_border_client.go

@@ -8,7 +8,7 @@ package application
 import (
 	"fmt"
 	"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
-	nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
+	nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
 )
 
 // NginxStreamBorderClient implements the BorderClient interface for stream upstreams.

internal/synchronization/synchronizer.go

@@ -11,7 +11,7 @@ import (
 	"github.com/nginxinc/kubernetes-nginx-ingress/internal/communication"
 	"github.com/nginxinc/kubernetes-nginx-ingress/internal/configuration"
 	"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
-	nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
+	nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
 	"github.com/sirupsen/logrus"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/workqueue"
@@ -112,7 +112,9 @@ func (s *Synchronizer) buildBorderClient(event *core.ServerUpdateEvent) (applica
 		return nil, fmt.Errorf(`error creating HTTP client: %v`, err)
 	}
 
-	ngxClient, err := nginxClient.NewNginxClient(httpClient, event.NginxHost)
+	opts := nginxClient.WithHTTPClient(httpClient)
+
+	ngxClient, err := nginxClient.NewNginxClient(event.NginxHost, opts)
 	if err != nil {
 		return nil, fmt.Errorf(`error creating Nginx Plus client: %v`, err)
 	}

test/mocks/mock_nginx_plus_client.go

@@ -5,7 +5,7 @@
 
 package mocks
 
-import nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
+import nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
 
 type MockNginxClient struct {
 	CalledFunctions map[string]bool