Skip to content

[release/1.7] cri: add deprecation warnings for deprecated CRI configs#9469

Merged
samuelkarp merged 6 commits intocontainerd:release/1.7from
samuelkarp:deprecation-warning-config-1.7
Dec 6, 2023
Merged

[release/1.7] cri: add deprecation warnings for deprecated CRI configs#9469
samuelkarp merged 6 commits intocontainerd:release/1.7from
samuelkarp:deprecation-warning-config-1.7

Conversation

@samuelkarp
Copy link
Member

@samuelkarp samuelkarp commented Dec 5, 2023

Part of #9312

This is the rest of the CRI configs that are deprecated other than CriuPath, which is separate (it's a runc option in the v2 runtimes).

@samuelkarp samuelkarp mentioned this pull request Dec 5, 2023
Closed
3 tasks
@fuweid fuweid changed the title cri: add deprecation warning for systemd_cgroup [release/1.7] cri: add deprecation warning for systemd_cgroup Dec 5, 2023
fuweid
fuweid approved these changes Dec 5, 2023
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@AkihiroSuda
Copy link
Member

AkihiroSuda commented Dec 5, 2023 •
edited
Loading

cri: add deprecation warning for systemd_cgroup

People may misinterpret that containerd will only support the non-systemd cgroupfs driver.
s/systemd_cgroup/the old form of systemd_cgroup/ to avoid confusion.

@samuelkarp samuelkarp force-pushed the deprecation-warning-config-1.7 branch from 67c8561 to ade8753 Compare December 6, 2023 04:30
@samuelkarp
Copy link
Member Author

samuelkarp commented Dec 6, 2023

@AkihiroSuda fixed

@AkihiroSuda
Copy link
Member

AkihiroSuda commented Dec 6, 2023

Thanks, could you update the commit message and the PR title too?

@samuelkarp samuelkarp changed the title [release/1.7] cri: add deprecation warning for systemd_cgroup [release/1.7] cri: add deprecation warning for deprecated CRI configs Dec 6, 2023
@samuelkarp samuelkarp force-pushed the deprecation-warning-config-1.7 branch from ade8753 to 9d1bad6 Compare December 6, 2023 06:28
@samuelkarp
Copy link
Member Author

samuelkarp commented Dec 6, 2023

@AkihiroSuda done

@samuelkarp samuelkarp changed the title [release/1.7] cri: add deprecation warning for deprecated CRI configs [release/1.7] cri: add deprecation warnings for deprecated CRI configs Dec 6, 2023
AkihiroSuda
AkihiroSuda approved these changes Dec 6, 2023
View reviewed changes
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@samuelkarp samuelkarp merged commit 689d07b into containerd:release/1.7 Dec 6, 2023
@samuelkarp samuelkarp deleted the deprecation-warning-config-1.7 branch December 6, 2023 07:48
@samuelkarp
Copy link
Member Author

samuelkarp commented Dec 6, 2023

/cherrypick release/1.6

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 6, 2023

@samuelkarp: #9469 failed to apply on top of branch "release/1.6":

Applying: cri: add warning for old form of systemd_cgroup
Using index info to reconstruct a base tree...
M	pkg/cri/config/config.go
M	pkg/cri/config/config_test.go
M	pkg/deprecation/deprecation.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/deprecation/deprecation.go
CONFLICT (content): Merge conflict in pkg/deprecation/deprecation.go
Auto-merging pkg/cri/config/config_test.go
Auto-merging pkg/cri/config/config.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 cri: add warning for old form of systemd_cgroup
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release/1.6

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 kubernetes/test-infra repository.

@dmcgowan dmcgowan mentioned this pull request Dec 7, 2023
Merged
@mfahlandt mfahlandt mentioned this pull request Dec 12, 2023
Closed
9 tasks
@ruiwen-zhao ruiwen-zhao mentioned this pull request Dec 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ruiwen-zhao ruiwen-zhao ruiwen-zhao approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

size/M

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@samuelkarp @AkihiroSuda @k8s-infra-cherrypick-robot @ruiwen-zhao @fuweid @k8s-ci-robot