Skip to content
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.

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

[release/1.7] tasks: emit warning for v1 runtime and runc v1 runtime #9450

Merged

Conversation

samuelkarp
Copy link
Member

Part of #9312

$ sudo bin/ctr deprecations list
ID                                           LAST OCCURRENCE                   MESSAGE    
io.containerd.deprecation/runtime-v1         2023-12-01T07:26:57.614014991Z    The `io.containerd.runtime.v1.linux` runtime is deprecated since containerd v1.4 and removed in containerd v2.0. Use the `io.containerd.runc.v2` runtime instead.
io.containerd.deprecation/runtime-runc-v1    2023-12-01T07:27:34.505898489Z    The `io.containerd.runc.v1` runtime is deprecated since containerd v1.4 and removed in containerd v2.0. Use the `io.containerd.runc.v2` runtime instead.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
@samuelkarp samuelkarp added the area/runtime Runtime label Dec 1, 2023
@samuelkarp samuelkarp mentioned this pull request Dec 1, 2023
3 tasks
@samuelkarp samuelkarp changed the title tasks: emit warning for v1 runtime tasks: emit warning for v1 runtime and runc v1 runtime Dec 1, 2023
Signed-off-by: Samuel Karp <samuelkarp@google.com>
@samuelkarp samuelkarp force-pushed the deprecation-warning-runtime-1.7 branch from 083f7a6 to f471bb2 Compare December 1, 2023 07:33
@fuweid fuweid changed the title tasks: emit warning for v1 runtime and runc v1 runtime [release/1.7] tasks: emit warning for v1 runtime and runc v1 runtime Dec 1, 2023
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

@@ -255,6 +261,16 @@ func (l *local) Create(ctx context.Context, r *api.CreateTaskRequest, _ ...grpc.
}, nil
}

func (l *local) emitRuntimeWarning(ctx context.Context, runtime string) {
switch runtime {
case plugin.RuntimeLinuxV1:
Copy link
Member

Choose a reason for hiding this comment

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

so we are only emitting warnings for io.containerd.runtime.v1.linux. Are we not deprecating other v1 runtimes like io.containerd.runtime.v1.windows?

Copy link
Member Author

Choose a reason for hiding this comment

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

That's a good question. Does io.containerd.runtime.v1.windows exist? I see it in a couple places in the client code (1, 2, 3) but can't find the actual plugin implementing it. @dcantah do you know?

Copy link
Member

@laurazard laurazard left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit a477e22 into containerd:release/1.7 Dec 4, 2023
49 checks passed
@samuelkarp
Copy link
Member Author

/cherrypick release/1.6

@samuelkarp samuelkarp added the cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch label Dec 4, 2023
@k8s-infra-cherrypick-robot

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

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

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/runtime Runtime cherry-pick/1.6.x Change to be cherry picked to release/1.6 branch ok-to-test size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants