Merge pull request kubernetes#124835 from dims/switch-hard-error-to-a-warning-forkernel-version-check

k8s-ci-robot · web-flow · commit a07d3c49b301 · 2024-05-12T19:31:45.000-07:00
Switch hard error to a WARNING for kernel version check
diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go
@@ -139,9 +139,8 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) {
 				features.UserNamespacesSupport, err)
 		}
 		if kernelVersion != nil && !kernelVersion.AtLeast(version.MustParseGeneric(utilkernel.UserNamespacesSupportKernelVersion)) {
-			return 0, 0, fmt.Errorf(
-				"the kernel version (%s) is incompatible with the %s feature gate, which needs %s as a minimum kernel version",
-				kernelVersion, features.UserNamespacesSupport, utilkernel.UserNamespacesSupportKernelVersion)
+			klog.InfoS("WARNING: the kernel version is incompatible with the feature gate, which needs as a minimum kernel version",
+				"kernelVersion", kernelVersion, "feature", features.UserNamespacesSupport, "minKernelVersion", utilkernel.UserNamespacesSupportKernelVersion)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -139,9 +139,8 @@ func (kl *Kubelet) getKubeletMappings() (uint32, uint32, error) {`
`139`	`139`	`features.UserNamespacesSupport, err)`
`140`	`140`	`}`
`141`	`141`	`if kernelVersion != nil && !kernelVersion.AtLeast(version.MustParseGeneric(utilkernel.UserNamespacesSupportKernelVersion)) {`
`142`		`- return 0, 0, fmt.Errorf(`
`143`		`- "the kernel version (%s) is incompatible with the %s feature gate, which needs %s as a minimum kernel version",`
`144`		`- kernelVersion, features.UserNamespacesSupport, utilkernel.UserNamespacesSupportKernelVersion)`
	`142`	`+ klog.InfoS("WARNING: the kernel version is incompatible with the feature gate, which needs as a minimum kernel version",`
	`143`	`+ "kernelVersion", kernelVersion, "feature", features.UserNamespacesSupport, "minKernelVersion", utilkernel.UserNamespacesSupportKernelVersion)`
`145`	`144`	`}`
`146`	`145`	`}`
`147`	`146`