golangci-lint bump and deprecation cleanups #27473

lsm5 · 2025-11-07T20:19:29Z

Checklist

Ensure you have completed the following checklist for your pull request to be reviewed:

Certify you wrote the patch or otherwise have the right to pass it on as an open-source patch by signing all
commits. (git commit -s). (If needed, use git commit -s --amend). The author email must match
the sign-off email address. See CONTRIBUTING.md
for more information.
Referenced issues using Fixes: #00000 in commit message (if applicable)
Tests have been added/updated (or no tests are needed)
Documentation has been updated (or no documentation changes are needed)
All commits pass make validatepr (format/lint checks)
Release note entered in the section below (or None if no user-facing changes)

Does this PR introduce a user-facing change?

None

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Obsoletes: containers#27407 Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

openshift-ci · 2025-11-07T20:19:37Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5

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:

~~OWNERS~~ [lsm5]

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

mheon · 2025-11-09T17:19:51Z

Sure, LGTM

lsm5 · 2025-11-10T13:56:18Z

This exposed more deprecations. Working through those now.

lsm5 · 2025-11-10T17:11:00Z

@containers/podman-maintainers PTAL.

mtrmac

This is a drive-by, I didn’t actually look at any of the removed fields and I have, currently, no opinion on whether removing the uses is or isn’t correct.

mtrmac · 2025-11-10T17:14:14Z

pkg/specgen/generate/kube/seccomp.go

 			// check if it is prefaced with container.seccomp.security.alpha.kubernetes.io/
 			prefixAndCtr := strings.Split(annKeyValue, "/")
-			if prefixAndCtr[0]+"/" != v1.SeccompContainerAnnotationKeyPrefix {
+			if prefixAndCtr[0]+"/" != "container.seccomp.security.alpha.kubernetes.io/" {


These kinds of changes are making things harder to maintain.

If the code needs to stay (I have absolutely no expertise here and no opinion on that), it’s better to use the named constants, and silence the linter with an explanation why the code still needs to stay.

This continues to use a deprecated feature, but it only makes it impossible to find references in any future analysis.

mtrmac · 2025-11-10T17:16:07Z

libpod/container_internal.go

 	if c.config.Rootfs != "" {
-		size, err := util.SizeOfPath(c.config.Rootfs)
-		return int64(size), err
+		size, err := directory.Size(c.config.Rootfs)


Isn’t this the last user? The function can be removed, then.

Luap99 · 2025-11-10T17:18:14Z

pkg/specgen/generate/kube/seccomp.go

 			// check if it is prefaced with container.seccomp.security.alpha.kubernetes.io/
 			prefixAndCtr := strings.Split(annKeyValue, "/")
-			if prefixAndCtr[0]+"/" != v1.SeccompContainerAnnotationKeyPrefix {
+			if prefixAndCtr[0]+"/" != "container.seccomp.security.alpha.kubernetes.io/" {


That is just objectivity worse, what do we gain by inline this and keep the deprecated variable as well? If these annotations are no longer in use can we rework the seccomp logic to no longer use them instead?

same in the other cases here

Luap99 · 2025-11-10T17:20:11Z

pkg/specgen/generate/namespaces.go

 		// if no network was specified use add the default
 		if len(s.Networks) == 0 {
-			// backwards config still allow the old cni networks list and convert to new format
-			if len(s.CNINetworks) > 0 {


logic wise it would be nice to do this and the other cni removal in the same commit instead of splitting the commits per file which doesn't seem to gain us anything here.

This seems safe since we drop cni support but if we do this then also directly remove the CNINetworks field from the struct definition. IF we own the code no point in having unused fields.

Luap99 · 2025-11-10T17:20:36Z

pkg/specgen/podspecgen.go

 	// Optional.
+	//
 	// Deprecated: as of podman 4.0 use "Networks" instead.
 	CNINetworks []string `json:"cni_networks,omitempty"`


if we remove CNI support just remove the fields completely

Luap99 · 2025-11-10T17:21:22Z

pkg/util/utils.go

+//
 // Deprecated: use github.com/containers/storage/pkg/directory.Size() instead.
 func SizeOfPath(path string) (uint64, error) {


IF you remove the one caller just remove this function from the code

Luap99 · 2025-11-10T17:22:20Z

pkg/checkpoint/checkpoint_restore.go

 				ctrConfig.Networks[net] = opts
 			}
-			ctrConfig.StaticIP = nil
-			ctrConfig.StaticMAC = nil


there are old fields, I don't think they have been in use since sqlite so they also should be removed from the struct

lsm5 · 2025-11-11T01:24:17Z

@Luap99 I'm not familiar with the seccomp stuff and I'd prefer not to take too long on this PR, so would you be ok if I reverted the seccomp stuff along with nolint and FIXME notes added? The other comments seems manageable.

If not, maybe I'll just close this and/or let someone else pick up the golangci version update.

Luap99 · 2025-11-11T10:46:20Z

I am totally fine with nolint comments on the seccomp things, I also have no idea what the expected k8s behaviours are there. Maybe file an issue for that then so we don't loose track.

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

- Remove deprecated util.SizeOfPath Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Ref: containers#27501 Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 added 2 commits November 7, 2025 15:17

Fix deprecation notice to make gocritic happy.

ed33e84

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

bump golangcilint to 2.6.0

a28515b

Obsoletes: containers#27407 Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 added the No New Tests Allow PR to proceed without adding regression tests label Nov 7, 2025

openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none labels Nov 7, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2025

lsm5 changed the title ~~Deprecation notice update~~ golangci-lint bump and deprecation cleanups Nov 10, 2025

lsm5 marked this pull request as ready for review November 10, 2025 17:10

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 10, 2025

mtrmac reviewed Nov 10, 2025

View reviewed changes

Luap99 reviewed Nov 10, 2025

View reviewed changes

lsm5 mentioned this pull request Nov 11, 2025

seccomp deprecations noticed with golangci-lint 2.6.0 #27501

Open

lsm5 added 4 commits November 11, 2025 09:31

pkg/specgen: Remove deprecated CNINetworks

9cfe6d3

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

Remove deprecated fields ctrConfig.[StaticIP,StaticMAC]

0f7f74c

Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

libpod/container_internal.go: util.SizeOfPath -> directory.Size

9b6ec44

- Remove deprecated util.SizeOfPath Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

pkg/specgen/generate/kube: nolint and FIXMEs for seccomp deprecations

43e52f7

Ref: containers#27501 Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>

lsm5 force-pushed the deprecation-notice-update branch from 4ea376c to 43e52f7 Compare November 11, 2025 15:15

golangci-lint bump and deprecation cleanups #27473

Are you sure you want to change the base?

golangci-lint bump and deprecation cleanups #27473

Conversation

lsm5 commented Nov 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Nov 7, 2025

Uh oh!

mheon commented Nov 9, 2025

Uh oh!

lsm5 commented Nov 10, 2025

Uh oh!

lsm5 commented Nov 10, 2025

Uh oh!

mtrmac left a comment

Choose a reason for hiding this comment

Uh oh!

mtrmac Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

mtrmac Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

Luap99 Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

Luap99 Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

Luap99 Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

Luap99 Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

Luap99 Nov 10, 2025

Choose a reason for hiding this comment

Uh oh!

lsm5 commented Nov 11, 2025

Uh oh!

Luap99 commented Nov 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

lsm5 commented Nov 7, 2025 •

edited

Loading