Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-37991: Downstream sync to address multiple interface returns in network-status annotation #245

Merged
merged 40 commits into from
Aug 6, 2024

Conversation

dougbtv
Copy link
Member

@dougbtv dougbtv commented Aug 5, 2024

Notably includes https://github.com/k8snetworkplumbingwg/network-attachment-definition-client/releases/tag/v1.7.1 in order to fix up status annotations when a delegated plugin has multiple pod interfaces in the CNI result.

adrianchiris and others added 30 commits March 14, 2024 18:05
interface name should not be limited to DNS-1123 label format.
instead validate interface name if provided in pod network annotation
in a similar manner as iproute2[1].

this will allow to request interface names such as: "uplink_p0"

[1]https://github.com/iproute2/iproute2/blob/11740815bfe69d6ee2cad7c608a8edc70147209a/lib/utils.c#L832

Signed-off-by: adrianc <[email protected]>
Signed-off-by: Vasilis Remmas <[email protected]>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.17.0 to 0.23.0.
- [Commits](golang/net@v0.17.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Multus v3.9.3 has `--multus-master-cni-file-name` flag to specify the
name of a primary CNI config file.
https://github.com/k8snetworkplumbingwg/multus-cni/blob/v3.9.3/images/entrypoint.sh#L22

In Multus v4.0.2, the thin plugin has the flag defined, but it is not
read and so does not have effect.

This pull request fixes the problem by making the thin plugin correctly
handles `--multus-master-cni-file-name` flag.

Fixes #1226

Signed-off-by: Hidehito Yabuuchi <[email protected]>
…les/golang.org/x/net-0.23.0

Bump golang.org/x/net from 0.17.0 to 0.23.0
rename conf param, 'defaultnetworkfile' to 'readinessindicatorfile'
Fix defaultnetworkfile in unit test
deleteDefaultGWResult() may create 'routes:null' in CNI cache file
and it causes nil pointer access at addDefaultGWCacheBytes().
This code change prevents deleteDefaultGWResult() to generate
'routes:null' in cache file.
Fix CNI cache update function to prevent nil access
thin plugin: Handle `--multus-master-cni-file-name` flag
This modifies the behavior on CNI DEL for the thick plugin to just check once for API readiness, as opposed to waiting.
Thick plugin should not wait for API readiness on CNI DEL
add support for Dynamic Resource Allocation
APIReadyCheckFunc is used only in api, hence it can be decapitalize
to make its scope only in this package. This fix changes its scope.
In addition, api.APIReadyCheckFunc seems to be redundant so the name
is changed. Change the comment to fit to golang style, too.
Not exposed APIReadyCheckFunc to outside of package
arm64: build image for arm v8
This is needed to avoid issues with volume unmounts
when (other) pods exit as by default kubernetes mounts
as private.

Signed-off-by: adrianc <[email protected]>
…elet

Add mountPropagation to host-var-lib-kubelet
typo KUBERNETES_SERVICE_PROTOCOL
this provides a simple way to handle incoming
os signas using context

Signed-off-by: adrianc <[email protected]>
- if cleanup-config-on-exit is set delete generated multus
  config file on exit.

- add an option to skip watch for master cni config and kubeconfig
  as cleanup-config-on-exit with multus-conf-file=auto also triggered
  the watch for cases when deletion of multus config is desired but watch isnt

- setup signal handling to allow config file cleanup on exit

Signed-off-by: adrianc <[email protected]>
@openshift-ci openshift-ci bot requested review from fepan and pliurh August 5, 2024 13:38
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 5, 2024
@dougbtv
Copy link
Member Author

dougbtv commented Aug 5, 2024

/restest_required

@dougbtv
Copy link
Member Author

dougbtv commented Aug 5, 2024

/retest-required

Copy link
Contributor

openshift-ci bot commented Aug 5, 2024

@dougbtv: all tests passed!

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-sigs/prow repository. I understand the commands that are listed here.

@dougbtv
Copy link
Member Author

dougbtv commented Aug 5, 2024

/title OCPBUGS-37991: Downstream sync to address multiple interface returns in network-status annotation

@dougbtv
Copy link
Member Author

dougbtv commented Aug 5, 2024

/retitle OCPBUGS-37991: Downstream sync to address multiple interface returns in network-status annotation

@openshift-ci openshift-ci bot changed the title August 2024 Downstream sync OCPBUGS-37991: Downstream sync to address multiple interface returns in network-status annotation Aug 5, 2024
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Aug 5, 2024
@openshift-ci-robot
Copy link
Contributor

@dougbtv: This pull request references Jira Issue OCPBUGS-37991, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Notably includes https://github.com/k8snetworkplumbingwg/network-attachment-definition-client/releases/tag/v1.7.1 in order to fix up status annotations when a delegated plugin has multiple pod interfaces in the CNI result.

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.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 5, 2024
@dougbtv
Copy link
Member Author

dougbtv commented Aug 5, 2024

/jira refresh

@openshift-ci-robot
Copy link
Contributor

@dougbtv: This pull request references Jira Issue OCPBUGS-37991, which is invalid:

  • expected the bug to target the "4.17.0" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

@dougbtv
Copy link
Member Author

dougbtv commented Aug 5, 2024

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Aug 5, 2024
@openshift-ci-robot
Copy link
Contributor

@dougbtv: This pull request references Jira Issue OCPBUGS-37991, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.0) matches configured target version for branch (4.17.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

/jira refresh

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.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Aug 5, 2024
@bpickard22
Copy link
Contributor

Quick note, this is my first downstream merge review so if I miss anything sorry in advance

@bpickard22
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 6, 2024
Copy link
Contributor

openshift-ci bot commented Aug 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bpickard22, dougbtv

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:

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

@openshift-merge-bot openshift-merge-bot bot merged commit 3cba503 into openshift:master Aug 6, 2024
5 checks passed
@openshift-ci-robot
Copy link
Contributor

@dougbtv: Jira Issue OCPBUGS-37991: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-37991 has been moved to the MODIFIED state.

In response to this:

Notably includes https://github.com/k8snetworkplumbingwg/network-attachment-definition-client/releases/tag/v1.7.1 in order to fix up status annotations when a delegated plugin has multiple pod interfaces in the CNI result.

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

Distgit: multus-cni-container-microshift
This PR has been included in build multus-cni-container-microshift-container-v4.17.0-202408070013.p0.g3cba503.assembly.stream.el9.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.