Skip to content

[release/1.7] snapshots: emit deprecation warning for aufs #9436

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
estesp merged 1 commit into from
Nov 30, 2023
Merged

[release/1.7] snapshots: emit deprecation warning for aufs #9436

estesp merged 1 commit into from
Nov 30, 2023

Conversation

@samuelkarp
Copy link
Member

@samuelkarp samuelkarp commented Nov 29, 2023 •
edited
Loading

Part of #9312

aufs snapshotter is already removed from main, so this PR is directly against 1.7. However, the approach here is a bit weird, and I'm open to feedback on doing it differently if that's warranted. Here's the weirdness:

  • aufs snapshotter is in a separate repo and currently depends on containerd 1.6.12
  • The plugin itself has no dependencies
  • Adding a dependency on the warning service would require:
    • an update to containerd 1.6 adding the new warning ID (and, preferably, a release)
    • updating the go module dependency in the aufs snapshotter
    • adding a dependency to the plugin
    • finally, updating the dependency in the containerd 1.6 and 1.7 release branches

So instead of that, I added the warning service as a dependency of the snapshot service, and emit the warning from there. It's certainly less elegant, but it was many fewer steps.

@samuelkarp samuelkarp mentioned this pull request Nov 29, 2023
Closed
3 tasks
@AkihiroSuda AkihiroSuda changed the title snapshots: emit deprecation warning for aufs [release/1.7] snapshots: emit deprecation warning for aufs Nov 29, 2023
@samuelkarp
Copy link
Member Author

samuelkarp commented Nov 29, 2023

/retest

@estesp estesp merged commit 181449d into containerd:release/1.7 Nov 30, 2023
@samuelkarp
Copy link
Member Author

samuelkarp commented Nov 30, 2023

/cherrypick release/1.6

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Nov 30, 2023

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

Applying: snapshots: emit deprecation warning for aufs
Using index info to reconstruct a base tree...
M	pkg/deprecation/deprecation.go
M	services/snapshots/service.go
Falling back to patching base and 3-way merge...
Auto-merging services/snapshots/service.go
CONFLICT (content): Merge conflict in services/snapshots/service.go
Auto-merging pkg/deprecation/deprecation.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 snapshots: emit deprecation warning for aufs
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.

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

Reviewers

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@ruiwen-zhao ruiwen-zhao Awaiting requested review from ruiwen-zhao

Assignees

No one assigned

Labels

size/M snapshotters

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@samuelkarp @k8s-infra-cherrypick-robot @estesp @AkihiroSuda @k8s-ci-robot