Skip to content

Remove annotations from Resources#22

Merged
thaJeztah merged 1 commit intoopencontainers:mainfrom
kolyshkin:resources-fixup
Jun 18, 2025
Merged

Remove annotations from Resources#22
thaJeztah merged 1 commit intoopencontainers:mainfrom
kolyshkin:resources-fixup

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin commented Jun 18, 2025 •
edited
Loading

This results in different JSON than the older version:

Before commit fd4995c:

    "cgroups": {
      ...
      "devices": [
        ...

After:

    "cgroups": {
      ...
      "Resources": {
        "devices": [
          ...

This breaks backward compatibility for runc.

Fixes: fd4995c ("Add omitempty JSON attribute for some fields")

@kolyshkin
Remove annotations from Resources
7e58331 
This results in different JSON than the older version:

Before commit fd4995c:

    "cgroups": {
      ...
      "devices": [
        ...

After:

    "cgroups": {
      ...
      "Resources": {
        "devices": [

This breaks backward compatibility for runc.

Fixes: fd4995c ("Add omitempty JSON attribute for some fields")
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin added this to the 0.0.3 milestone Jun 18, 2025
@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Jun 18, 2025

This is a regression in v0.0.2, so I'll release v0.0.3 as a hotfix as soon as this is merged. @opencontainers/cgroups-maintainers PTAL.

thaJeztah
thaJeztah approved these changes Jun 18, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oof; thanks!

As a follow-up, should we add some basic unit-tests with fixtures for JSON produced to make sure changes more apparent ?

LGTM

@thaJeztah thaJeztah merged commit b970779 into opencontainers:main Jun 18, 2025
14 checks passed
@kolyshkin
Copy link
Copy Markdown
Contributor Author

kolyshkin commented Jun 18, 2025 •
edited
Loading

oof; thanks!

As a follow-up, should we add some basic unit-tests with fixtures for JSON produced to make sure changes more apparent ?

I thought about that and basically almost all changes to JSON attributes result in changes to JSON being produced (but only some changes result in a change to JSON structure). So I am not really sure how to test it in a generic way :-\

kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jun 18, 2025
@kolyshkin
deps: bump cgroups to v0.0.3
fb22035 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   (opencontainers#4772).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin kolyshkin mentioned this pull request Jun 18, 2025
Merged
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jun 18, 2025
@kolyshkin
deps: bump cgroups to v0.0.3
d9e0b7a 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jun 18, 2025
@kolyshkin
deps: bump cgroups to v0.0.3
7788100 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jun 19, 2025
@kolyshkin
deps: bump cgroups to v0.0.3
11b933a 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jun 19, 2025
@kolyshkin
deps: bump cgroups to v0.0.3
f1abb32 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Due to item 2, modify some tests accordingly.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin added a commit to kolyshkin/runc that referenced this pull request Jun 19, 2025
@kolyshkin
deps: bump cgroups to v0.0.3, fix tests
da90947 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Due to item 2, modify some tests accordingly.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
jaredledvina pushed a commit to DataDog/runc that referenced this pull request Sep 23, 2025
@kolyshkin @jaredledvina
deps: bump cgroups to v0.0.3, fix tests
6119e53 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Due to item 2, modify some tests accordingly.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
jaredledvina pushed a commit to DataDog/runc that referenced this pull request Sep 23, 2025
@kolyshkin @jaredledvina
deps: bump cgroups to v0.0.3, fix tests
3764d6e 
For changelog, see https://github.com/opencontainers/cgroups/releases/tag/v0.0.3

This fixes two runc issues:

1. JSON incompatibility introduced in cgroups v0.0.2 (see
   opencontainers/cgroups#22).

2. Bad CPU shares to CPU weight conversion (see
   opencontainers#4772).

Due to item 2, modify some tests accordingly.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@haircommander haircommander haircommander approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@cyphar cyphar Awaiting requested review from cyphar

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.0.3

Development

Successfully merging this pull request may close these issues.

4 participants

@kolyshkin @thaJeztah @haircommander @AkihiroSuda