Skip to content

Commit f133cfb

Browse files
authored
Update operator controller name & add annotation (#4026)
Update operator controller name to include operator and add required annotation for OpenShift
1 parent cb31ea4 commit f133cfb

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

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

0 commit comments

Comments
 (0)