Skip to content

Commit e6102b7

Browse files
ciroqueciroque
committed
Updates dependencies
1 parent 2f85702 commit e6102b7

9 files changed

+141
-470
lines changed

‎.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.19.13
1+
golang 1.23.3

‎Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Use of this source code is governed by the Apache
33
# license that can be found in the LICENSE file.
44

5-
FROM golang:1.19.5-alpine3.16 AS builder
5+
FROM golang:1.23.3-alpine3.20 AS builder
66

77
WORKDIR /app
88

@@ -14,7 +14,7 @@ COPY . .
1414

1515
RUN go build -o nginx-loadbalancer-kubernetes ./cmd/nginx-loadbalancer-kubernetes/main.go
1616

17-
FROM alpine:3.16
17+
FROM alpine:3.20
1818

1919
WORKDIR /opt/nginx-loadbalancer-kubernetes
2020

‎go.mod

+35-32
Original file line numberDiff line numberDiff line change
@@ -4,55 +4,58 @@
44

55
module github.com/nginxinc/kubernetes-nginx-ingress
66

7-
go 1.19
7+
go 1.23.3
88

99
require (
10-
github.com/nginxinc/nginx-plus-go-client v0.10.0
11-
github.com/sirupsen/logrus v1.9.0
12-
k8s.io/api v0.26.0
13-
k8s.io/apimachinery v0.26.0
14-
k8s.io/client-go v0.26.0
10+
github.com/sirupsen/logrus v1.9.3
11+
k8s.io/api v0.31.2
12+
k8s.io/apimachinery v0.31.2
13+
k8s.io/client-go v0.31.2
14+
github.com/nginxinc/nginx-plus-go-client/v2 v2.0.1
1515
)
1616

1717
require (
18-
github.com/davecgh/go-spew v1.1.1 // indirect
19-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
20-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
21-
github.com/go-logr/logr v1.2.3 // indirect
22-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
23-
github.com/go-openapi/jsonreference v0.20.0 // indirect
24-
github.com/go-openapi/swag v0.19.14 // indirect
18+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
19+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
20+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
21+
github.com/go-logr/logr v1.4.2 // indirect
22+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
23+
github.com/go-openapi/jsonreference v0.20.2 // indirect
24+
github.com/go-openapi/swag v0.22.4 // indirect
2525
github.com/gogo/protobuf v1.3.2 // indirect
26-
github.com/golang/protobuf v1.5.2 // indirect
27-
github.com/google/gnostic v0.5.7-v3refs // indirect
28-
github.com/google/go-cmp v0.5.9 // indirect
29-
github.com/google/gofuzz v1.1.0 // indirect
26+
github.com/golang/protobuf v1.5.4 // indirect
27+
github.com/google/gnostic-models v0.6.8 // indirect
28+
github.com/google/go-cmp v0.6.0 // indirect
29+
github.com/google/gofuzz v1.2.0 // indirect
30+
github.com/google/uuid v1.6.0 // indirect
3031
github.com/imdario/mergo v0.3.6 // indirect
3132
github.com/josharian/intern v1.0.0 // indirect
3233
github.com/json-iterator/go v1.1.12 // indirect
33-
github.com/mailru/easyjson v0.7.6 // indirect
34+
github.com/mailru/easyjson v0.7.7 // indirect
3435
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3536
github.com/modern-go/reflect2 v1.0.2 // indirect
3637
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3738
github.com/pkg/errors v0.9.1 // indirect
3839
github.com/spf13/pflag v1.0.5 // indirect
39-
golang.org/x/net v0.23.0 // indirect
40-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
41-
golang.org/x/sys v0.18.0 // indirect
42-
golang.org/x/term v0.18.0 // indirect
43-
golang.org/x/text v0.14.0 // indirect
44-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
45-
google.golang.org/appengine v1.6.7 // indirect
46-
google.golang.org/protobuf v1.33.0 // indirect
40+
github.com/x448/float16 v0.8.4 // indirect
41+
golang.org/x/net v0.26.0 // indirect
42+
golang.org/x/oauth2 v0.21.0 // indirect
43+
golang.org/x/sync v0.8.0 // indirect
44+
golang.org/x/sys v0.21.0 // indirect
45+
golang.org/x/term v0.21.0 // indirect
46+
golang.org/x/text v0.16.0 // indirect
47+
golang.org/x/time v0.3.0 // indirect
48+
google.golang.org/protobuf v1.34.2 // indirect
49+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4750
gopkg.in/inf.v0 v0.9.1 // indirect
4851
gopkg.in/yaml.v2 v2.4.0 // indirect
4952
gopkg.in/yaml.v3 v3.0.1 // indirect
50-
k8s.io/klog/v2 v2.80.1 // indirect
51-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
52-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
53-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
54-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
55-
sigs.k8s.io/yaml v1.3.0 // indirect
53+
k8s.io/klog/v2 v2.130.1 // indirect
54+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
55+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
56+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
57+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
58+
sigs.k8s.io/yaml v1.4.0 // indirect
5659
)
5760

5861
replace (

‎go.sum

+95-429
Large diffs are not rendered by default.

‎internal/application/nginx_client_interface.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package application
77

8-
import nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
8+
import nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
99

1010
// NginxClientInterface defines the functions used on the NGINX Plus client, abstracting away the full details of that client.
1111
type NginxClientInterface interface {

‎internal/application/nginx_http_border_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package application
88
import (
99
"fmt"
1010
"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
11-
nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
11+
nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
1212
)
1313

1414
// NginxHttpBorderClient implements the BorderClient interface for HTTP upstreams.

‎internal/application/nginx_stream_border_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package application
88
import (
99
"fmt"
1010
"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
11-
nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
11+
nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
1212
)
1313

1414
// NginxStreamBorderClient implements the BorderClient interface for stream upstreams.

‎internal/synchronization/synchronizer.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/nginxinc/kubernetes-nginx-ingress/internal/communication"
1212
"github.com/nginxinc/kubernetes-nginx-ingress/internal/configuration"
1313
"github.com/nginxinc/kubernetes-nginx-ingress/internal/core"
14-
nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
14+
nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
1515
"github.com/sirupsen/logrus"
1616
"k8s.io/apimachinery/pkg/util/wait"
1717
"k8s.io/client-go/util/workqueue"
@@ -112,7 +112,9 @@ func (s *Synchronizer) buildBorderClient(event *core.ServerUpdateEvent) (applica
112112
return nil, fmt.Errorf(`error creating HTTP client: %v`, err)
113113
}
114114

115-
ngxClient, err := nginxClient.NewNginxClient(httpClient, event.NginxHost)
115+
opts := nginxClient.WithHTTPClient(httpClient)
116+
117+
ngxClient, err := nginxClient.NewNginxClient(event.NginxHost, opts)
116118
if err != nil {
117119
return nil, fmt.Errorf(`error creating Nginx Plus client: %v`, err)
118120
}

‎test/mocks/mock_nginx_plus_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package mocks
77

8-
import nginxClient "github.com/nginxinc/nginx-plus-go-client/client"
8+
import nginxClient "github.com/nginxinc/nginx-plus-go-client/v2/client"
99

1010
type MockNginxClient struct {
1111
CalledFunctions map[string]bool

0 commit comments

Comments
 (0)