Skip to content

Conversation

Luap99
Copy link
Member

@Luap99 Luap99 commented Sep 8, 2025

see commits

Does this PR introduce a user-facing change?

Update podman to go 1.24

@openshift-ci openshift-ci bot added release-note approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 8, 2025
@github-actions github-actions bot added machine kind/api-change Change to remote API; merits scrutiny labels Sep 8, 2025
Comment on lines +233 to +234
CheckpointedTime time.Time `json:"checkpointedTime"`
RestoredTime time.Time `json:"restoredTime"`
Copy link
Member Author

Choose a reason for hiding this comment

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

Note these changes where done by modernize autoamtically.AFAICT this never worked with moitempty, with go 1.24 we could use omitzero if we want that, https://go.dev/doc/go1.24#encodingjsonpkgencodingjson

@Luap99
Copy link
Member Author

Luap99 commented Sep 8, 2025

Looks CI is not yet ready for this, we need to update the CI images here but there are some problem with it #26874 (comment)

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

LGTM otherwise.

Signed-off-by: Paul Holzinger <[email protected]>
Using golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize

+ some manual cleanup in libpod/lock/shm/shm_lock_test.go as it
  generated an unused variable
+ restored one removed comment

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>
t.Chdir() is not an exact replacement here

Signed-off-by: Paul Holzinger <[email protected]>
staticcheck claims the var value is not used but we use it for the
mount.

Signed-off-by: Paul Holzinger <[email protected]>
They require go 1.24 and now that we bumped it we can update them. Seem
easier to do it her eonce than having to wait for renovate to update
each individually.

Signed-off-by: Paul Holzinger <[email protected]>
@@ -80,8 +80,9 @@ func (r *ConmonOCIRuntime) createRootlessContainer(ctr *Container, restoreOption
var parentMount string
for dir := filepath.Dir(rootPath); ; dir = filepath.Dir(dir) {
if m, found := byMountpoint[dir]; found {
//nolint:staticcheck // false positive?! it claims the value of parentMount is not used but we use it below for the mount
Copy link
Collaborator

Choose a reason for hiding this comment

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

This worries me but I agree it looks like a false positive.

Copy link
Member Author

Choose a reason for hiding this comment

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

I guess worth to create a small reproducer and report a bug for that one

Copy link
Collaborator

@mtrmac mtrmac left a comment

Choose a reason for hiding this comment

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

Code changes LGTM, I didn’t review contents of the dependency updates.

@mtrmac mtrmac added the bloat_approved Approve a PR in which binary file size grows by over 50k label Sep 10, 2025
@Luap99
Copy link
Member Author

Luap99 commented Sep 10, 2025

@containers/podman-maintainers PTAL

@mtrmac
Copy link
Collaborator

mtrmac commented Sep 10, 2025

I didn’t review contents of the dependency updates.

Now skimmed that as well.

Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2025
Copy link
Contributor

openshift-ci bot commented Sep 10, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, Luap99

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@openshift-merge-bot openshift-merge-bot bot merged commit 9f7c6c3 into containers:main Sep 10, 2025
89 checks passed
@Luap99 Luap99 deleted the go-1.24 branch September 10, 2025 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bloat_approved Approve a PR in which binary file size grows by over 50k kind/api-change Change to remote API; merits scrutiny lgtm Indicates that a PR is ready to be merged. machine release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants