Skip to content

[EXPERIMENT][DONOTMERGE] run dra e2e tests #2273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openshift-hack/cmd/k8s-tests-ext/disabled_tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func filterOutDisabledSpecs(specs et.ExtensionTestSpecs) et.ExtensionTestSpecs {
"[FeatureGate:SELinuxMount]",
"[Feature:UserNamespacesPodSecurityStandards]",
"[Feature:UserNamespacesSupport]", // disabled Beta
"[Feature:DynamicResourceAllocation]",
// "[Feature:DynamicResourceAllocation]",
"[Feature:VolumeAttributesClass]", // disabled Beta
"[sig-cli] Kubectl client Kubectl prune with applyset should apply and prune objects", // Alpha feature since k8s 1.27
// 4.19
Expand Down
76 changes: 38 additions & 38 deletions openshift-hack/e2e/annotate/generated/zz_generated.annotations.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions openshift-hack/e2e/annotate/rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ var (
`\[FeatureGate:SELinuxMount\]`,
`\[Feature:UserNamespacesPodSecurityStandards\]`,
`\[Feature:UserNamespacesSupport\]`, // disabled Beta
`\[Feature:DynamicResourceAllocation\]`,
`\[Feature:VolumeAttributesClass\]`, // disabled Beta
// `\[Feature:DynamicResourceAllocation\]`,
`\[Feature:VolumeAttributesClass\]`, // disabled Beta
`\[sig-cli\] Kubectl client Kubectl prune with applyset should apply and prune objects`, // Alpha feature since k8s 1.27
// 4.19
`\[Feature:PodLevelResources\]`,
Expand Down
5 changes: 3 additions & 2 deletions pkg/controlplane/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ var (
flowcontrolv1beta2.SchemeGroupVersion,
flowcontrolv1beta3.SchemeGroupVersion,
networkingapiv1beta1.SchemeGroupVersion,
resourcev1beta1.SchemeGroupVersion,
// resourcev1beta1.SchemeGroupVersion,
}

// alphaAPIGroupVersionsDisabledByDefault holds the alpha APIs we have. They are always disabled by default.
Expand All @@ -472,7 +472,7 @@ var (
authenticationv1alpha1.SchemeGroupVersion,
apiserverinternalv1alpha1.SchemeGroupVersion,
coordinationv1alpha2.SchemeGroupVersion,
resourcev1alpha3.SchemeGroupVersion,
// resourcev1alpha3.SchemeGroupVersion,
certificatesv1alpha1.SchemeGroupVersion,
networkingapiv1alpha1.SchemeGroupVersion,
storageapiv1alpha1.SchemeGroupVersion,
Expand All @@ -485,6 +485,7 @@ func DefaultAPIResourceConfigSource() *serverstorage.ResourceConfig {
ret := serverstorage.NewResourceConfig()
// NOTE: GroupVersions listed here will be enabled by default. Don't put alpha or beta versions in the list.
ret.EnableVersions(stableAPIGroupVersionsEnabledByDefault...)
ret.EnableVersions(resourcev1alpha3.SchemeGroupVersion, resourcev1beta1.SchemeGroupVersion)

// disable alpha and beta versions explicitly so we have a full list of what's possible to serve
ret.DisableVersions(betaAPIGroupVersionsDisabledByDefault...)
Expand Down
4 changes: 2 additions & 2 deletions pkg/features/versioned_kube_features.go
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,11 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate

DynamicResourceAllocation: {
{Version: version.MustParse("1.26"), Default: false, PreRelease: featuregate.Alpha},
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Beta},
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Beta},
},

DRAResourceClaimDeviceStatus: {
{Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha},
{Version: version.MustParse("1.32"), Default: true, PreRelease: featuregate.Alpha},
},

KubeletCrashLoopBackOffMax: {
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/testing-manifests/dra/dra-test-driver-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ spec:

containers:
- name: registrar
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
image: registry.k8s.io/sig-storage/hostpathplugin:v1.15.0
args:
- "--v=5"
- "--endpoint=/plugins_registry/dra-test-driver-reg.sock"
Expand All @@ -57,7 +57,7 @@ spec:
name: registration-dir

- name: plugin
image: registry.k8s.io/sig-storage/hostpathplugin:v1.7.3
image: registry.k8s.io/sig-storage/hostpathplugin:v1.15.0
args:
- "--v=5"
- "--endpoint=/dra/dra-test-driver.sock"
Expand Down