upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-08 16:30:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134918 from mariafromano-25/cleanup-sidecar-feature

Browse source 
SidecarContainer feature to Node Conformance
This commit is contained in:
Kubernetes Prow Robot 2025-10-28 15:22:08 -07:00 committed by GitHub
commit 036e624317
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/e2e/common/node/container_probe.go
View file

@ -36,7 +36,6 @@ import (
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/test/e2e/feature"
"k8s.io/kubernetes/test/e2e/framework"
e2eevents "k8s.io/kubernetes/test/e2e/framework/events"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@ -730,7 +729,7 @@ done
})
})
var _ = SIGDescribe(feature.SidecarContainers, framework.WithFeatureGate(features.SidecarContainers), "Probing restartable init container", func() {
var _ = SIGDescribe(framework.WithNodeConformance(), framework.WithFeatureGate(features.SidecarContainers), "Probing restartable init container", func() {
f := framework.NewDefaultFramework("container-probe")
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline
var podClient *e2epod.PodClient

2
test/e2e/common/node/lifecycle_hook.go
View file

@ -258,7 +258,7 @@ var _ = SIGDescribe("Container Lifecycle Hook", func() {
})
})
var _ = SIGDescribe(feature.SidecarContainers, framework.WithFeatureGate(features.SidecarContainers), "Restartable Init Container Lifecycle Hook", func() {
var _ = SIGDescribe(framework.WithNodeConformance(), framework.WithFeatureGate(features.SidecarContainers), "Restartable Init Container Lifecycle Hook", func() {
f := framework.NewDefaultFramework("restartable-init-container-lifecycle-hook")
// FIXME: This test is being run in the privileged mode because of https://github.com/kubernetes/kubernetes/issues/133091
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged

4
test/e2e/feature/feature.go
View file

@ -411,10 +411,6 @@ var (
// and the networking.k8s.io/v1alpha1 API.
ServiceCIDRs = framework.WithFeature(framework.ValidFeatures.Add("ServiceCIDRs"))
// Owner: sig-node
// Sidecar KEP-753
SidecarContainers = framework.WithFeature(framework.ValidFeatures.Add("SidecarContainers"))
// TODO: document the feature (owning SIG, when to use this feature for a test)
StackdriverAcceleratorMonitoring = framework.WithFeature(framework.ValidFeatures.Add("StackdriverAcceleratorMonitoring"))

5
test/e2e_node/container_lifecycle_test.go
View file

@ -29,7 +29,6 @@ import (
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
admissionapi "k8s.io/pod-security-admission/api"
"k8s.io/kubernetes/test/e2e/feature"
"k8s.io/kubernetes/test/e2e/framework"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
imageutils "k8s.io/kubernetes/test/utils/image"
@ -2121,7 +2120,7 @@ var _ = SIGDescribe(framework.WithSerial(), "Containers Lifecycle", func() {
})
})
var _ = SIGDescribe(feature.SidecarContainers, "Containers Lifecycle", func() {
var _ = SIGDescribe(framework.WithNodeConformance(), "Containers Lifecycle", func() {
f := framework.NewDefaultFramework("containers-lifecycle-test")
addAfterEachForCleaningUpPods(f)
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
@ -6016,7 +6015,7 @@ fi`},
})
var _ = SIGDescribe(feature.SidecarContainers, framework.WithSerial(), "Containers Lifecycle", func() {
var _ = SIGDescribe(framework.WithNodeConformance(), framework.WithSerial(), "Containers Lifecycle", func() {
f := framework.NewDefaultFramework("containers-lifecycle-test-serial")
addAfterEachForCleaningUpPods(f)
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged

2
test/e2e_node/cpu_manager_test.go
View file

@ -1859,7 +1859,7 @@ var _ = SIGDescribe("CPU Manager", ginkgo.Ordered, ginkgo.ContinueOnFailure, fra
})
})
f.Context("When checking the sidecar containers", feature.SidecarContainers, func() {
f.Context("When checking the sidecar containers", framework.WithNodeConformance(), func() {
ginkgo.BeforeEach(func(ctx context.Context) {
reservedCPUs = cpuset.New(0)
})

2
test/e2e_node/device_plugin_test.go
View file

@ -692,7 +692,7 @@ func testDevicePlugin(f *framework.Framework, pluginSockDir string) {
}
})
f.It("Can schedule a pod with a restartable init container", feature.SidecarContainers, func(ctx context.Context) {
f.It("Can schedule a pod with a restartable init container", framework.WithNodeConformance(), func(ctx context.Context) {
podRECMD := "devs=$(ls /tmp/ | egrep '^Dev-[0-9]+$') && echo stub devices: $devs && sleep %s"
sleepOneSecond := "1s"
rl := v1.ResourceList{v1.ResourceName(SampleDeviceResourceName): *resource.NewQuantity(1, resource.DecimalSI)}

4
test/e2e_node/podresources_test.go
View file

@ -1113,7 +1113,7 @@ var _ = SIGDescribe("POD Resources API", framework.WithSerial(), feature.PodReso
podresourcesGetAllocatableResourcesTests(ctx, cli, sd, onlineCPUs, reservedSystemCPUs)
})
framework.It("should return the expected responses", feature.SidecarContainers, func(ctx context.Context) {
framework.It("should return the expected responses", framework.WithNodeConformance(), func(ctx context.Context) {
onlineCPUs, err := getOnlineCPUs()
framework.ExpectNoError(err, "getOnlineCPUs() failed err: %v", err)
@ -1259,7 +1259,7 @@ var _ = SIGDescribe("POD Resources API", framework.WithSerial(), feature.PodReso
podresourcesGetTests(ctx, f, cli, false)
})
framework.It("should return the expected responses", feature.SidecarContainers, func(ctx context.Context) {
framework.It("should return the expected responses", framework.WithNodeConformance(), func(ctx context.Context) {
onlineCPUs, err := getOnlineCPUs()
framework.ExpectNoError(err, "getOnlineCPUs() failed err: %v", err)