From 4a6c6886455be0f4de54373ebc1926ad3e20f353 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Fri, 10 Jan 2025 17:40:15 -0800 Subject: [PATCH] Update from nginxinc to nginx (3) (#3000) (cherry picked from commit 497621b162aa1d881bb0dfd4f1708676dbbd540c) --- .github/workflows/dependency-review.yml | 2 +- .github/workflows/labeler.yml | 2 +- README.md | 2 +- apis/v1alpha2/policy_methods.go | 2 +- design/archive/gateway-evaluation.md | 2 +- examples/grpc-routing/helloworld.yaml | 4 ++-- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- internal/mode/static/manager.go | 2 +- internal/mode/static/telemetry/collector.go | 6 +++--- .../mode/static/telemetry/collector_test.go | 2 +- .../telemetry/data_attributes_generated.go | 2 +- internal/mode/static/telemetry/data_test.go | 2 +- internal/mode/static/telemetry/exporter.go | 2 +- .../mode/static/telemetry/job_worker_test.go | 2 +- .../ngfresourcecounts_attributes_generated.go | 2 +- .../telemetry/telemetryfakes/fake_exporter.go | 2 +- renovate.json | 2 +- site/content/how-to/monitoring/prometheus.md | 2 +- site/content/overview/nginx-plus.md | 2 +- tests/conformance/conformance_test.go | 2 +- tests/go.mod | 8 ++++---- tests/go.sum | 16 +++++++-------- tests/scripts/vars.env-example | 2 +- .../clientsettings/grpc-backend.yaml | 2 +- .../snippets-filter/grpc-backend.yaml | 2 +- .../grpc-backend.yaml | 2 +- 27 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 3959740a8c..deac9b8e49 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -17,4 +17,4 @@ jobs: - name: "Dependency Review" uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0 with: - config-file: "nginxinc/k8s-common/dependency-review-config.yml@main" + config-file: "nginx/k8s-common/dependency-review-config.yml@main" diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 23a95b4492..84dfca8c9c 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -17,7 +17,7 @@ jobs: sparse-checkout: | labeler.yml sparse-checkout-cone-mode: false - repository: nginxinc/k8s-common + repository: nginx/k8s-common - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 with: diff --git a/README.md b/README.md index 0c5a6338ab..df592e367e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/nginx/nginx-gateway-fabric/badge)](https://scorecard.dev/viewer/?uri=github.com/nginx/nginx-gateway-fabric) -[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginxinc%2Fnginx-gateway-fabric?ref=badge_shield) +[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-gateway-fabric.svg?type=shield)](https://app.fossa.com/projects/custom%2B5618%2Fgithub.com%2Fnginx%2Fnginx-gateway-fabric?ref=badge_shield) [![Continuous Integration](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml/badge.svg)](https://github.com/nginx/nginx-gateway-fabric/actions/workflows/ci.yml) [![Go Report Card](https://goreportcard.com/badge/github.com/nginx/nginx-gateway-fabric)](https://goreportcard.com/report/github.com/nginx/nginx-gateway-fabric) [![codecov](https://codecov.io/gh/nginx/nginx-gateway-fabric/graph/badge.svg?token=32ULC8F13Z)](https://codecov.io/gh/nginx/nginx-gateway-fabric) diff --git a/apis/v1alpha2/policy_methods.go b/apis/v1alpha2/policy_methods.go index 8fc6dc768d..b5e59a0ff5 100644 --- a/apis/v1alpha2/policy_methods.go +++ b/apis/v1alpha2/policy_methods.go @@ -4,7 +4,7 @@ import ( "sigs.k8s.io/gateway-api/apis/v1alpha2" ) -// FIXME(kate-osborn): https://github.com/nginxinc/nginx-gateway-fabric/issues/1939. +// FIXME(kate-osborn): https://github.com/nginx/nginx-gateway-fabric/issues/1939. // Figure out a way to generate these methods for all our policies. // These methods implement the policies.Policy interface which extends client.Object to add the following methods. diff --git a/design/archive/gateway-evaluation.md b/design/archive/gateway-evaluation.md index d3da2f1801..ddacb07ee2 100644 --- a/design/archive/gateway-evaluation.md +++ b/design/archive/gateway-evaluation.md @@ -75,7 +75,7 @@ between an ingress point and the final backend Pod endpoints. Required supplemen ### Non-Goals -- Replace or supplant current [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress) (NIC) use-cases +- Replace or supplant current [NGINX Ingress Controller](https://github.com/nginx/kubernetes-ingress) (NIC) use-cases and will not work to achieve feature parity. - The Gateway evaluation will not support Ingress v1 APIs or the set of NIC CRDs (e.g. VirtualServer and VirtualServerRoute). diff --git a/examples/grpc-routing/helloworld.yaml b/examples/grpc-routing/helloworld.yaml index e2510ed52b..1e8157900f 100644 --- a/examples/grpc-routing/helloworld.yaml +++ b/examples/grpc-routing/helloworld.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-infra-backend-v1 - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: @@ -68,7 +68,7 @@ spec: spec: containers: - name: grpc-infra-backend-v2 - image: ghcr.io/nginxinc/kic-test-grpc-server:edge + image: ghcr.io/nginx/kic-test-grpc-server:edge env: - name: POD_NAME valueFrom: diff --git a/go.mod b/go.mod index dc622a593a..4caaf4053e 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/go-logr/logr v1.4.2 github.com/google/go-cmp v0.6.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.11.2 + github.com/nginx/telemetry-exporter v0.1.3 github.com/nginxinc/nginx-plus-go-client v1.3.0 github.com/nginxinc/nginx-prometheus-exporter v1.3.0 - github.com/nginxinc/telemetry-exporter v0.1.2 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 github.com/prometheus/client_golang v1.20.5 @@ -71,14 +71,14 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.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.7.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.29.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect diff --git a/go.sum b/go.sum index 7da43fa839..bade937608 100644 --- a/go.sum +++ b/go.sum @@ -81,12 +81,12 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/nginx/telemetry-exporter v0.1.3 h1:aGuUWMRSf2nA9fOH+AQ8I+hdoq0Hz6wgttLBG/SzsvI= +github.com/nginx/telemetry-exporter v0.1.3/go.mod h1:hVH3DhumaKkGOWLiFLvZj+UWjLNoPXoXvoiNiUI0WxQ= github.com/nginxinc/nginx-plus-go-client v1.3.0 h1:q/aeT4B5k0KLwWlefoBzfLfraBBvIKLuDg+lLFWAo4I= github.com/nginxinc/nginx-plus-go-client v1.3.0/go.mod h1:n8OFLzrJulJ2fur28Cwa1Qp5DZNS2VicLV+Adt30LQ4= github.com/nginxinc/nginx-prometheus-exporter v1.3.0 h1:1JtdxsZH0Uwhu1nL/j/QyOXytP5V5j68AEo2X+DFWb0= github.com/nginxinc/nginx-prometheus-exporter v1.3.0/go.mod h1:hXoH+X6aIKSyQuO6QTIiPKH3eZyxqy/wW8GYiE3dflU= -github.com/nginxinc/telemetry-exporter v0.1.2 h1:97vUGhQYgQ2KEsXKCBmr5gqfuujJCKPHwdg5HKoANUs= -github.com/nginxinc/telemetry-exporter v0.1.2/go.mod h1:eKa/Ceh9irmyZ1xV2QxBIxduIyVC5RlmtiWwcTlHuMg= github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU= github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk= github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= @@ -156,8 +156,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -168,10 +168,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -182,8 +182,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/mode/static/manager.go b/internal/mode/static/manager.go index 02ecd670eb..6ab99b4516 100644 --- a/internal/mode/static/manager.go +++ b/internal/mode/static/manager.go @@ -7,7 +7,7 @@ import ( "time" "github.com/go-logr/logr" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" "github.com/prometheus/client_golang/prometheus" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/mode/static/telemetry/collector.go b/internal/mode/static/telemetry/collector.go index f781852119..a349475a36 100644 --- a/internal/mode/static/telemetry/collector.go +++ b/internal/mode/static/telemetry/collector.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -39,7 +39,7 @@ type ConfigurationGetter interface { // Data is telemetry data. // -//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry +//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=Data -scheme -scheme-protocol=NGFProductTelemetry -scheme-df-datatype=ngf-product-telemetry type Data struct { // ImageSource tells whether the image was built by GitHub or locally (values are 'gha', 'local', or 'unknown') ImageSource string @@ -66,7 +66,7 @@ type Data struct { // NGFResourceCounts stores the counts of all relevant resources that NGF processes and generates configuration from. // -//go:generate go run -tags generator github.com/nginxinc/telemetry-exporter/cmd/generator -type=NGFResourceCounts +//go:generate go run -tags generator github.com/nginx/telemetry-exporter/cmd/generator -type=NGFResourceCounts type NGFResourceCounts struct { // GatewayCount is the number of relevant Gateways. GatewayCount int64 diff --git a/internal/mode/static/telemetry/collector_test.go b/internal/mode/static/telemetry/collector_test.go index 7a69dbeb3a..506bfa0c9e 100644 --- a/internal/mode/static/telemetry/collector_test.go +++ b/internal/mode/static/telemetry/collector_test.go @@ -6,7 +6,7 @@ import ( "reflect" "runtime" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" diff --git a/internal/mode/static/telemetry/data_attributes_generated.go b/internal/mode/static/telemetry/data_attributes_generated.go index da061512a3..553925b0fd 100644 --- a/internal/mode/static/telemetry/data_attributes_generated.go +++ b/internal/mode/static/telemetry/data_attributes_generated.go @@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT. import ( "go.opentelemetry.io/otel/attribute" - ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry" ) func (d *Data) Attributes() []attribute.KeyValue { diff --git a/internal/mode/static/telemetry/data_test.go b/internal/mode/static/telemetry/data_test.go index d0fe63820a..d2dfe9516b 100644 --- a/internal/mode/static/telemetry/data_test.go +++ b/internal/mode/static/telemetry/data_test.go @@ -3,7 +3,7 @@ package telemetry import ( "testing" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" "go.opentelemetry.io/otel/attribute" ) diff --git a/internal/mode/static/telemetry/exporter.go b/internal/mode/static/telemetry/exporter.go index 1c86ac61fb..21c7c99c38 100644 --- a/internal/mode/static/telemetry/exporter.go +++ b/internal/mode/static/telemetry/exporter.go @@ -4,7 +4,7 @@ import ( "context" "github.com/go-logr/logr" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" ) // Exporter exports telemetry data to some destination. diff --git a/internal/mode/static/telemetry/job_worker_test.go b/internal/mode/static/telemetry/job_worker_test.go index c331473cf8..770af9892c 100644 --- a/internal/mode/static/telemetry/job_worker_test.go +++ b/internal/mode/static/telemetry/job_worker_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - tel "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + tel "github.com/nginx/telemetry-exporter/pkg/telemetry" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go b/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go index 343c6fd9ed..baddcd174d 100644 --- a/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go +++ b/internal/mode/static/telemetry/ngfresourcecounts_attributes_generated.go @@ -7,7 +7,7 @@ This is a generated file. DO NOT EDIT. import ( "go.opentelemetry.io/otel/attribute" - ngxTelemetry "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + ngxTelemetry "github.com/nginx/telemetry-exporter/pkg/telemetry" ) func (d *NGFResourceCounts) Attributes() []attribute.KeyValue { diff --git a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go index 74207bd300..f854e50fe6 100644 --- a/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go +++ b/internal/mode/static/telemetry/telemetryfakes/fake_exporter.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/nginx/nginx-gateway-fabric/internal/mode/static/telemetry" - telemetrya "github.com/nginxinc/telemetry-exporter/pkg/telemetry" + telemetrya "github.com/nginx/telemetry-exporter/pkg/telemetry" ) type FakeExporter struct { diff --git a/renovate.json b/renovate.json index cf3f466afe..4c3271d6ce 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "github>nginxinc/k8s-common", + "github>nginx/k8s-common", "schedule:daily" ], "kubernetes": { diff --git a/site/content/how-to/monitoring/prometheus.md b/site/content/how-to/monitoring/prometheus.md index f430db8a7a..31fca23e9f 100644 --- a/site/content/how-to/monitoring/prometheus.md +++ b/site/content/how-to/monitoring/prometheus.md @@ -72,7 +72,7 @@ NGINX Gateway Fabric provides a variety of metrics for monitoring and analyzing ### NGINX/NGINX Plus metrics -NGINX metrics cover specific NGINX operations such as the total number of accepted client connections. For a complete list of available NGINX/NGINX Plus metrics, refer to the [NGINX Prometheus Exporter developer docs](https://github.com/nginxinc/nginx-prometheus-exporter#exported-metrics). +NGINX metrics cover specific NGINX operations such as the total number of accepted client connections. For a complete list of available NGINX/NGINX Plus metrics, refer to the [NGINX Prometheus Exporter developer docs](https://github.com/nginx/nginx-prometheus-exporter#exported-metrics). These metrics use the `nginx_gateway_fabric` namespace and include the `class` label, indicating the NGINX Gateway class. For example, `nginx_gateway_fabric_connections_accepted{class="nginx"}`. diff --git a/site/content/overview/nginx-plus.md b/site/content/overview/nginx-plus.md index 8e50c0b0e4..bc67839bf0 100644 --- a/site/content/overview/nginx-plus.md +++ b/site/content/overview/nginx-plus.md @@ -9,7 +9,7 @@ NGINX Gateway Fabric can use NGINX Open Source or NGINX Plus as its data plane. ## Benefits of NGINX Plus -- **Robust metrics**: A plethora of [additional Prometheus metrics](https://github.com/nginxinc/nginx-prometheus-exporter#metrics-for-nginx-plus) are available. +- **Robust metrics**: A plethora of [additional Prometheus metrics](https://github.com/nginx/nginx-prometheus-exporter#metrics-for-nginx-plus) are available. - **Live activity monitoring**: The [NGINX Plus dashboard]({{< relref "/how-to/monitoring/dashboard.md" >}}) shows real-time metrics and information about your server infrastructure. - **Dynamic upstream configuration**: NGINX Plus can dynamically reconfigure upstream servers when applications in Kubernetes scale up and down, preventing the need for an NGINX reload. - **Support**: With an NGINX Plus license, you can take advantage of full [support](https://my.f5.com/manage/s/article/K000140156/) from NGINX, Inc. diff --git a/tests/conformance/conformance_test.go b/tests/conformance/conformance_test.go index b06a5ca310..3437749c67 100644 --- a/tests/conformance/conformance_test.go +++ b/tests/conformance/conformance_test.go @@ -43,7 +43,7 @@ func TestConformance(t *testing.T) { opts := conformance.DefaultOptions(t) opts.Implementation = conf_v1.Implementation{ - Organization: "nginxinc", + Organization: "nginx", Project: "nginx-gateway-fabric", URL: "https://github.com/nginx/nginx-gateway-fabric", Version: *flags.ImplementationVersion, diff --git a/tests/go.mod b/tests/go.mod index 7dbd160059..e3a8fbeb92 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -61,14 +61,14 @@ require ( github.com/x448/float16 v0.8.4 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/mod v0.22.0 // indirect - golang.org/x/net v0.33.0 // indirect + golang.org/x/net v0.34.0 // indirect golang.org/x/oauth2 v0.24.0 // indirect golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.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.7.0 // indirect - golang.org/x/tools v0.28.0 // indirect + golang.org/x/tools v0.29.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect google.golang.org/grpc v1.68.1 // indirect diff --git a/tests/go.sum b/tests/go.sum index 4a57d32bb9..a246b64719 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -141,8 +141,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= -golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -153,10 +153,10 @@ golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= @@ -168,8 +168,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8= -golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw= +golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= +golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/tests/scripts/vars.env-example b/tests/scripts/vars.env-example index b8f1276fb5..17e571b064 100644 --- a/tests/scripts/vars.env-example +++ b/tests/scripts/vars.env-example @@ -11,7 +11,7 @@ GKE_PROJECT= GKE_SVC_ACCOUNT= GKE_NODES_SERVICE_ACCOUNT= NETWORK_TAGS= -NGF_REPO= +NGF_REPO= NGF_BRANCH=main GINKGO_LABEL= GINKGO_FLAGS= diff --git a/tests/suite/manifests/clientsettings/grpc-backend.yaml b/tests/suite/manifests/clientsettings/grpc-backend.yaml index 32771fd6e6..0b57f4f1a1 100644 --- a/tests/suite/manifests/clientsettings/grpc-backend.yaml +++ b/tests/suite/manifests/clientsettings/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: diff --git a/tests/suite/manifests/snippets-filter/grpc-backend.yaml b/tests/suite/manifests/snippets-filter/grpc-backend.yaml index 32771fd6e6..0b57f4f1a1 100644 --- a/tests/suite/manifests/snippets-filter/grpc-backend.yaml +++ b/tests/suite/manifests/snippets-filter/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: diff --git a/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml b/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml index 32771fd6e6..0b57f4f1a1 100644 --- a/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml +++ b/tests/suite/manifests/upstream-settings-policy/grpc-backend.yaml @@ -28,7 +28,7 @@ spec: spec: containers: - name: grpc-backend - image: ghcr.io/nginxinc/kic-test-grpc-server:0.2.4 + image: ghcr.io/nginx/kic-test-grpc-server:0.2.5 env: - name: POD_NAME valueFrom: