SDN-4434: Network diagnostics scheduling #2339

kyrtapz · 2024-04-16T08:46:46Z

Note: The API is currently in TechPreview, the plan is to enable it in GA in the current release.

openshift-ci-robot · 2024-04-16T08:46:49Z

@kyrtapz: This pull request references SDN-4434 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.16.0" version, but no target version was set.

In response to this:

Implements: openshift/enhancements#1585

Note: The API is currently in TechPreview, the plan is to enable it in GA in the current release.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

kyrtapz · 2024-04-16T12:26:42Z

/retest

kyrtapz · 2024-04-16T16:23:07Z

/hold
waiting for a review from @bpickard22 and @trozet

kyrtapz · 2024-04-17T11:22:40Z

/retest

trozet · 2024-04-18T19:45:11Z

pkg/controller/operconfig/operconfig_controller.go

@@ -131,6 +131,27 @@ func add(mgr manager.Manager, r *ReconcileOperConfig) error {
 		return err
 	}

+	// Watch for changes to networkDiagnostics in network.config
+	err = c.Watch(source.Kind(mgr.GetCache(), &configv1.Network{}), &handler.EnqueueRequestForObject{}, predicate.Funcs{


how come we dont follow this pattern of adding a watcher for other related config changes? at least, i dont see other config options in this function.

This controller doesn't read other config fields from configv1.Network.

trozet · 2024-04-18T19:51:56Z

pkg/network/render.go

 	if err != nil {
 		return nil, progressing, err
 	}
 	objs = append(objs, o...)

 	// render network diagnostics
-	o, err = renderNetworkDiagnostics(conf, manifestDir)
+	o, err = renderNetworkDiagnostics(operConf, clusterConf, manifestDir)


why do you need the cluster conf here? I thought our pattern was to get config, update oper, then render with oper.

We do not follow that pattern here and the networkDiagnostics is configured through clusterConf only so we don't need to copy it over. operConf has the legacy disableNetworkDiagnostics field which we fallback to(backwards compatibility) and the plan is to deprecate it.

trozet · 2024-04-18T20:44:42Z

pkg/network/render.go

+	// network diagnostics feature is disabled when clusterConf.NetworkDiagnostics.Mode is set to "Disabled"
+	// or when clusterConf.NetworkDiagnostics is empty and the legacy operConf.DisableNetworkDiagnostics is true
+	if clusterConf.NetworkDiagnostics.Mode == configv1.NetworkDiagnosticsDisabled ||
+		reflect.DeepEqual(clusterConf.NetworkDiagnostics, configv1.NetworkDiagnostics{}) && operConf.DisableNetworkDiagnostics {


if Mode is empty, where are you defaulting it?

If the mode is empty and operConf.DisableNetworkDiagnostics is not set then we render the diagnostics.
Empty is an allowed value in the API, from the API docs:

this means the user has no opinion and the platform is left to choose reasonable defaults. These defaults are subject to change over time. The current default is All.

trozet

/lgtm
/hold cancel

openshift-ci-robot · 2024-04-23T14:58:36Z

/retest-required

Remaining retests: 0 against base HEAD c8bcc35 and 2 for PR HEAD 8fe5415 in total

bpickard22 · 2024-04-23T14:58:49Z

/lgtm

Commands ran: go get github.com/openshift/api go mod tidy go mod vendor Signed-off-by: Patryk Diak <pdiak@redhat.com>

Co-authored-by: Benjamin Pickard <bpickard@redhat.com> Signed-off-by: Patryk Diak <pdiak@redhat.com>

Signed-off-by: Patryk Diak <pdiak@redhat.com>

…heck controller Signed-off-by: Patryk Diak <pdiak@redhat.com>

Introduce a way to exclude a resource from the status manger and use it for the network diagnostics daemonset and deployment. Signed-off-by: Patryk Diak <pdiak@redhat.com>

kyrtapz · 2024-04-23T16:09:25Z

Had to do a manual rebase because even though the automatic one was successful the code did not build.
The change I had to make:

--- a/pkg/network/render.go
+++ b/pkg/network/render.go
@@ -132,7 +132,7 @@ func Render(operConf *operv1.NetworkSpec, clusterConf *configv1.NetworkSpec, man
        }
        objs = append(objs, o...)
 
-       o, err = renderIPTablesAlerter(conf, bootstrapResult, manifestDir)
+       o, err = renderIPTablesAlerter(operConf, bootstrapResult, manifestDir)
        if err != nil {
                return nil, progressing, err
        }

trozet

/lgtm

openshift-ci · 2024-04-23T16:39:20Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bpickard22, kyrtapz, trozet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [kyrtapz,trozet]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2024-04-23T18:07:08Z

@kyrtapz: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/e2e-vsphere-ovn-dualstack-primaryv6	`44c7f1d`	link	false	`/test e2e-vsphere-ovn-dualstack-primaryv6`
ci/prow/e2e-azure-ovn	`44c7f1d`	link	false	`/test e2e-azure-ovn`
ci/prow/e2e-metal-ipi-ovn-ipv6-ipsec	`44c7f1d`	link	false	`/test e2e-metal-ipi-ovn-ipv6-ipsec`
ci/prow/e2e-openstack-ovn	`44c7f1d`	link	false	`/test e2e-openstack-ovn`
ci/prow/e2e-aws-sdn-upgrade	`44c7f1d`	link	false	`/test e2e-aws-sdn-upgrade`
ci/prow/e2e-network-mtu-migration-ovn-ipv6	`44c7f1d`	link	false	`/test e2e-network-mtu-migration-ovn-ipv6`
ci/prow/e2e-vsphere-ovn-dualstack	`44c7f1d`	link	false	`/test e2e-vsphere-ovn-dualstack`
ci/prow/security	`44c7f1d`	link	false	`/test security`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2024-04-23T22:46:10Z

[ART PR BUILD NOTIFIER]

This PR has been included in build cluster-network-operator-container-v4.17.0-202404231810.p0.g154c095.assembly.stream.el9 for distgit cluster-network-operator.
All builds following this will include this PR.

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 16, 2024

kyrtapz force-pushed the net_diag_scheduling branch 2 times, most recently from 9c4c305 to ba6f97f Compare April 16, 2024 08:50

openshift-ci bot requested review from danwinship and jcaamano April 16, 2024 08:51

kyrtapz mentioned this pull request Apr 16, 2024

SDN-4434: Network diagnostics configurability #2337

Closed

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2024

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 16, 2024

kyrtapz force-pushed the net_diag_scheduling branch from ba6f97f to 8fe5415 Compare April 17, 2024 07:22

kyrtapz mentioned this pull request Apr 17, 2024

SDN-4783: Add e2e tests for NetworkDiagnosticsConfig featuregate openshift/origin#28719

Merged

trozet reviewed Apr 18, 2024

View reviewed changes

trozet approved these changes Apr 23, 2024

View reviewed changes

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 23, 2024

openshift-ci bot assigned trozet Apr 23, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2024

openshift-ci bot assigned bpickard22 Apr 23, 2024

kyrtapz and others added 5 commits April 23, 2024 17:12

Bump openshift/api

1a08ae3

Commands ran: go get github.com/openshift/api go mod tidy go mod vendor Signed-off-by: Patryk Diak <pdiak@redhat.com>

Handle the spec.networkDiagnostics in network.config.openshift.io

3c51c1c

Co-authored-by: Benjamin Pickard <bpickard@redhat.com> Signed-off-by: Patryk Diak <pdiak@redhat.com>

Bump openshift/client-go

0872f7c

Signed-off-by: Patryk Diak <pdiak@redhat.com>

Set the NetworkDiagnosticsAvailable condition from the connectivity c…

a936f09

…heck controller Signed-off-by: Patryk Diak <pdiak@redhat.com>

Exclude network diagnostics pods from the status manager

44c7f1d

Introduce a way to exclude a resource from the status manger and use it for the network diagnostics daemonset and deployment. Signed-off-by: Patryk Diak <pdiak@redhat.com>

kyrtapz force-pushed the net_diag_scheduling branch from 8fe5415 to 44c7f1d Compare April 23, 2024 15:18

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2024

trozet approved these changes Apr 23, 2024

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 23, 2024

openshift-merge-bot bot merged commit 154c095 into openshift:master Apr 23, 2024
21 of 35 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SDN-4434: Network diagnostics scheduling #2339

SDN-4434: Network diagnostics scheduling #2339

kyrtapz commented Apr 16, 2024

openshift-ci-robot commented Apr 16, 2024 •

edited by openshift-ci bot

kyrtapz commented Apr 16, 2024

kyrtapz commented Apr 16, 2024

kyrtapz commented Apr 17, 2024

trozet Apr 18, 2024

kyrtapz Apr 19, 2024

trozet Apr 18, 2024

kyrtapz Apr 19, 2024 •

edited

trozet Apr 18, 2024

kyrtapz Apr 19, 2024

trozet left a comment

openshift-ci-robot commented Apr 23, 2024

bpickard22 commented Apr 23, 2024

kyrtapz commented Apr 23, 2024

trozet left a comment

openshift-ci bot commented Apr 23, 2024

openshift-ci bot commented Apr 23, 2024

openshift-bot commented Apr 23, 2024

SDN-4434: Network diagnostics scheduling #2339

SDN-4434: Network diagnostics scheduling #2339

Conversation

kyrtapz commented Apr 16, 2024

openshift-ci-robot commented Apr 16, 2024 • edited by openshift-ci bot

kyrtapz commented Apr 16, 2024

kyrtapz commented Apr 16, 2024

kyrtapz commented Apr 17, 2024

trozet Apr 18, 2024

Choose a reason for hiding this comment

kyrtapz Apr 19, 2024

Choose a reason for hiding this comment

trozet Apr 18, 2024

Choose a reason for hiding this comment

kyrtapz Apr 19, 2024 • edited

Choose a reason for hiding this comment

trozet Apr 18, 2024

Choose a reason for hiding this comment

kyrtapz Apr 19, 2024

Choose a reason for hiding this comment

trozet left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Apr 23, 2024

bpickard22 commented Apr 23, 2024

kyrtapz commented Apr 23, 2024

trozet left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Apr 23, 2024

openshift-ci bot commented Apr 23, 2024

openshift-bot commented Apr 23, 2024

openshift-ci-robot commented Apr 16, 2024 •

edited by openshift-ci bot

kyrtapz Apr 19, 2024 •

edited