github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #137626 from pohly/dra-e2e-with-kubelet-version

Browse Source 
E2E framework: introduce WithKubeletMinVersion helper
This commit is contained in:
Kubernetes Prow Robot
2026-03-12 13:55:37 +05:30
committed by GitHub
parent efc8cc256a 9d9f4ddd88
commit 08b192cdd1
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/e2e/dra/dra.go
View File

@@ -432,7 +432,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
// https://github.com/kubernetes/kubernetes/issues/131513 was fixed in master for 1.34 and not backported,
// so this test only passes for kubelet >= 1.34.
f.It("blocks new pod after force-delete", f.WithLabel("KubeletMinVersion:1.34"), func(ctx context.Context) {
f.It("blocks new pod after force-delete", f.WithKubeletMinVersion("1.34"), func(ctx context.Context) {
// The problem with a force-deleted pod is that kubelet
// is not necessarily done yet with tearing down the
// pod at the time when the pod and its claim are
@@ -701,7 +701,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
})
// Seamless upgrade support was added in Kubernetes 1.33.
f.It("rolling update", f.WithLabel("KubeletMinVersion:1.33"), func(ctx context.Context) {
f.It("rolling update", f.WithKubeletMinVersion("1.33"), func(ctx context.Context) {
tCtx := f.TContext(ctx)
nodes := drautils.NewNodesNow(tCtx, 1, 1)
@@ -742,7 +742,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
})
// Seamless upgrade support was added in Kubernetes 1.33.
f.It("failed update", f.WithLabel("KubeletMinVersion:1.33"), func(ctx context.Context) {
f.It("failed update", f.WithKubeletMinVersion("1.33"), func(ctx context.Context) {
tCtx := f.TContext(ctx)
nodes := drautils.NewNodesNow(tCtx, 1, 1)
@@ -785,7 +785,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
})
// Seamless upgrade support was added in Kubernetes 1.33.
f.It("sequential update with pods replacing each other", f.WithLabel("KubeletMinVersion:1.33"), framework.WithSlow(), func(ctx context.Context) {
f.It("sequential update with pods replacing each other", f.WithKubeletMinVersion("1.33"), framework.WithSlow(), func(ctx context.Context) {
tCtx := f.TContext(ctx)
nodes := drautils.NewNodesNow(tCtx, 1, 1)
@@ -1110,7 +1110,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
// https://github.com/kubernetes/kubernetes/issues/135901 was fixed in master for Kubernetes 1.35 and not backported
// so this test only passes for kubelet >= 1.35.
f.It("requests an already allocated and a new claim for a pod", f.WithLabel("KubeletMinVersion:1.35"), func(ctx context.Context) {
f.It("requests an already allocated and a new claim for a pod", f.WithKubeletMinVersion("1.35"), func(ctx context.Context) {
// This test covers a situation when a pod references a mix of already-prepared and new claims.
tCtx := f.TContext(ctx)
@@ -1961,7 +1961,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
))
b := drautils.NewBuilder(f, driver)
f.It("must allow multiple allocations and consume capacity", f.WithLabel("KubeletMinVersion:1.34"), func(ctx context.Context) {
f.It("must allow multiple allocations and consume capacity", f.WithKubeletMinVersion("1.34"), func(ctx context.Context) {
tCtx := f.TContext(ctx)
// The first pod will use 4Gi of the device.
claim := b.ExternalClaim()
@@ -2237,7 +2237,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
}).WithTimeout(time.Minute).Should(gomega.BeTrueBecause("extended resource claim should be automatically deleted when pod %s", cleanupMessage))
}
framework.Context(f.WithFeatureGate(features.DRAExtendedResource), feature.DynamicResourceAllocation, f.WithLabel("KubeletMinVersion:1.36"), func() {
framework.Context(f.WithFeatureGate(features.DRAExtendedResource), feature.DynamicResourceAllocation, f.WithKubeletMinVersion("1.36"), func() {
nodes := drautils.NewNodes(f, 1, 1)
driver := drautils.NewDriver(f, nodes, drautils.NetworkResources(10, false))
b := drautils.NewBuilder(f, driver)
@@ -2674,7 +2674,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
})
})
framework.Context(f.WithFeatureGate(features.DRAExtendedResource), feature.DynamicResourceAllocation, f.WithLabel("KubeletMinVersion:1.36"), func() {
framework.Context(f.WithFeatureGate(features.DRAExtendedResource), feature.DynamicResourceAllocation, f.WithKubeletMinVersion("1.36"), func() {
nodes := drautils.NewNodes(f, 2, 2)
nodes.NumReservedNodes = 1
driver := drautils.NewDriver(f, nodes, drautils.NetworkResources(2, false))
@@ -3125,7 +3125,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
// If the v1beta1 gRPC API is disabled, then
// kubelet from 1.34 is required because that is
// when v1 was introduced.
args = append(args, f.WithLabel("KubeletMinVersion:1.34"))
args = append(args, f.WithKubeletMinVersion("1.34"))
}
framework.Context(args...)
}
@@ -3142,7 +3142,7 @@ var _ = framework.SIGDescribe("node")(framework.WithLabel("DRA"), func() {
driver := drautils.NewDriver(f, nodes, drautils.NetworkResources(10, false))
b := drautils.NewBuilder(f, driver)
f.It("should report device health with custom messages", f.WithLabel("KubeletMinVersion:1.36"), framework.WithFeatureGate(features.ResourceHealthStatusMessage), func(ctx context.Context) {
f.It("should report device health with custom messages", f.WithKubeletMinVersion("1.36"), framework.WithFeatureGate(features.ResourceHealthStatusMessage), func(ctx context.Context) {
claimName := "health-test-claim"
claim := b.ExternalClaim()
claim.Name = claimName

29
test/e2e/framework/ginkgowrapper.go
View File

@@ -292,6 +292,9 @@ func expandGinkgoArgs(offset ginkgo.Offset, text string, args []any) (string, []
ginkgoArgs = append(ginkgoArgs, ginkgo.Label("BetaOffByDefault"))
}
}
if arg.parts[0] == "KubeletMinVersion" {
ginkgoArgs = append(ginkgoArgs, ginkgo.ComponentSemVerConstraint("kubelet", ">="+arg.parts[1]))
}
switch fullLabel {
case "Serial":
ginkgoArgs = append(ginkgoArgs, ginkgo.Serial)
@@ -665,6 +668,32 @@ func withFlaky() interface{} {
return newLabel("Flaky")
}
// WithKubeletMinVersion specifies that a certain test or group tests needs
// a kubelet version >= the given version string. Specifying the minimum
// version as `<major>.<minor>` is sufficient. The patch version may be
// added, but is not required.
//
// This adds
// - a `[KubeletMinVersion:<version>]` tag in the text,
// - a `KubeletMinVersion:<version>` label,
// - and a Ginkgo semver constraint for the "kubelet" component.
//
// The easiest way to filter tests is via `ginkgo
// --sem-ver-filter="kubelet=1.35"` which filters out tests that need a newer
// kubelet.
func WithKubeletMinVersion(version string) interface{} {
return withKubeletMinVersion(version)
}
// WithKubeletMinVersion is a shorthand for the corresponding package function.
func (f *Framework) WithKubeletMinVersion(version string) interface{} {
return withKubeletMinVersion(version)
}
func withKubeletMinVersion(version string) interface{} {
return newLabel("KubeletMinVersion", version)
}
type label struct {
// parts get concatenated with ":" to build the full label.
parts []string