From 55a79e44fc5993288caa0ccc5b2ec2cd8fbcf228 Mon Sep 17 00:00:00 2001 From: Ciara Stacke Date: Mon, 6 Oct 2025 10:41:09 +0100 Subject: [PATCH 1/2] Update operator controller name to include operator --- operators/Makefile | 2 +- operators/README.md | 10 +++++----- .../nginx-gateway-fabric.clusterserviceversion.yaml | 4 ++-- operators/config/manager/kustomization.yaml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/operators/Makefile b/operators/Makefile index 8f5f9db9ff..9548334090 100644 --- a/operators/Makefile +++ b/operators/Makefile @@ -8,7 +8,7 @@ OPERATOR_SDK_VERSION ?= v1.41.1 # renovate: datasource=github-tags depName=kubernetes-sigs/kustomize KUSTOMIZE_VERSION ?= v5.6.0 -IMAGE_TAG_BASE ?= nginx-gateway-fabric-operator +IMAGE_TAG_BASE ?= nginx-gateway-fabric/operator IMG ?= $(IMAGE_TAG_BASE):v$(VERSION) diff --git a/operators/README.md b/operators/README.md index 6426bac8bd..d995a6f26a 100644 --- a/operators/README.md +++ b/operators/README.md @@ -64,22 +64,22 @@ For complete configuration options, see the [Helm Chart Documentation](https://g ```bash # Build the operator image. If building for deploying on a cluster with different architecture from your local machine, append ARCH= e.g. `ARCH=amd64` to the below command -make docker-build IMG=/nginx-gateway-fabric-operator: +make docker-build IMG=/nginx-gateway-fabric/operator: # Push the image -make docker-push IMG=/nginx-gateway-fabric-operator: +make docker-push IMG=/nginx-gateway-fabric/operator: # Optionally load the image if running on kind -make docker-load IMG=/nginx-gateway-fabric-operator: +make docker-load IMG=/nginx-gateway-fabric/operator: # Generate and push bundle (must be publicly accessible remote registry, e.g. quay.io) -make bundle-build bundle-push IMG=/nginx-gateway-fabric-operator: BUNDLE_IMG=/nginx-gateway-fabric-operator-bundle: +make bundle-build bundle-push IMG=/nginx-gateway-fabric/operator: BUNDLE_IMG=/nginx-gateway-fabric/operator-bundle: # Install olm on local cluster if required (e.g. if running on kind) operator-sdk olm install # Run your bundle image -operator-sdk run bundle /nginx-gateway-fabric-operator-bundle: +operator-sdk run bundle /nginx-gateway-fabric/operator-bundle: # Deploy NGF operand (modify the manifest if required) kubectl apply -f config/samples/gateway_v1alpha1_nginxgatewayfabric.yaml diff --git a/operators/bundle/manifests/nginx-gateway-fabric.clusterserviceversion.yaml b/operators/bundle/manifests/nginx-gateway-fabric.clusterserviceversion.yaml index d953348c65..7cd0224a75 100644 --- a/operators/bundle/manifests/nginx-gateway-fabric.clusterserviceversion.yaml +++ b/operators/bundle/manifests/nginx-gateway-fabric.clusterserviceversion.yaml @@ -144,7 +144,7 @@ metadata: } ] capabilities: Basic Install - createdAt: "2025-09-25T13:06:47Z" + createdAt: "2025-10-06T09:33:54Z" operators.operatorframework.io/builder: operator-sdk-v1.41.1 operators.operatorframework.io/project_layout: helm.sdk.operatorframework.io/v1 name: nginx-gateway-fabric.v1.0.0 @@ -433,7 +433,7 @@ spec: - --leader-elect - --leader-election-id=nginx-gateway-fabric - --health-probe-bind-address=:8081 - image: nginx-gateway-fabric-operator:v1.0.0 + image: ghcr.io/nginx/nginx-gateway-fabric/operator:v1.0.0 livenessProbe: httpGet: path: /healthz diff --git a/operators/config/manager/kustomization.yaml b/operators/config/manager/kustomization.yaml index 37bf8df3c3..e89ad04fe3 100644 --- a/operators/config/manager/kustomization.yaml +++ b/operators/config/manager/kustomization.yaml @@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization images: - name: controller - newName: ghcr.io/nginx/nginx-gateway-fabric + newName: ghcr.io/nginx/nginx-gateway-fabric/operator newTag: v1.0.0 From 395dd1a4653682173d6291e87f02802ee12c826b Mon Sep 17 00:00:00 2001 From: Ciara Stacke Date: Tue, 7 Oct 2025 13:18:09 +0100 Subject: [PATCH 2/2] Add required annotation for OpenShift --- operators/bundle/metadata/annotations.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/operators/bundle/metadata/annotations.yaml b/operators/bundle/metadata/annotations.yaml index b9684eacb3..2365caba21 100644 --- a/operators/bundle/metadata/annotations.yaml +++ b/operators/bundle/metadata/annotations.yaml @@ -13,3 +13,6 @@ annotations: # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 operators.operatorframework.io.test.config.v1: tests/scorecard/ + + # OpenShift annotations. + com.redhat.openshift.versions: v4.19