Daemon redesign - using controller-runtime #788

SchSeba · 2024-10-10T09:44:00Z

No description provided.

github-actions · 2024-10-10T09:44:13Z

Thanks for your PR,
To run vendors CIs, Maintainers can use one of:

/test-all: To run all tests for all vendors.
/test-e2e-all: To run all E2E tests for all vendors.
/test-e2e-nvidia-all: To run all E2E tests for NVIDIA vendor.

To skip the vendors CIs, Maintainers can use one of:

/skip-all: To skip all tests for all vendors.
/skip-e2e-all: To skip all E2E tests for all vendors.
/skip-e2e-nvidia-all: To skip all E2E tests for NVIDIA vendor.
Best regards.

pkg/daemon/daemon.go

coveralls · 2024-10-10T10:30:47Z

Pull Request Test Coverage Report for Build 13526205039

Details

273 of 615 (44.39%) changed or added relevant lines in 18 files are covered.
199 unchanged lines in 12 files lost coverage.
Overall coverage increased (+0.9%) to 48.882%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
controllers/sriovnetworknodepolicy_controller.go	1	2	50.0%
pkg/host/internal/network/network.go	0	1	0.0%
pkg/host/store/store.go	0	1	0.0%
pkg/plugins/mellanox/mellanox_plugin.go	0	1	0.0%
pkg/utils/shutdown.go	0	1	0.0%
controllers/drain_controller_helper.go	1	3	33.33%
controllers/drain_controller.go	4	7	57.14%
pkg/systemd/systemd.go	2	7	28.57%
pkg/daemon/status.go	59	96	61.46%
cmd/sriov-network-config-daemon/start.go	7	134	5.22%

Files with Coverage Reduction	New Missed Lines	%
cmd/sriov-network-config-daemon/start.go	2	8.94%
pkg/client/clientset/versioned/fake/clientset_generated.go	5	46.15%
pkg/client/informers/externalversions/sriovnetwork/interface.go	6	0.0%
pkg/plugins/fake/fake_plugin.go	6	20.0%
pkg/client/informers/externalversions/sriovnetwork/v1/interface.go	9	0.0%
pkg/client/clientset/versioned/typed/sriovnetwork/v1/fake/fake_sriovoperatorconfig.go	15	10.81%
pkg/client/clientset/versioned/typed/sriovnetwork/v1/fake/fake_sriovnetworknodestate.go	17	25.68%
pkg/client/informers/externalversions/sriovnetwork/v1/sriovnetworknodestate.go	19	0.0%
pkg/client/informers/externalversions/sriovnetwork/v1/sriovoperatorconfig.go	19	0.0%
api/v1/helper.go	21	73.32%

Totals
Change from base Build 13522938942:	0.9%
Covered Lines:	7324
Relevant Lines:	14983

💛 - Coveralls

test/util/namespaces/namespaces.go

cmd/sriov-network-config-daemon/service.go

zeeke

Left a few minor comments. This PR hugely improves the config-daemon shape.

controllers/drain_controller.go

pkg/systemd/systemd.go

pkg/daemon/status.go

pkg/daemon/daemon.go

pkg/daemon/writer.go

zeeke · 2025-01-07T13:06:04Z

pkg/daemon/status.go

+	c := current.Status.DeepCopy().Interfaces
+	d := desiredNodeState.Status.DeepCopy().Interfaces
+	for idx := range d {
+		// check if it's a new device


Suggested change

// check if it's a new device

if idx >= len(c) {

return true, nil

}

// check if it's a new device

I don't know if it can ever happen (maybe if a new device is hot-plugged between reconcile loops). But it's safer to check for slice length

but in theory (not sure if it's possible) you can have a new device like hot-unplug and after that hot-plug so the len will be the same but the device is not no?

in both case, the if idx >= len(c) { can save a nil dereferencing. right?

pkg/daemon/status.go

adrianchiris

partial review

adrianchiris · 2025-01-19T10:01:46Z

controllers/helper.go

 	predicate.Funcs
 }

 func (DrainStateAnnotationPredicate) Create(e event.CreateEvent) bool {


WDYT about removing the Create fn ?

the default of predicate.Funcs is true.

is object being nil a real concern here ?

the concern is not nil. without this when a new node is added to the cluster the reconcile will not get called without this.
and if the reconcile is not created no one adds the labels to make the drain possible.

without this when a new node is added to the cluster the reconcile will not get called without this

are you sure ? i thought by default it will call reconcile since predicate.Funcs contains implementation that will return true. which means to enqueue event for reconcile.

I give it a try and I needed to add it. without it I was not able to get the create calls :(

I can give it another try

so this ended up as needed ?

yep we need this one at least from my tests

cmd/sriov-network-config-daemon/start.go

pkg/daemon/daemon.go

adrianchiris · 2025-01-19T12:07:30Z

pkg/daemon/daemon.go

-		log.Log.Error(err, "nodeStateSyncHandler(): Failed to fetch node state", "name", vars.NodeName)
-		return err
+		reqLogger.Error(err, "failed to check systemd status unexpected error")
+		return ctrl.Result{}, nil


we dont want to fail here ?

If we return an error it will get stuck in a loop as if the result for the systemd operator return an error we don't retry to not put the node into a bootloop

ack.

should we update status with "unexpected error" ?

right nice catch!

pkg/daemon/daemon.go

adrianchiris · 2025-01-19T13:06:13Z

once we get this in, i think we should move the node controllers under controllers/node/ pkg

bindata/manifests/sriov-config-service/kubernetes/sriov-config-service.yaml

hack/run-e2e-conformance.sh

SchSeba · 2025-02-03T10:23:20Z

Hi @zeeke @adrianchiris @ykulazhenkov can you please make another round of review here?

pkg/daemon/daemon.go

adrianchiris

overall looks great !

added some small comments. once we resolve them we can merge !

e0ne

lgtm

e0ne · 2025-02-20T13:13:20Z

LGTM. it could be merged once CI pass

ykulazhenkov · 2025-02-20T14:09:12Z

pkg/daemon/daemon.go

+
+	loadedPlugins         map[string]plugin.VendorPlugin
+	lastAppliedGeneration int64
+	disableDrain          bool


it looks like we never set this value.

ykulazhenkov · 2025-02-20T14:12:22Z

pkg/daemon/config.go

+		return ctrl.Result{}, err
+	}
+
+	// update log level


we need to make sure that all these global variables are initialized before the NodeReconciler starts.
Currently, FeatureGates are initialized, but not the DisableDrain flag.

right! done

adrianchiris

LGTM,

can be merged once CI pass and comments from @ykulazhenkov addressed.

Signed-off-by: Sebastian Sch <[email protected]>

It's only a one time run script so it should not be a problem to run with debug logs. Signed-off-by: Sebastian Sch <[email protected]>

Signed-off-by: Sebastian Sch <[email protected]>

SchSeba · 2025-02-26T09:15:56Z

Thanks for all the help folks!

merging

github-advanced-security bot found potential problems Oct 10, 2024

View reviewed changes

pkg/daemon/daemon.go Fixed Show fixed Hide fixed

SchSeba force-pushed the daemon_redesign branch 3 times, most recently from 9f5207e to 7d4e946 Compare October 10, 2024 10:23

SchSeba force-pushed the daemon_redesign branch 2 times, most recently from e17b584 to ddc70f2 Compare October 10, 2024 12:45

SchSeba force-pushed the daemon_redesign branch 2 times, most recently from 929886d to 9377404 Compare December 12, 2024 11:54

github-advanced-security bot found potential problems Dec 12, 2024

View reviewed changes

test/util/namespaces/namespaces.go Fixed Show fixed Hide fixed

SchSeba force-pushed the daemon_redesign branch 4 times, most recently from 79cc69b to dc6eb11 Compare December 16, 2024 14:03

SchSeba force-pushed the daemon_redesign branch from dc6eb11 to 50ad79a Compare December 26, 2024 11:34

SchSeba changed the title ~~[WIP] Daemon redesign~~ Daemon redesign - using controller-runtime Dec 26, 2024

ykulazhenkov reviewed Dec 30, 2024

View reviewed changes

cmd/sriov-network-config-daemon/service.go Outdated Show resolved Hide resolved

SchSeba force-pushed the daemon_redesign branch from 50ad79a to f369b65 Compare December 31, 2024 12:26

zeeke reviewed Jan 7, 2025

View reviewed changes

adrianchiris reviewed Jan 19, 2025

View reviewed changes

pkg/daemon/daemon.go Outdated Show resolved Hide resolved

pkg/daemon/daemon.go Outdated Show resolved Hide resolved

pkg/daemon/daemon.go Outdated Show resolved Hide resolved

pkg/daemon/daemon.go Outdated Show resolved Hide resolved

adrianchiris reviewed Jan 19, 2025

View reviewed changes

bindata/manifests/sriov-config-service/kubernetes/sriov-config-service.yaml Show resolved Hide resolved

adrianchiris reviewed Jan 19, 2025

View reviewed changes

hack/run-e2e-conformance.sh Outdated Show resolved Hide resolved

SchSeba force-pushed the daemon_redesign branch 4 times, most recently from 80564fa to 00587fb Compare February 3, 2025 08:34

zeeke approved these changes Feb 3, 2025

View reviewed changes

adrianchiris reviewed Feb 18, 2025

View reviewed changes

pkg/daemon/daemon.go Outdated Show resolved Hide resolved

adrianchiris reviewed Feb 18, 2025

View reviewed changes

pkg/daemon/daemon.go Outdated Show resolved Hide resolved

adrianchiris reviewed Feb 18, 2025

View reviewed changes

SchSeba force-pushed the daemon_redesign branch 2 times, most recently from 174365e to 8768925 Compare February 19, 2025 14:04

e0ne approved these changes Feb 20, 2025

View reviewed changes

ykulazhenkov reviewed Feb 20, 2025

View reviewed changes

adrianchiris approved these changes Feb 23, 2025

View reviewed changes

ykulazhenkov approved these changes Feb 24, 2025

View reviewed changes

SchSeba force-pushed the daemon_redesign branch 2 times, most recently from 2f979de to d9f11df Compare February 24, 2025 14:26

SchSeba mentioned this pull request Feb 25, 2025

Move systemd to host package #853

Merged

SchSeba added 8 commits February 25, 2025 18:33

make sure drain controller adds all the initial annotations

f1618ff

Signed-off-by: Sebastian Sch <[email protected]>

nit: fix virtual-cluster-redeploy.sh to add the right exports

d2300c7

Signed-off-by: Sebastian Sch <[email protected]>

add featureGates to vars

8f03852

Signed-off-by: Sebastian Sch <[email protected]>

add clean pools and pools CR to reporter for functional tests

39ae8c8

Signed-off-by: Sebastian Sch <[email protected]>

run the systemd service with debug log level.

ada65d6

It's only a one time run script so it should not be a problem to run with debug logs. Signed-off-by: Sebastian Sch <[email protected]>

switch config-daemon to use controller-runtime

683101d

Signed-off-by: Sebastian Sch <[email protected]>

use disableDrain from vars

254c895

Signed-off-by: Sebastian Sch <[email protected]>

add clean in afterAll for functest

3e6b91c

Signed-off-by: Sebastian Sch <[email protected]>

SchSeba force-pushed the daemon_redesign branch from a697c43 to 3e6b91c Compare February 25, 2025 16:34

zeeke approved these changes Feb 26, 2025

View reviewed changes

SchSeba merged commit fdc7247 into k8snetworkplumbingwg:master Feb 26, 2025
14 checks passed

Daemon redesign - using controller-runtime #788

Daemon redesign - using controller-runtime #788

Uh oh!

Conversation

SchSeba commented Oct 10, 2024

Uh oh!

github-actions bot commented Oct 10, 2024

Uh oh!

Uh oh!

coveralls commented Oct 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 13526205039

Details

💛 - Coveralls

Uh oh!

Uh oh!

Uh oh!

zeeke left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

adrianchiris left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adrianchiris commented Jan 19, 2025

Uh oh!

Uh oh!

Uh oh!

SchSeba commented Feb 3, 2025

Uh oh!

Uh oh!

Uh oh!

adrianchiris left a comment

Choose a reason for hiding this comment

Uh oh!

e0ne left a comment

Choose a reason for hiding this comment

coveralls commented Oct 10, 2024 •

edited

Loading