Include support for SNO deployments on example-cnf (#127)

ramperher · web-flow · commit 6ec558debb6b · 2025-10-27T05:51:32.000+01:00
diff --git a/README.md b/README.md
@@ -18,12 +18,14 @@ You can use them from the [Example CNF Catalog](https://quay.io/repository/rh-nf
 
 To run Example CNF, you need to fulfil the following infrastructure-related pre-requirements:
 
-- OpenShift cluster with 4.14 or higher, and with +3 worker nodes.
+- OpenShift cluster with 4.14 or higher.
 - SR-IOV network operator.
 - SriovNetworkNodePolicy and SriovNetwork CRDs.
 - Proper configuration in network devices to match the SR-IOV resources definition.
 - Performance Profile (Hugepages, CPU Isolation, etc.)
 
+This deployment has usually been validated in a multi-node cluster, with at least 3 worker nodes. But it is suitable for SNO deployments too if just testing the workload deployment (but not valid for upgrade or draining scenarios, where at least two worker nodes are needed to move workloads between nodes). Anyway, note that the documentation will always refer to the multi-node case.
+
 ## How operators are created
 
 The three operators defined in this repository are built with [Operator SDK tool](https://sdk.operatorframework.io/docs/building-operators/). [Here](https://youtu.be/imF9VGJ1Dd4) you can see how CRD-to-pod conversion works for this kind of operators.
diff --git a/grout-operator/CHANGELOG.md b/grout-operator/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] -
 
+## [0.2.3] - 2025-10-27
+
+- Include support for SNO
+
 ## [0.2.2] - 2025-08-13
 
 - No functional changes to operator logic.
diff --git a/grout-operator/Dockerfile b/grout-operator/Dockerfile
@@ -3,8 +3,8 @@ FROM quay.io/operator-framework/ansible-operator:v1.39.0
 LABEL name="NFV Example CNF Application Operator" \
       maintainer="telcoci" \
       vendor="fredco" \
-      version="v0.2.2" \
-      release="v0.2.2" \
+      version="v0.2.3" \
+      release="v0.2.3" \
       summary="An example CNF for platform validation" \
       description="An example CNF for platform validation"
 
diff --git a/grout-operator/Makefile b/grout-operator/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION := 0.2.2
+VERSION := 0.2.3
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
diff --git a/grout-operator/config/crd/bases/examplecnf.openshift.io_grouts.yaml b/grout-operator/config/crd/bases/examplecnf.openshift.io_grouts.yaml
@@ -77,6 +77,12 @@ spec:
                 enum:
                 - 0
                 - 1
+              deploymentType:
+                description: Deployment type for single-node or multi-node clusters
+                type: string
+                enum:
+                - single-node
+                - multi-node
               runtime_class_name:
                 description: Optional RuntimeClass to use for the pod
                 type: string
diff --git a/grout-operator/roles/grout/templates/deployment.yml b/grout-operator/roles/grout/templates/deployment.yml
@@ -39,6 +39,7 @@ spec:
         example-cnf-type: cnf-app
         restart-on-reboot: "true"
     spec:
+{% if deployment_type == "multi-node" %}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -49,6 +50,7 @@ spec:
                 values:
                 - pkt-gen
             topologyKey: kubernetes.io/hostname
+{% endif %}
       securityContext:
         runAsNonRoot: true
         runAsUser: 56560
diff --git a/nfv-example-cnf-index/CHANGELOG.md b/nfv-example-cnf-index/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] -
 
+## [0.3.10] - 2025-10-27
+
+- Include support for SNO
+
 ## [0.3.9] - 2025-04-22
 
 - Remove reference to cnf-app-mac-operator
diff --git a/nfv-example-cnf-index/Makefile b/nfv-example-cnf-index/Makefile
@@ -1,6 +1,6 @@
 DATE           ?= $(shell date --utc +%Y%m%d%H%M)
 SHA            ?= $(shell git rev-parse --short HEAD)
-VERSION        := 0.3.9
+VERSION        := 0.3.10
 TAG            := $(VERSION)-$(DATE).$(SHA)
 REGISTRY       ?= quay.io
 ORG            ?= rh-nfv-int
diff --git a/testpmd-operator/CHANGELOG.md b/testpmd-operator/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] -
 
+## [0.2.29] - 2025-10-27
+
+- Include support for SNO
+
 ## [0.2.28] - 2025-08-13
 
 - No functional changes to operator logic.
diff --git a/testpmd-operator/Dockerfile b/testpmd-operator/Dockerfile
@@ -3,8 +3,8 @@ FROM quay.io/operator-framework/ansible-operator:v1.39.0
 LABEL name="NFV Example CNF Application Operator" \
       maintainer="telcoci" \
       vendor="fredco" \
-      version="v0.2.28" \
-      release="v0.2.28" \
+      version="v0.2.29" \
+      release="v0.2.29" \
       summary="An example CNF for platform validation" \
       description="An example CNF for platform validation"
 
diff --git a/testpmd-operator/Makefile b/testpmd-operator/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION := 0.2.28
+VERSION := 0.2.29
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
diff --git a/testpmd-operator/config/crd/bases/examplecnf.openshift.io_testpmds.yaml b/testpmd-operator/config/crd/bases/examplecnf.openshift.io_testpmds.yaml
@@ -88,6 +88,12 @@ spec:
                 enum:
                 - 0
                 - 1
+              deploymentType:
+                description: Deployment type for single-node or multi-node clusters
+                type: string
+                enum:
+                - single-node
+                - multi-node
               runtime_class_name:
                 description: Optional RuntimeClass to use for the pod
                 type: string
diff --git a/testpmd-operator/roles/testpmd/templates/deployment.yml b/testpmd-operator/roles/testpmd/templates/deployment.yml
@@ -39,6 +39,7 @@ spec:
         example-cnf-type: cnf-app
         restart-on-reboot: "true"
     spec:
+{% if deployment_type == "multi-node" %}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -49,6 +50,7 @@ spec:
                 values:
                 - pkt-gen
             topologyKey: kubernetes.io/hostname
+{% endif %}
       securityContext:
         runAsNonRoot: true
         runAsUser: 56560
diff --git a/trex-operator/CHANGELOG.md b/trex-operator/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] -
 
+## [0.2.31] - 2025-10-27
+
+- Include support for SNO
+
 ## [0.2.30] - 2025-08-13
 
 - No functional changes to operator logic.
diff --git a/trex-operator/Dockerfile b/trex-operator/Dockerfile
@@ -3,8 +3,8 @@ FROM quay.io/operator-framework/ansible-operator:v1.39.0
 LABEL name="NFV Example CNF TRex Operator" \
       maintainer="telcoci" \
       vendor="fredco" \
-      version="v0.2.30" \
-      release="v0.2.30" \
+      version="v0.2.31" \
+      release="v0.2.31" \
       summary="An example CNF for platform validation" \
       description="An example CNF for platform validation"
 
diff --git a/trex-operator/Makefile b/trex-operator/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.2.30
+VERSION ?= 0.2.31
 
 # Set the Operator SDK version to use. By default, what is installed on the system is used.
 # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
diff --git a/trex-operator/config/crd/bases/examplecnf.openshift.io_trexconfigs.yaml b/trex-operator/config/crd/bases/examplecnf.openshift.io_trexconfigs.yaml
@@ -77,6 +77,12 @@ spec:
                 enum:
                 - 0
                 - 1
+              deploymentType:
+                description: Deployment type for single-node or multi-node clusters
+                type: string
+                enum:
+                - single-node
+                - multi-node
               runtime_class_name:
                 description: Optional RuntimeClass to use for the pod
                 type: string
diff --git a/trex-operator/roles/trexconfig/templates/deployment.yml b/trex-operator/roles/trexconfig/templates/deployment.yml
@@ -40,6 +40,7 @@ spec:
         example-cnf-type: pkt-gen
         restart-on-reboot: "true"
     spec:
+{% if deployment_type == "multi-node" %}
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
@@ -50,6 +51,7 @@ spec:
                 values:
                 - cnf-app
             topologyKey: kubernetes.io/hostname
+{% endif %}
       securityContext:
         runAsNonRoot: true
         runAsUser: 56560
diff --git a/utils/required-annotations.yaml b/utils/required-annotations.yaml
@@ -7,4 +7,4 @@ metadata:
     features.operators.openshift.io/token-auth-aws: "false"
     features.operators.openshift.io/token-auth-azure: "false"
     features.operators.openshift.io/token-auth-gcp: "false"
-    olm.skipRange: ">=0.2.2 <=0.2.30"
+    olm.skipRange: ">=0.2.3 <=0.2.31"
