From f335366aa073db51e7a95c35f17897238b77eebc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 22:03:37 +0000 Subject: [PATCH 1/2] Bump github.com/nginxinc/nginx-plus-go-client from 0.11.0 to 1.0.0 Bumps [github.com/nginxinc/nginx-plus-go-client](https://github.com/nginxinc/nginx-plus-go-client) from 0.11.0 to 1.0.0. - [Release notes](https://github.com/nginxinc/nginx-plus-go-client/releases) - [Changelog](https://github.com/nginxinc/nginx-plus-go-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/nginxinc/nginx-plus-go-client/compare/v0.11.0...v1.0.0) --- updated-dependencies: - dependency-name: github.com/nginxinc/nginx-plus-go-client dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 30b4553ea1..290f5d6bc3 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/golang/glog v1.1.0 github.com/google/go-cmp v0.5.9 github.com/kr/pretty v0.3.1 - github.com/nginxinc/nginx-plus-go-client v0.11.0 + github.com/nginxinc/nginx-plus-go-client v1.0.0 github.com/nginxinc/nginx-prometheus-exporter v0.11.0 github.com/nginxinc/nginx-service-mesh v1.7.0 github.com/prometheus/client_golang v1.16.0 diff --git a/go.sum b/go.sum index 7c86691278..c71cce25e4 100644 --- a/go.sum +++ b/go.sum @@ -293,8 +293,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/nginxinc/glog v1.1.2 h1:zyoZXhCoYvNMJq4qMsKislUCGyJ4eU2gNl3Nt7cjESg= github.com/nginxinc/glog v1.1.2/go.mod h1:Q2FpGp/qFhJEVnuC88BVfbLDPmio9aHYUj4al6w0138= -github.com/nginxinc/nginx-plus-go-client v0.11.0 h1:XxKag3dlcF1gA0HgGsrJktbzBW4W+s369PIgT3lSR2c= -github.com/nginxinc/nginx-plus-go-client v0.11.0/go.mod h1:UvrcgWbUWEJzvbstNnPfq8Ogz9BTi1gHzlQ2ebAJisM= +github.com/nginxinc/nginx-plus-go-client v1.0.0 h1:iqPjWKaVS1aPEQgRogeCSTON+yolivJnsO0IrbIN4wU= +github.com/nginxinc/nginx-plus-go-client v1.0.0/go.mod h1:UvrcgWbUWEJzvbstNnPfq8Ogz9BTi1gHzlQ2ebAJisM= github.com/nginxinc/nginx-prometheus-exporter v0.11.0 h1:21xjnqNgxtni2jDgAQ90bl15uDnrTreO9sIlu1YsX/U= github.com/nginxinc/nginx-prometheus-exporter v0.11.0/go.mod h1:GdyHnWAb8q8OW1Pssrrqbcqra0SH0Vn6UXICMmyWkw8= github.com/nginxinc/nginx-service-mesh v1.7.0 h1:oxKr+Jdbxkos10VTy5xF2UHCcmfIhqWNlsOK/zPnZDM= From 5739100575dd4ada9c726dd52b7e60ccb11ca1c7 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Thu, 21 Sep 2023 15:28:25 -0700 Subject: [PATCH 2/2] Update client --- cmd/nginx-ingress/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/nginx-ingress/main.go b/cmd/nginx-ingress/main.go index 8e86d5f942..93caaa3a31 100644 --- a/cmd/nginx-ingress/main.go +++ b/cmd/nginx-ingress/main.go @@ -317,7 +317,7 @@ func createPlusClient(nginxPlus bool, useFakeNginxManager bool, nginxManager ngi if nginxPlus && !useFakeNginxManager { httpClient := getSocketClient("/var/lib/nginx/nginx-plus-api.sock") - plusClient, err = client.NewNginxClient(httpClient, "http://nginx-plus-api/api") + plusClient, err = client.NewNginxClient("http://nginx-plus-api/api", client.WithHTTPClient(httpClient)) if err != nil { glog.Fatalf("Failed to create NginxClient for Plus: %v", err) }