mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Merge pull request #103827 from mmiranda96/fix/demote-sysctl-conformance-test
Demote sysctl test from its conformance status
This commit is contained in:
commit
de8b873684
12
test/conformance/testdata/conformance.yaml
vendored
12
test/conformance/testdata/conformance.yaml
vendored
@ -2181,7 +2181,7 @@
|
|||||||
release: v1.15
|
release: v1.15
|
||||||
file: test/e2e/common/node/security_context.go
|
file: test/e2e/common/node/security_context.go
|
||||||
- testname: Sysctls, reject invalid sysctls
|
- testname: Sysctls, reject invalid sysctls
|
||||||
codename: '[sig-node] Sysctls [LinuxOnly] [NodeFeature:Sysctls] should reject invalid
|
codename: '[sig-node] Sysctls [LinuxOnly] [NodeConformance] should reject invalid
|
||||||
sysctls [MinimumKubeletVersion:1.21] [Conformance]'
|
sysctls [MinimumKubeletVersion:1.21] [Conformance]'
|
||||||
description: 'Pod is created with one valid and two invalid sysctls. Pod should
|
description: 'Pod is created with one valid and two invalid sysctls. Pod should
|
||||||
not apply invalid sysctls. [LinuxOnly]: This test is marked as LinuxOnly since
|
not apply invalid sysctls. [LinuxOnly]: This test is marked as LinuxOnly since
|
||||||
@ -2189,21 +2189,13 @@
|
|||||||
release: v1.21
|
release: v1.21
|
||||||
file: test/e2e/common/node/sysctl.go
|
file: test/e2e/common/node/sysctl.go
|
||||||
- testname: Sysctl, test sysctls
|
- testname: Sysctl, test sysctls
|
||||||
codename: '[sig-node] Sysctls [LinuxOnly] [NodeFeature:Sysctls] should support sysctls
|
codename: '[sig-node] Sysctls [LinuxOnly] [NodeConformance] should support sysctls
|
||||||
[MinimumKubeletVersion:1.21] [Conformance]'
|
[MinimumKubeletVersion:1.21] [Conformance]'
|
||||||
description: 'Pod is created with kernel.shm_rmid_forced sysctl. Kernel.shm_rmid_forced
|
description: 'Pod is created with kernel.shm_rmid_forced sysctl. Kernel.shm_rmid_forced
|
||||||
must be set to 1 [LinuxOnly]: This test is marked as LinuxOnly since Windows does
|
must be set to 1 [LinuxOnly]: This test is marked as LinuxOnly since Windows does
|
||||||
not support sysctls'
|
not support sysctls'
|
||||||
release: v1.21
|
release: v1.21
|
||||||
file: test/e2e/common/node/sysctl.go
|
file: test/e2e/common/node/sysctl.go
|
||||||
- testname: Sysctl, allow specified unsafe sysctls
|
|
||||||
codename: '[sig-node] Sysctls [LinuxOnly] [NodeFeature:Sysctls] should support unsafe
|
|
||||||
sysctls which are actually allowed [MinimumKubeletVersion:1.21] [Conformance]'
|
|
||||||
description: 'Pod is created with kernel.shm_rmid_forced. Should allow unsafe sysctls
|
|
||||||
that are specified. [LinuxOnly]: This test is marked as LinuxOnly since Windows
|
|
||||||
does not support sysctls'
|
|
||||||
release: v1.21
|
|
||||||
file: test/e2e/common/node/sysctl.go
|
|
||||||
- testname: Environment variables, expansion
|
- testname: Environment variables, expansion
|
||||||
codename: '[sig-node] Variable Expansion should allow composing env vars into new
|
codename: '[sig-node] Variable Expansion should allow composing env vars into new
|
||||||
env vars [NodeConformance] [Conformance]'
|
env vars [NodeConformance] [Conformance]'
|
||||||
|
@ -31,7 +31,7 @@ import (
|
|||||||
"github.com/onsi/gomega"
|
"github.com/onsi/gomega"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = SIGDescribe("Sysctls [LinuxOnly] [NodeFeature:Sysctls]", func() {
|
var _ = SIGDescribe("Sysctls [LinuxOnly] [NodeConformance]", func() {
|
||||||
|
|
||||||
ginkgo.BeforeEach(func() {
|
ginkgo.BeforeEach(func() {
|
||||||
// sysctl is not supported on Windows.
|
// sysctl is not supported on Windows.
|
||||||
@ -118,7 +118,7 @@ var _ = SIGDescribe("Sysctls [LinuxOnly] [NodeFeature:Sysctls]", func() {
|
|||||||
Description: Pod is created with kernel.shm_rmid_forced. Should allow unsafe sysctls that are specified.
|
Description: Pod is created with kernel.shm_rmid_forced. Should allow unsafe sysctls that are specified.
|
||||||
[LinuxOnly]: This test is marked as LinuxOnly since Windows does not support sysctls
|
[LinuxOnly]: This test is marked as LinuxOnly since Windows does not support sysctls
|
||||||
*/
|
*/
|
||||||
framework.ConformanceIt("should support unsafe sysctls which are actually allowed [MinimumKubeletVersion:1.21]", func() {
|
ginkgo.It("should support unsafe sysctls which are actually allowed [MinimumKubeletVersion:1.21]", func() {
|
||||||
pod := testPod()
|
pod := testPod()
|
||||||
pod.Spec.SecurityContext = &v1.PodSecurityContext{
|
pod.Spec.SecurityContext = &v1.PodSecurityContext{
|
||||||
Sysctls: []v1.Sysctl{
|
Sysctls: []v1.Sysctl{
|
||||||
|
Loading…
Reference in New Issue
Block a user