Skip to content

Commit b54f954

Browse files
ramperherramperher
authored
Several software updates (#124)
Assisted-by: Cursor
1 parent cd16ff3 commit b54f954

File tree

37 files changed

+229
-67
lines changed

37 files changed

+229
-67
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SHELL := /bin/bash
22

33
DIRS := testpmd-container-app trex-container-app grout-container-app testpmd-operator trex-operator grout-operator nfv-example-cnf-index
44

5-
OPERATOR_SDK_VER:= 1.39.1
5+
OPERATOR_SDK_VER:= 1.41.1
66

77
# Print the possible targets and a short description
88
.PHONY: targets

‎grout-container-app/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SHELL := /bin/bash
22

33
DATE ?= $(shell date --utc +%Y%m%d%H%M)
44
SHA ?= $(shell git rev-parse --short HEAD)
5-
VERSION ?= 0.2.0
5+
VERSION ?= 0.2.1
66
REGISTRY ?= quay.io
77
ORG ?= rh-nfv-int
88
CONTAINER_CLI ?= podman

‎grout-container-app/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
TAG=${TAG:-"v0.2.0"}
5+
TAG=${TAG:-"v0.2.1"}
66

77
CLI=${CLI:="podman"}
88
ORG=${ORG:="rh-nfv-int"}

‎grout-container-app/cnfapp/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
## Image to build webserver
2-
FROM registry.access.redhat.com/ubi9/go-toolset:1.23 as build
2+
FROM registry.access.redhat.com/ubi9/go-toolset:1.24 as build
33

44
WORKDIR /opt/app-root/src
55
COPY utils/webserver.go .
@@ -12,14 +12,14 @@ FROM quay.io/rh-nfv-int/ubi9-base-grout:v0.0.1
1212
LABEL name="NFV Example CNF Grout Application" \
1313
maintainer="telcoci" \
1414
vendor="fredco" \
15-
version="v0.2.0" \
16-
release="v0.2.0" \
15+
version="v0.2.1" \
16+
release="v0.2.1" \
1717
summary="An example CNF for platform validation" \
1818
description="An example CNF for platform validation"
1919

2020
COPY licenses /licenses
2121

22-
ENV GROUT_VER v0.10.2
22+
ENV GROUT_VER v0.11.0
2323
ENV GROUT_RPM https://github.com/DPDK/grout/releases/download/${GROUT_VER}/grout.x86_64.rpm
2424

2525
# check latest release from https://github.com/DPDK/grout/releases

‎grout-operator/CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased] -
66

7+
## [0.2.1] - 2025-08-05
8+
9+
- Updated OperatorSDK to v1.41.1
10+
- Updated Kustomize to v5.6.0
11+
- Updated Ansible operator to v1.39.0
12+
- Updated OPM to v1.55.0
13+
- Updated grout-container-app-cnfapp version with Grout v0.11.0 and ubi9:go-toolset v1.24
14+
- Improved bundle and catalog build process in Makefile
15+
- Minor documentation and label updates
16+
717
## [0.2.0] - 2025-04-16
818

919
- Include Grout operator, based on Operator-SDK v1.39.1.

‎grout-operator/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM quay.io/operator-framework/ansible-operator:v1.37.1
1+
FROM quay.io/operator-framework/ansible-operator:v1.39.0
22

33
LABEL name="NFV Example CNF Application Operator" \
44
maintainer="telcoci" \
55
vendor="fredco" \
6-
version="v0.2.0" \
7-
release="v0.2.0" \
6+
version="v0.2.1" \
7+
release="v0.2.1" \
88
summary="An example CNF for platform validation" \
99
description="An example CNF for platform validation"
1010

‎grout-operator/Makefile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# To re-generate a bundle for another specific version without changing the standard setup, you can:
44
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
55
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
6-
VERSION := 0.2.0
6+
VERSION := 0.2.1
77

88
# Set the Operator SDK version to use. By default, what is installed on the system is used.
99
# This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit.
10-
OPERATOR_SDK_VER ?= 1.39.1
10+
OPERATOR_SDK_VER ?= 1.41.1
1111

1212
# Other custom variables
1313
SHELL := /bin/bash
@@ -20,9 +20,9 @@ DEFAULT_CHANNEL ?= alpha
2020
CONTAINER_CLI ?= podman
2121
CLUSTER_CLI ?= oc
2222
OPERATOR_NAME := grout-operator
23-
KUSTOMIZE_VER := 5.4.3
24-
OPM_VER := 1.23.0
25-
ANSIBLE_OPERATOR_PLUGIN_VER := 1.37.1
23+
KUSTOMIZE_VER := 5.6.0
24+
OPM_VER := 1.55.0
25+
ANSIBLE_OPERATOR_PLUGIN_VER := 1.39.0
2626
# GROUT_VER determines the DPDK version to use
2727
GROUT_VER ?= v$(shell bash -c '. ../versions.cfg; echo "$${VERSIONS[grout-container-app]}"')
2828

‎grout-operator/README.md‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,11 @@ Apart from the modifications you have to do, you also need to update the operato
3232

3333
Also, make sure that the operator version is within the interval defined in [required-annotations.yaml](../utils/required-annotations.yaml) file for `olm.skipRange` annotation, else update that file to modify the current range.
3434

35-
A common change is the update of Operator SDK version used in the operator. Here's an [example](https://github.com/openshift-kni/example-cnf/pull/108) where this is done.
35+
A common change is the update of Operator SDK version used in the operator. Here's an [example](https://github.com/openshift-kni/example-cnf/pull/108) where this is done. The step-by-step migration plan typically implies the following tasks:
36+
37+
1. Update Operator SDK version in Makefile and Dockerfile
38+
2. Simplify Makefile by updating custom variables
39+
3. Add modern operator-sdk download targets
40+
4. Update Dockerfile to use newer base image
41+
5. Test the operator to ensure compatibility
42+
6. Update any CI/CD that depends on the old Makefile targets

‎grout-operator/config/rbac/grout_admin_role.yaml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This rule is not used by the project grout-operator itself.
2+
# It is provided to allow the cluster admin to help manage permissions for users.
3+
#
4+
# Grants full permissions ('*') over examplecnf.openshift.io.
5+
# This role is intended for users authorized to modify roles and bindings within the cluster,
6+
# enabling them to delegate specific permissions to other users or groups as needed.
7+
8+
apiVersion: rbac.authorization.k8s.io/v1
9+
kind: ClusterRole
10+
metadata:
11+
labels:
12+
app.kubernetes.io/name: grout-operator
13+
app.kubernetes.io/managed-by: kustomize
14+
name: grout-admin-role
15+
rules:
16+
- apiGroups:
17+
- examplecnf.openshift.io
18+
resources:
19+
- grouts
20+
verbs:
21+
- '*'
22+
- apiGroups:
23+
- examplecnf.openshift.io
24+
resources:
25+
- grouts/status
26+
verbs:
27+
- get

‎grout-operator/config/rbac/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ resources:
2222
# default, aiding admins in cluster management. Those roles are
2323
# not used by the Project itself. You can comment the following lines
2424
# if you do not want those helpers be installed with your Project.
25+
- grout_admin_role.yaml
2526
- grout_editor_role.yaml
2627
- grout_viewer_role.yaml
27-

0 commit comments

Comments
 (0)