Skip to content

Commit 43e52f7

Browse files
committed
pkg/specgen/generate/kube: nolint and FIXMEs for seccomp deprecations
Ref: #27501 Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent 9b6ec44 commit 43e52f7

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

pkg/specgen/generate/kube/seccomp.go

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ func InitializeSeccompPaths(annotations map[string]string, profileRoot string) (
3737
for annKeyValue, seccomp := range annotations {
3838
// check if it is prefaced with container.seccomp.security.alpha.kubernetes.io/
3939
prefixAndCtr := strings.Split(annKeyValue, "/")
40-
if prefixAndCtr[0]+"/" != v1.SeccompContainerAnnotationKeyPrefix {
40+
// FIXME: Rework for deprecation removal https://github.com/containers/podman/issues/27501
41+
if prefixAndCtr[0]+"/" != v1.SeccompContainerAnnotationKeyPrefix { //nolint:staticcheck
4142
continue
4243
} else if len(prefixAndCtr) != 2 {
4344
// this could be caused by a user inputting either of
@@ -52,8 +53,8 @@ func InitializeSeccompPaths(annotations map[string]string, profileRoot string) (
5253
}
5354
seccompPaths.containerPaths[prefixAndCtr[1]] = path
5455
}
55-
56-
podSeccomp, ok := annotations[v1.SeccompPodAnnotationKey]
56+
// FIXME: Rework for deprecation removal https://github.com/containers/podman/issues/27501
57+
podSeccomp, ok := annotations[v1.SeccompPodAnnotationKey] //nolint:staticcheck
5758
if ok {
5859
seccompPaths.podPath, err = verifySeccompPath(podSeccomp, profileRoot)
5960
} else {
@@ -70,9 +71,11 @@ func InitializeSeccompPaths(annotations map[string]string, profileRoot string) (
7071
// the available options are parsed as defined in https://kubernetes.io/docs/concepts/policy/pod-security-policy/#seccomp
7172
func verifySeccompPath(path string, profileRoot string) (string, error) {
7273
switch path {
73-
case v1.DeprecatedSeccompProfileDockerDefault:
74+
// FIXME: Rework for deprecation removal https://github.com/containers/podman/issues/27501
75+
case v1.DeprecatedSeccompProfileDockerDefault: //nolint:staticcheck
7476
fallthrough
75-
case v1.SeccompProfileRuntimeDefault:
77+
// FIXME: Rework for deprecation removal https://github.com/containers/podman/issues/27501
78+
case v1.SeccompProfileRuntimeDefault: //nolint:staticcheck
7679
return libpod.DefaultSeccompPath()
7780
case "unconfined":
7881
return path, nil

0 commit comments

Comments
 (0)