Skip to content
New issue

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

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

Already on GitHub? # to your account

[release-1.31] Fix crictl info for containerd #1570

Conversation

saschagrunert
Copy link
Member

@saschagrunert saschagrunert commented Aug 13, 2024

What type of PR is this?

/kind bug

What this PR does / why we need it:

We cannot just assume JSON objects because containerd will also return something like:

"golang": "go1.22.5",
"lastCNILoadStatus": "OK",
"lastCNILoadStatus.default": "OK",

For those values we just assume strings and prevent printing multiple double quotes to restore the v1.30.0 behavior of crictl.

Cherry picked from commit 793c3e0

Which issue(s) this PR fixes:

Fixes #1566

Forward port from #1568

Special notes for your reviewer:

This seems to be a regression and we may have to follow-up with v1.31.1

Does this PR introduce a user-facing change?

Fixed `crictl info` output for containerd.

We cannot just assume JSON objects because containerd will also return
something like:

```
"golang": "go1.22.5",
"lastCNILoadStatus": "OK",
"lastCNILoadStatus.default": "OK",
```

For those values we just assume strings and prevent printing multiple
double quotes to restore the v1.30.0 behavior of `crictl`.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
(cherry picked from commit 793c3e0)
@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Aug 13, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 13, 2024
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 13, 2024
@saschagrunert saschagrunert changed the title Fix crictl info for containerd [release-1.31] Fix crictl info for containerd Aug 13, 2024
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 13, 2024
@kwilczynski
Copy link
Member

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 13, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kwilczynski, 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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit ea669ca into kubernetes-sigs:release-1.31 Aug 13, 2024
29 checks passed
@saschagrunert saschagrunert deleted the release-1.31-containerd branch August 13, 2024 10:39
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants