Skip to content

Conversation

cyphar
Copy link
Member

@cyphar cyphar commented Oct 7, 2025

Backport of #4830 and #4726.


Signed-off-by: Aleksa Sarai [email protected]

@cyphar cyphar added this to the 1.4.0-rc.2 milestone Oct 7, 2025
@cyphar cyphar added the backport/1.4-pr A backport PR to release-1.4 label Oct 7, 2025
@cyphar
Copy link
Member Author

cyphar commented Oct 7, 2025

Once this is merged (or rejected), I will prepare 1.4.0-rc.2.

Signed-off-by: Markus Lehtonen <[email protected]>
(cherry picked from commit 74c5436)
Signed-off-by: Aleksa Sarai <[email protected]>
@kolyshkin
Copy link
Contributor

Backport of #4830

It's a partial backport (please see #4830 (comment))

@cyphar
Copy link
Member Author

cyphar commented Oct 8, 2025

Ah, right. I'll include the rest of #4830 here.

@cyphar cyphar changed the title [1.4] Add memory policy support [1.4] Add memory policy and schemata support Oct 8, 2025
marquiz and others added 4 commits October 8, 2025 13:55
Signed-off-by: Markus Lehtonen <[email protected]>
(cherry picked from commit 3867f82)
Signed-off-by: Aleksa Sarai <[email protected]>
Implement support for the linux.intelRdt.schemata field of the spec.
This allows management of the "schemata" file in the resctrl group in a
generic way.

Signed-off-by: Markus Lehtonen <[email protected]>
(cherry picked from commit 4155321)
Signed-off-by: Aleksa Sarai <[email protected]>
Signed-off-by: Markus Lehtonen <[email protected]>
(cherry picked from commit 7be025f)
Signed-off-by: Aleksa Sarai <[email protected]>
Implement support for Linux memory policy in OCI spec PR:
opencontainers/runtime-spec#1282

Signed-off-by: Antti Kervinen <[email protected]>
(cherry picked from commit eda7bdf)
Signed-off-by: Aleksa Sarai <[email protected]>
@cyphar cyphar force-pushed the 1.4-memory-policy branch from 8a85caf to 910f134 Compare October 8, 2025 02:56
@cyphar
Copy link
Member Author

cyphar commented Oct 8, 2025

The lint failure is due to #4914 but I'm a little confused why nolintlint is triggered for this PR -- the deprecation happened in Go 1.18 and that line of code hasn't been touched since 2023 (cb981e5).

@kolyshkin
Copy link
Contributor

There is some problem with golangci-lint caching (a slightly different issue was reported in golangci/golangci-lint#5979, this might be it or something else), let me see if removing the cache will fix this.

@kolyshkin
Copy link
Contributor

let me see if removing the cache will fix this.

Yup, that was it.

Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

lgtm

@kolyshkin kolyshkin merged commit e470a84 into opencontainers:release-1.4 Oct 8, 2025
62 of 64 checks passed
@cyphar cyphar deleted the 1.4-memory-policy branch October 8, 2025 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport/1.4-pr A backport PR to release-1.4

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants