Update to operator-sdk v1.39.1 #115

rajchiluveru · 2025-02-18T11:56:38Z

No description provided.

ramperher · 2025-02-18T14:41:14Z

@rajchiluveru , thanks for starting this!
To address operator-sdk update, typically, we follow these steps, just to make sure that we're using what is expected from the latest release:

Create a new operator-sdk project locally, using the latest version
Config each operator from scratch. Operator SDK will create a project structure for the given operators
Compare the new project created by operator-sdk with what we currently have in the repo
Apply the proposed modifications in the new project created

Commands to create the projects with operator-sdk can be found on the README of each operator. Here's the info: https://github.com/openshift-kni/example-cnf?tab=readme-ov-file#how-operators-are-created
And here's the last change that updated operator-sdk: #108. You can see there are plenty of modifications, but all of them comes from the differences between what's generated by operator-sdk and what we have right now.

ramperher

Some changes to be made

cnf-app-mac-operator/.gitignore

ramperher · 2025-02-20T08:41:02Z

cnf-app-mac-operator/Dockerfile

-LABEL name="NFV Example CNF App MAC Operator" \
-      maintainer="telcoci" \
-      vendor="fredco" \
-      version="v0.2.22" \


This file cannot be modified, you only need to bump the version and release here

Still required

cnf-app-mac-operator/Makefile

testpmd-operator/config/manager/manager.yaml

trex-operator/Makefile

Off next week, dismissing my review just not to block the merge of this change if working

ramperher · 2025-02-20T14:14:29Z

Just for future reviews, since I'll be off:

Take care that the following files from each operator are updated:
- CHANGELOG.md.
- Makefile.
- Dockerfile.
Also, make sure that the operator version is within the interval defined in required-annotations.yaml file for olm.skipRange annotation, else update that file to modify the current range.

Here's an example to follow

Also, @rajchiluveru , note the following:

Try to keep simple, just apply the main modifications that come from the new operator-sdk version and that are really needed in our operators. Note our Makefiles, Dockerfiles, etc. are more complex than what's generated from operator-sdk, these differences are likely not to be added.
Try not to submit too many small commits because each commit triggers the Github action to compile the images. Maybe you're killing a running process if you just commit a minor change immediately. It's better to include all changes in one single commit and then test.
Squash your commits once finished.
When PR build passes, then test example-cnf with dci-pipeline-check. You need to confirm that the baseline scenario works and that all certification tests have the expected results (verify_tests feature will not fail in that case).

ramperher · 2025-02-20T14:16:35Z

cnf-app-mac-operator/.gitignore

Why is this file deleted?

ramperher · 2025-02-20T14:16:47Z

cnf-app-mac-operator/Dockerfile

Why is this file deleted?

ramperher · 2025-02-20T14:17:06Z

cnf-app-mac-operator/Dockerfile

-LABEL name="NFV Example CNF App MAC Operator" \
-      maintainer="telcoci" \
-      vendor="fredco" \
-      version="v0.2.22" \


Still required

ramperher · 2025-02-20T14:19:00Z

cnf-app-mac-operator/Makefile

 # (i.e. docker build --platform linux/arm64 ). However, you must enable docker buildKit for it.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
-docker-build: test ## Build docker image with the manager.


Dependency with test task is required, you cannot delete it. That's why the build PR Github action is failing right now.

ramperher · 2025-02-20T14:21:32Z

cnf-app-mac-operator/Makefile

@@ -220,7 +220,7 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
 	$(KUSTOMIZE) build config/default | $(CLUSTER_CLI) apply -f -

 .PHONY: undeploy
-undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
+undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.


Don't delete kustomize dependency as well, this is needed

ramperher · 2025-02-20T14:26:05Z

cnf-app-mac-operator/internal/controller/cnfappmac_controller.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/client-go/tools/remotecommand"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/log"


Is this package really needed? If no function is using it, it's not needed, else a warning will appear when compiling the binary

ramperher · 2025-02-20T14:26:35Z

testpmd-operator/Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/operator-framework/ansible-operator:v1.36.1
+FROM quay.io/operator-framework/ansible-operator:v1.37.1


version/release below need to be bumped too

ramperher · 2025-02-20T14:26:52Z

testpmd-operator/config/manager/manager.yaml

Keep the original values we have, this doesn't need to be changed.

ramperher · 2025-02-20T14:28:21Z

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.22 <=0.2.25"
+    olm.skipRange: ">=0.2.22 <=0.2.26"


lower range must be updated to 0.2.23 too

rajchiluveru added 4 commits February 18, 2025 11:56

Update to operator-sdk v1.39.1

aefe9c5

Update cnf-app-mac-operator makefile

6193914

Update cnf-app-mac-operator olm.config.yaml

aacb754

Update cnf-app-mac-operator basic.config.yaml

9e7564d

rajchiluveru added 25 commits February 19, 2025 10:49

Update cnf-app-mac-operator .gitignore

0a98ea2

Update cnf-app-mac-operator Dockerfile

60646d7

Update cnf-app-mac-operator Makefile

e1ea524

Update cnfappmac_types.go

f66a109

Update cnfappmac_webhook.go

c93f209

Update cnfappmac_webhook_test.go

e991b1c

Update groupversion_info.go

94c6ed2

Update webhook_suite_test.go

cc54009

Update zz_generated.deepcopy.go

23ad1e8

Update main.go

bb5ccce

Update examplecnf.openshift.io_cnfappmacs.yaml

2f9f780

Update go.mod

3bf714b

Update go.sum

799d70d

Update boilerplate.go.txt

bb41cbe

Update cnfappmac_controller.go

dfb30d1

Update cnfappmac_controller_test.go

96c85ee

Update suite_test.go

8937710

Update e2e_suite_test.go

44e2f96

Update e2e_test.go

984563a

Update utils.go

0d6e0fa

Update testpmd-operator Dockerfile

9565e0b

Update manager.yaml

8909aba

Update testpmd-operator basic.config.yaml

1f73d3a

Update testpmd-operator olm.config.yaml

b162957

Update trex-operator Dockerfile

5fa3e0b

Update trex-operator Makefile

878c095

ramperher previously requested changes Feb 20, 2025

View reviewed changes

rajchiluveru added 9 commits February 20, 2025 11:09

Delete cnf-app-mac-operator/.gitignore

5b63d11

Delete cnf-app-mac-operator/Dockerfile

1d00547

Updated correct version in Makefile

afd0156

removed docker entry in Makefile

f56a5f3

removed rbac Makefile

f865bc4

Update d version var in Makefile

6d39eba

Update trex-operator CHANGELOG.md

effa041

Updated trex-operator versions in Dockerfile

d80993e

Updated version Range in required-annotations.yaml

35d2912

ramperher reviewed Feb 20, 2025

View reviewed changes

rajchiluveru added 9 commits February 20, 2025 17:38

added deleted files

66d2218

added deleted files

6d2f20f

updated Makefile

6222d95

updated go.mod file

f647216

updated go.sum file

650c9a7

updated go.sum file

bf450f8

updated go.sum file

390d632

updated Dockerfile file

ccfe4e8

updated Dockerfile file

439f1dc

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to operator-sdk v1.39.1 #115

Update to operator-sdk v1.39.1 #115

rajchiluveru commented Feb 18, 2025

ramperher commented Feb 18, 2025

ramperher left a comment

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher commented Feb 20, 2025 •

edited

Loading

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

ramperher Feb 20, 2025

		@@ -1,4 +1,4 @@
		FROM quay.io/operator-framework/ansible-operator:v1.36.1
		FROM quay.io/operator-framework/ansible-operator:v1.37.1

Update to operator-sdk v1.39.1 #115

Are you sure you want to change the base?

Update to operator-sdk v1.39.1 #115

Conversation

rajchiluveru commented Feb 18, 2025

ramperher commented Feb 18, 2025

ramperher left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ramperher commented Feb 20, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ramperher commented Feb 20, 2025 •

edited

Loading