Fixes invalid JSON in crictl info #1446
Merged
Conversation
This file contains 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
k8s-ci-robot
added
kind/bug
k8s-ci-robot
added
the
size/L
|
LGTM |
|
@laozc do you mind another rebase to get the latest CI changes in? I updated the e2e tests to work with the latest CRI-O main branch. |
containerd on Windows may not escape the return message which may result in invalid JSON in crictl info. Message from containerd: cni config load failed: no network config found in C:\Program Files \containerd\cni\conf: cni plugin not initialized: failed to load cni config
saschagrunert
approved these changes
Jun 7, 2024
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: laozc, saschagrunert 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 |
k8s-ci-robot
added
the
approved
|
It looks like that this change introduces another set of issues in upstream CI: https://github.com/cri-o/cri-o/actions/runs/9461235322/job/26061657621 I'm testing a revert in cri-o/cri-o#8279, we may have to revert it again here as well. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
containerd on Windows may not escape the return message which may result in invalid JSON in crictl info.
Message from containerd:
cni config load failed: no network config found in C:\Program Files \containerd\cni\conf: cni plugin
not initialized: failed to load cni config
What type of PR is this?
/kind bug
What this PR does / why we need it:
Which issue(s) this PR fixes:
Fixes #1426
Special notes for your reviewer:
Does this PR introduce a user-facing change?