*: add platform_runtime_paths to RuntimeHandler #7180

sohankunkerkar · 2023-07-28T01:23:51Z

This helps to track the runtime paths for different platforms.

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

add platform_runtime_paths option to the runtime handler structure, which allows admins to define specific runtime paths based on different platforms.

openshift-ci · 2023-07-28T01:23:57Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

codecov · 2023-07-28T15:25:30Z

Codecov Report

Merging #7180 (5022d95) into main (cd9b050) will decrease coverage by 0.01%.
Report is 20 commits behind head on main.
The diff coverage is 47.22%.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #7180      +/-   ##
==========================================
- Coverage   49.22%   49.22%   -0.01%     
==========================================
  Files         136      136              
  Lines       15487    15517      +30     
==========================================
+ Hits         7624     7638      +14     
- Misses       6961     6974      +13     
- Partials      902      905       +3

internal/oci/runtime_oci.go

test/image.bats

haircommander · 2023-08-01T19:26:25Z

internal/oci/container.go

 }
+
+// SetArch sets the architecture of the image for a container.
+func (c *Container) SetArch(arch string) {


TODO: we'll need to make sure this is called in server restore code

server/container_create_linux.go

sohankunkerkar · 2023-08-04T16:11:05Z

/retest

sohankunkerkar · 2023-08-04T16:42:22Z

/retest

test/image.bats

sohankunkerkar · 2023-08-07T21:05:28Z

/test ci-rhel-critest

test/image.bats

internal/lib/container_server.go

server/container_create_linux.go

haircommander · 2023-08-08T20:19:30Z

/approve

LGTM, well done here @sohankunkerkar

@cri-o/cri-o-maintainers PTAL

server/container_create_linux.go

This helps to track the runtime paths for different platforms. Signed-off-by: Sohan Kunkerkar <[email protected]>

Signed-off-by: Sohan Kunkerkar <[email protected]>

mrunalp

/lgtm

openshift-ci · 2023-08-08T22:35:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp, sohankunkerkar

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [haircommander,mrunalp]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

sohankunkerkar · 2023-08-08T23:54:25Z

/cherry-pick release-1.27

openshift-cherrypick-robot · 2023-08-08T23:54:27Z

@sohankunkerkar: once the present PR merges, I will cherry-pick it on top of release-1.27 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.27

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.

openshift-cherrypick-robot · 2023-08-09T00:03:12Z

@sohankunkerkar: #7180 failed to apply on top of branch "release-1.27":

Applying: *: add platform_runtime_paths to RuntimeHandler
Using index info to reconstruct a base tree...
M	docs/crio.conf.5.md
M	internal/factory/container/container.go
M	internal/factory/container/container_test.go
M	internal/lib/container_server.go
M	internal/oci/oci.go
M	internal/oci/runtime_oci.go
M	pkg/annotations/annotations.go
M	pkg/config/config.go
M	pkg/config/template.go
M	server/container_create_linux.go
Falling back to patching base and 3-way merge...
Auto-merging server/container_create_linux.go
CONFLICT (content): Merge conflict in server/container_create_linux.go
Auto-merging pkg/config/template.go
Auto-merging pkg/config/config.go
Auto-merging pkg/annotations/annotations.go
Auto-merging internal/oci/runtime_oci.go
CONFLICT (content): Merge conflict in internal/oci/runtime_oci.go
Auto-merging internal/oci/oci.go
Auto-merging internal/lib/container_server.go
Auto-merging internal/factory/container/container_test.go
CONFLICT (content): Merge conflict in internal/factory/container/container_test.go
Auto-merging internal/factory/container/container.go
CONFLICT (content): Merge conflict in internal/factory/container/container.go
Auto-merging docs/crio.conf.5.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 *: add platform_runtime_paths to RuntimeHandler
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:

/cherry-pick release-1.27

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.

openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jul 28, 2023

openshift-ci bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/feature Categorizes issue or PR as related to a new feature. labels Jul 28, 2023

sohankunkerkar force-pushed the crun-wasm branch 6 times, most recently from 46be555 to b6ac497 Compare July 28, 2023 15:14

kolyshkin reviewed Jul 28, 2023

View reviewed changes

internal/oci/runtime_oci.go Outdated Show resolved Hide resolved

kolyshkin reviewed Jul 28, 2023

View reviewed changes

internal/oci/runtime_oci.go Outdated Show resolved Hide resolved

sohankunkerkar force-pushed the crun-wasm branch 8 times, most recently from 1f16e4f to 56ecbfa Compare August 1, 2023 01:21

sohankunkerkar commented Aug 1, 2023

View reviewed changes

test/image.bats Outdated Show resolved Hide resolved

sohankunkerkar force-pushed the crun-wasm branch from 56ecbfa to bc57d09 Compare August 1, 2023 15:26

haircommander reviewed Aug 1, 2023

View reviewed changes

server/container_create_linux.go Outdated Show resolved Hide resolved

sohankunkerkar force-pushed the crun-wasm branch 3 times, most recently from 6f01263 to 4ac4727 Compare August 1, 2023 23:42

sohankunkerkar marked this pull request as ready for review August 1, 2023 23:45

sohankunkerkar force-pushed the crun-wasm branch 2 times, most recently from 61b7eaf to 1503f6b Compare August 4, 2023 15:13

haircommander reviewed Aug 7, 2023

View reviewed changes

test/image.bats Outdated Show resolved Hide resolved

sohankunkerkar force-pushed the crun-wasm branch from 1503f6b to e0fd5a8 Compare August 7, 2023 20:37

haircommander reviewed Aug 7, 2023

View reviewed changes

test/image.bats Outdated Show resolved Hide resolved

haircommander added this to the 1.28 milestone Aug 8, 2023

sohankunkerkar force-pushed the crun-wasm branch from e0fd5a8 to c18571c Compare August 8, 2023 18:41

mrunalp reviewed Aug 8, 2023

View reviewed changes

test/image.bats Show resolved Hide resolved

haircommander reviewed Aug 8, 2023

View reviewed changes

internal/lib/container_server.go Show resolved Hide resolved

haircommander reviewed Aug 8, 2023

View reviewed changes

server/container_create_linux.go Outdated Show resolved Hide resolved

sohankunkerkar force-pushed the crun-wasm branch from c18571c to e5b5d14 Compare August 8, 2023 20:10

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 8, 2023

sohankunkerkar linked an issue Aug 8, 2023 that may be closed by this pull request

OCI image annotations are not propagated to OCI runtime (crun) #6906

Closed

mrunalp reviewed Aug 8, 2023

View reviewed changes

server/container_create_linux.go Outdated Show resolved Hide resolved

sohankunkerkar added 2 commits August 8, 2023 17:39

*: add platform_runtime_paths to RuntimeHandler

05ef7a1

This helps to track the runtime paths for different platforms. Signed-off-by: Sohan Kunkerkar <[email protected]>

test/image.bats: add test for checking crun-wasm workflow

5022d95

Signed-off-by: Sohan Kunkerkar <[email protected]>

sohankunkerkar force-pushed the crun-wasm branch from e5b5d14 to 5022d95 Compare August 8, 2023 21:58

mrunalp approved these changes Aug 8, 2023

View reviewed changes

openshift-ci bot assigned mrunalp Aug 8, 2023

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 8, 2023

openshift-merge-robot merged commit 0f3769d into cri-o:main Aug 9, 2023

sohankunkerkar mentioned this pull request Aug 9, 2023

[1.27] add platform_runtime_paths to RuntimeHandler #7197

Merged

*: add platform_runtime_paths to RuntimeHandler #7180

*: add platform_runtime_paths to RuntimeHandler #7180

Uh oh!

Conversation

sohankunkerkar commented Jul 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Jul 28, 2023

Uh oh!

codecov bot commented Jul 28, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

haircommander Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sohankunkerkar commented Aug 4, 2023

Uh oh!

sohankunkerkar commented Aug 4, 2023

Uh oh!

Uh oh!

sohankunkerkar commented Aug 7, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

haircommander commented Aug 8, 2023

Uh oh!

Uh oh!

mrunalp left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Aug 8, 2023

Uh oh!

sohankunkerkar commented Aug 8, 2023

Uh oh!

openshift-cherrypick-robot commented Aug 8, 2023

Uh oh!

openshift-cherrypick-robot commented Aug 9, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

sohankunkerkar commented Jul 28, 2023 •

edited

Loading

codecov bot commented Jul 28, 2023 •

edited

Loading