Skip to content

Commit 60388bb

Browse files
shaun-nxshaun-nx
authored
Merge branch 'main' into feat/pipeline-certfication-testing
2 parents 893fdb1 + a5c2d8c commit 60388bb

File tree

10 files changed

+31
-28
lines changed

10 files changed

+31
-28
lines changed

‎.github/workflows/update-docker-images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
- name: Check if update available for nginx image
6969
id: update
70-
uses: lucacome/docker-image-update-checker@a233de0585661c019fb71f9601328db37051cc66 # v2.0.0
70+
uses: lucacome/docker-image-update-checker@5d84572804be8bd4dc353f08c8437efdb6af37ac # v3.0.0
7171
with:
7272
base-image: ${{ needs.variables.outputs.nginx_version }}
7373
image: ghcr.io/nginx/nginx-gateway-fabric/nginx:${{ needs.variables.outputs.ngf_tag }}

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ require (
1818
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
1919
go.uber.org/zap v1.27.0
2020
golang.org/x/text v0.29.0
21-
google.golang.org/grpc v1.75.1
22-
google.golang.org/protobuf v1.36.9
21+
google.golang.org/grpc v1.76.0
22+
google.golang.org/protobuf v1.36.10
2323
gopkg.in/evanphx/json-patch.v4 v4.13.0
2424
k8s.io/api v0.34.1
2525
k8s.io/apiextensions-apiserver v0.34.1
2626
k8s.io/apimachinery v0.34.1
2727
k8s.io/client-go v0.34.1
2828
k8s.io/klog/v2 v2.130.1
29-
sigs.k8s.io/controller-runtime v0.22.1
29+
sigs.k8s.io/controller-runtime v0.22.2
3030
sigs.k8s.io/gateway-api v1.3.0
3131
)
3232

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:
323323
google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE=
324324
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
325325
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
326-
google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
327-
google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
328-
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
329-
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
326+
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
327+
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
328+
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
329+
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
330330
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
331331
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
332332
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -352,8 +352,8 @@ k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b h1:MloQ9/bdJyIu9lb1PzujOP
352352
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b/go.mod h1:UZ2yyWbFTpuhSbFhv24aGNOdoRdJZgsIObGBUaYVsts=
353353
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8tmbZBHi4zVsl1Y=
354354
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
355-
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
356-
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
355+
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
356+
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
357357
sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
358358
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
359359
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

‎operators/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OPERATOR_SDK_VERSION ?= v1.41.1
88
# renovate: datasource=github-tags depName=kubernetes-sigs/kustomize
99
KUSTOMIZE_VERSION ?= v5.6.0
1010

11-
IMAGE_TAG_BASE ?= nginx-gateway-fabric-operator
11+
IMAGE_TAG_BASE ?= nginx-gateway-fabric/operator
1212

1313
IMG ?= $(IMAGE_TAG_BASE):v$(VERSION)
1414

‎operators/README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,22 +64,22 @@ For complete configuration options, see the [Helm Chart Documentation](https://g
6464

6565
```bash
6666
# Build the operator image. If building for deploying on a cluster with different architecture from your local machine, append ARCH=<targetarch> e.g. `ARCH=amd64` to the below command
67-
make docker-build IMG=<your-registry>/nginx-gateway-fabric-operator:<tag>
67+
make docker-build IMG=<your-registry>/nginx-gateway-fabric/operator:<tag>
6868

6969
# Push the image
70-
make docker-push IMG=<your-registry>/nginx-gateway-fabric-operator:<tag>
70+
make docker-push IMG=<your-registry>/nginx-gateway-fabric/operator:<tag>
7171

7272
# Optionally load the image if running on kind
73-
make docker-load IMG=<your-registry>/nginx-gateway-fabric-operator:<tag>
73+
make docker-load IMG=<your-registry>/nginx-gateway-fabric/operator:<tag>
7474

7575
# Generate and push bundle (must be publicly accessible remote registry, e.g. quay.io)
76-
make bundle-build bundle-push IMG=<your-registry>/nginx-gateway-fabric-operator:<tag> BUNDLE_IMG=<your-registry>/nginx-gateway-fabric-operator-bundle:<tag>
76+
make bundle-build bundle-push IMG=<your-registry>/nginx-gateway-fabric/operator:<tag> BUNDLE_IMG=<your-registry>/nginx-gateway-fabric/operator-bundle:<tag>
7777

7878
# Install olm on local cluster if required (e.g. if running on kind)
7979
operator-sdk olm install
8080

8181
# Run your bundle image
82-
operator-sdk run bundle <your-registry>/nginx-gateway-fabric-operator-bundle:<tag>
82+
operator-sdk run bundle <your-registry>/nginx-gateway-fabric/operator-bundle:<tag>
8383

8484
# Deploy NGF operand (modify the manifest if required)
8585
kubectl apply -f config/samples/gateway_v1alpha1_nginxgatewayfabric.yaml

‎operators/bundle/manifests/nginx-gateway-fabric.clusterserviceversion.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ metadata:
144144
}
145145
]
146146
capabilities: Basic Install
147-
createdAt: "2025-09-25T13:06:47Z"
147+
createdAt: "2025-10-06T09:33:54Z"
148148
operators.operatorframework.io/builder: operator-sdk-v1.41.1
149149
operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1
150150
name: nginx-gateway-fabric.v1.0.0
@@ -433,7 +433,7 @@ spec:
433433
- --leader-elect
434434
- --leader-election-id=nginx-gateway-fabric
435435
- --health-probe-bind-address=:8081
436-
image: nginx-gateway-fabric-operator:v1.0.0
436+
image: ghcr.io/nginx/nginx-gateway-fabric/operator:v1.0.0
437437
livenessProbe:
438438
httpGet:
439439
path: /healthz

‎operators/bundle/metadata/annotations.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ annotations:
1313
# Annotations for testing.
1414
operators.operatorframework.io.test.mediatype.v1: scorecard+v1
1515
operators.operatorframework.io.test.config.v1: tests/scorecard/
16+
17+
# OpenShift annotations.
18+
com.redhat.openshift.versions: v4.19

‎operators/config/manager/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
44
kind: Kustomization
55
images:
66
- name: controller
7-
newName: ghcr.io/nginx/nginx-gateway-fabric
7+
newName: ghcr.io/nginx/nginx-gateway-fabric/operator
88
newTag: v1.0.0

‎tests/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
k8s.io/apiextensions-apiserver v0.34.1
1616
k8s.io/apimachinery v0.34.1
1717
k8s.io/client-go v0.34.1
18-
sigs.k8s.io/controller-runtime v0.22.1
18+
sigs.k8s.io/controller-runtime v0.22.2
1919
sigs.k8s.io/gateway-api v1.3.0
2020
sigs.k8s.io/yaml v1.6.0
2121
)
@@ -72,8 +72,8 @@ require (
7272
golang.org/x/tools v0.36.0 // indirect
7373
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7474
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
75-
google.golang.org/grpc v1.75.1 // indirect
76-
google.golang.org/protobuf v1.36.9 // indirect
75+
google.golang.org/grpc v1.76.0 // indirect
76+
google.golang.org/protobuf v1.36.10 // indirect
7777
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7878
gopkg.in/inf.v0 v0.9.1 // indirect
7979
gopkg.in/yaml.v3 v3.0.1 // indirect

‎tests/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E
234234
gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
235235
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE=
236236
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc=
237-
google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI=
238-
google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ=
239-
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
240-
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
237+
google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A=
238+
google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c=
239+
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
240+
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
241241
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
242242
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
243243
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -263,8 +263,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
263263
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
264264
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
265265
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
266-
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
267-
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
266+
sigs.k8s.io/controller-runtime v0.22.2 h1:cK2l8BGWsSWkXz09tcS4rJh95iOLney5eawcK5A33r4=
267+
sigs.k8s.io/controller-runtime v0.22.2/go.mod h1:+QX1XUpTXN4mLoblf4tqr5CQcyHPAki2HLXqQMY6vh8=
268268
sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
269269
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
270270
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

0 commit comments

Comments
 (0)