OCPBUGS-66342: Downstream sync 2026-01-11#1170
Merged
openshift-merge-bot[bot] merged 82 commits intoopenshift:mainfrom Feb 24, 2026
Merged
OCPBUGS-66342: Downstream sync 2026-01-11#1170openshift-merge-bot[bot] merged 82 commits intoopenshift:mainfrom
openshift-merge-bot[bot] merged 82 commits intoopenshift:mainfrom
Conversation
Shutting down a PF to test if the NIC can be used for pod-to-pod connectivity causes a race condition, as the config-daemon would try to set it up again during reconciliation. Also, it would trigger a node drain, making the test case very flaky. Instead, convert the test case to verify that a NIC with no carrier provides intra-node connectivity. Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
before this change when we remove a policy the daemon didn't revert the driver Signed-off-by: Sebastian Sch <sebassch@gmail.com>
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
e2e: Refactor `PF shutdown` test case
Signed-off-by: Sebastian Sch <sebassch@gmail.com>
add hadolint check action Signed-off-by: adrianc <adrianc@nvidia.com>
* golangci_lint bump version 2 * controller-gen * go mod version 1.24 * adding more linters Signed-off-by: Sebastian Sch <sebassch@gmail.com>
multiple bumps
Replace machine-config-operator imports with local implementations to eliminate dependency on vulnerable github.com/coreos/ignition v0.35.0. Created local helper functions in pkg/render/ignition_helpers.go that use only safe ignition/v2 packages. Added constants to pkg/consts to avoid importing machine-config-operator constants. Fixes: GHSA-hj57-j5cw-2mwp CVE-2022-1706 Signed-off-by: Fred Rolland <frolland@nvidia.com>
Fix CVE: Remove vulnerable ignition v0.35.0 dep
…ith 4 updates Bumps the general-dependencies group with 4 updates in the / directory: [github.com/coreos/ignition/v2](https://github.com/coreos/ignition), [github.com/onsi/ginkgo/v2](https://github.com/onsi/ginkgo), [github.com/onsi/gomega](https://github.com/onsi/gomega) and [github.com/spf13/cobra](https://github.com/spf13/cobra). Updates `github.com/coreos/ignition/v2` from 2.20.0 to 2.24.0 - [Release notes](https://github.com/coreos/ignition/releases) - [Changelog](https://github.com/coreos/ignition/blob/main/docs/release-notes.md) - [Commits](coreos/ignition@v2.20.0...v2.24.0) Updates `github.com/onsi/ginkgo/v2` from 2.27.2 to 2.27.3 - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](onsi/ginkgo@v2.27.2...v2.27.3) Updates `github.com/onsi/gomega` from 1.38.2 to 1.38.3 - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](onsi/gomega@v1.38.2...v1.38.3) Updates `github.com/spf13/cobra` from 1.9.1 to 1.10.2 - [Release notes](https://github.com/spf13/cobra/releases) - [Commits](spf13/cobra@v1.9.1...v1.10.2) --- updated-dependencies: - dependency-name: github.com/coreos/ignition/v2 dependency-version: 2.24.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: general-dependencies - dependency-name: github.com/onsi/ginkgo/v2 dependency-version: 2.27.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: general-dependencies - dependency-name: github.com/onsi/gomega dependency-version: 1.38.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: general-dependencies - dependency-name: github.com/spf13/cobra dependency-version: 1.10.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: general-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
…/go_modules/general-dependencies-35e5ba6828 build(deps): bump the general-dependencies group across 1 directory with 4 updates
chore: add hadolint action
Add operator.extraEnv helm value to allow injecting custom environment variables into the operator controller container. Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com>
Add support for custom env variables for sriov-config-daemon. The extra varaibles can be set in SriovOperatorConfig CR. Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com>
Bumps the k8s-dependencies group with 6 updates: | Package | From | To | | --- | --- | --- | | [k8s.io/api](https://github.com/kubernetes/api) | `0.34.2` | `0.34.3` | | [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) | `0.34.2` | `0.34.3` | | [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery) | `0.34.2` | `0.34.3` | | [k8s.io/client-go](https://github.com/kubernetes/client-go) | `0.34.2` | `0.34.3` | | [k8s.io/code-generator](https://github.com/kubernetes/code-generator) | `0.34.2` | `0.34.3` | | [k8s.io/kubectl](https://github.com/kubernetes/kubectl) | `0.34.2` | `0.34.3` | Updates `k8s.io/api` from 0.34.2 to 0.34.3 - [Commits](kubernetes/api@v0.34.2...v0.34.3) Updates `k8s.io/apiextensions-apiserver` from 0.34.2 to 0.34.3 - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](kubernetes/apiextensions-apiserver@v0.34.2...v0.34.3) Updates `k8s.io/apimachinery` from 0.34.2 to 0.34.3 - [Commits](kubernetes/apimachinery@v0.34.2...v0.34.3) Updates `k8s.io/client-go` from 0.34.2 to 0.34.3 - [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md) - [Commits](kubernetes/client-go@v0.34.2...v0.34.3) Updates `k8s.io/code-generator` from 0.34.2 to 0.34.3 - [Commits](kubernetes/code-generator@v0.34.2...v0.34.3) Updates `k8s.io/kubectl` from 0.34.2 to 0.34.3 - [Commits](kubernetes/kubectl@v0.34.2...v0.34.3) --- updated-dependencies: - dependency-name: k8s.io/api dependency-version: 0.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apiextensions-apiserver dependency-version: 0.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/apimachinery dependency-version: 0.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/client-go dependency-version: 0.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/code-generator dependency-version: 0.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies - dependency-name: k8s.io/kubectl dependency-version: 0.34.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
Avoid passing empty arguments to yum when building on s390x. This fixes build failures and satisfies hadolint rules while preserving behavior on non-s390x architectures. Signed-off-by: Ashok Pariya <ashok.pariya@ibm.com>
Currently, if rootCmd.Execute() returns an error, the daemon logs the error but exits with code 0, incorrectly indicating success. This fix adds os.Exit(1) to ensure the process exits with a non-zero exit code when an error occurs, allowing proper error detection by the calling process or container runtime. Signed-off-by: Yury Kulazhenkov <ykulazhenkov@nvidia.com>
…/github_actions/actions/upload-artifact-6 build(deps): bump actions/upload-artifact from 5 to 6
…/go_modules/k8s-dependencies-06b51cca4c build(deps): bump the k8s-dependencies group with 6 updates
…390x fix conditional mstflint install on s390x
…emon-env-args feat: add support for custom env variables for sriov-config-daemon
Bumps the general-dependencies group with 4 updates: [github.com/coreos/ignition/v2](https://github.com/coreos/ignition), [github.com/jaypipes/ghw](https://github.com/jaypipes/ghw), [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) and [github.com/prometheus-operator/prometheus-operator/pkg/client](https://github.com/prometheus-operator/prometheus-operator). Updates `github.com/coreos/ignition/v2` from 2.24.0 to 2.25.0 - [Release notes](https://github.com/coreos/ignition/releases) - [Changelog](https://github.com/coreos/ignition/blob/main/docs/release-notes.md) - [Commits](coreos/ignition@v2.24.0...v2.25.0) Updates `github.com/jaypipes/ghw` from 0.21.0 to 0.21.1 - [Release notes](https://github.com/jaypipes/ghw/releases) - [Commits](jaypipes/ghw@v0.21.0...v0.21.1) Updates `github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring` from 0.87.0 to 0.87.1 - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](prometheus-operator/prometheus-operator@v0.87.0...v0.87.1) Updates `github.com/prometheus-operator/prometheus-operator/pkg/client` from 0.87.0 to 0.87.1 - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](prometheus-operator/prometheus-operator@v0.87.0...v0.87.1) --- updated-dependencies: - dependency-name: github.com/coreos/ignition/v2 dependency-version: 2.25.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: general-dependencies - dependency-name: github.com/jaypipes/ghw dependency-version: 0.21.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: general-dependencies - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-version: 0.87.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: general-dependencies - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/client dependency-version: 0.87.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: general-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>
…env-args feat: add extra env variables support for operator pod to helm chart
…/go_modules/general-dependencies-d732c02c82 build(deps): bump the general-dependencies group with 4 updates
Bump dependencies and fix deprecated API usage
When the blockDevicePluginUntilConfigured feature gate is enabled and there are no SriovNetworkNodePolicy resources targeting a node, the config-daemon's apply() function calls waitForDevicePluginPodAndTryUnblock which polls for up to 2 minutes waiting for a device plugin pod that will never arrive. The device plugin daemonset is only scheduled on nodes with policies (SriovDevicePluginLabel=Enabled), so this wait always times out when Spec.Interfaces is empty. Skip the device plugin wait and the periodic unblock API call when the desired node state has no interfaces configured. This matches the existing guard in tryUnblockDevicePlugin() which already checks for empty interfaces before removing the wait-for-config annotation. Signed-off-by: Sebastian Sch <sebassch@gmail.com>
daemon: move empty device-plugin pod logging to callers
Wrap the cluster stability check with an Eventually block, so the test can pass in case of temporary errors (e.g. image pull timeouts). Co-authored-by: Cursor <cursoragent@cursor.com> Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
…n_no_policy daemon: skip device plugin wait when no policies are configured
Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
Contributor
Author
|
/retest |
Contributor
|
/test e2e-telco5g-sriov |
Contributor
Author
|
/jira refresh |
openshift-ci-robot
added
jira/valid-bug
Contributor
|
@zeeke: This pull request references Jira Issue OCPBUGS-66342, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: DetailsIn response to this:
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. |
Contributor
Author
|
/retest |
Contributor
|
@zeeke: The following test failed, say
Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Contributor
Author
|
Test failure will be fixed by |
Contributor
Okay, Thanks. |
Contributor
|
/lgtm |
openshift-ci-robot
added
the
verified
Contributor
|
@SchSeba: This PR has been marked as verified by DetailsIn response to this:
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. |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: SchSeba, zeeke The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-merge-bot
bot
merged commit 46cc14d
into
openshift:main
11 of 12 checks passed
Contributor
|
@zeeke: Jira Issue OCPBUGS-66342: All pull requests linked via external trackers have merged: All linked pull requests have the DetailsIn response to this:
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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cc @ashokpariya0 , @SchSeba
superseeds: