Skip to content

Commit 4f3fd12

Browse files
authored
Merge pull request kubernetes#130116 from AkihiroSuda/rro
KEP-3857: Recursive Read-only (RRO) mounts: promote to GA
2 parents 5db66ad + d6a6dda commit 4f3fd12

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

pkg/features/versioned_kube_features.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
619619
RecursiveReadOnlyMounts: {
620620
{Version: version.MustParse("1.30"), Default: false, PreRelease: featuregate.Alpha},
621621
{Version: version.MustParse("1.31"), Default: true, PreRelease: featuregate.Beta},
622+
{Version: version.MustParse("1.33"), Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.36
622623
},
623624

624625
RelaxedDNSSearchValidation: {

test/e2e/feature/feature.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,9 +375,6 @@ var (
375375
// TODO: document the feature (owning SIG, when to use this feature for a test)
376376
RecoverVolumeExpansionFailure = framework.WithFeature(framework.ValidFeatures.Add("RecoverVolumeExpansionFailure"))
377377

378-
// RecursiveReadOnlyMounts (SIG-node, used for testing recursive read-only mounts <https://kep.k8s.io/3857>)
379-
RecursiveReadOnlyMounts = framework.WithFeature(framework.ValidFeatures.Add("RecursiveReadOnlyMounts"))
380-
381378
// RelaxedEnvironmentVariableValidation used when we verify whether the pod can consume all printable ASCII characters as environment variable names,
382379
// and whether the pod can consume configmap/secret that key starts with a number.
383380
RelaxedEnvironmentVariableValidation = framework.WithFeature(framework.ValidFeatures.Add("RelaxedEnvironmentVariableValidation"))

test/e2e_node/mount_rro_linux_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,14 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/util/uuid"
2828
"k8s.io/kubernetes/pkg/features"
29-
"k8s.io/kubernetes/test/e2e/feature"
3029
"k8s.io/kubernetes/test/e2e/framework"
3130
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3231
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3332
admissionapi "k8s.io/pod-security-admission/api"
3433
"k8s.io/utils/ptr"
3534
)
3635

37-
// Usage:
38-
// make test-e2e-node TEST_ARGS='--service-feature-gates=RecursiveReadOnlyMounts=true --kubelet-flags="--feature-gates=RecursiveReadOnlyMounts=true"' FOCUS="Mount recursive read-only" SKIP=""
39-
var _ = SIGDescribe("Mount recursive read-only [LinuxOnly]", feature.RecursiveReadOnlyMounts, func() {
36+
var _ = SIGDescribe("Mount recursive read-only [LinuxOnly]", func() {
4037
f := framework.NewDefaultFramework("mount-rro")
4138
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
4239
ginkgo.Describe("Mount recursive read-only", func() {

test/featuregates_linter/test_data/versioned_feature_list.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,6 +1020,10 @@
10201020
lockToDefault: false
10211021
preRelease: Beta
10221022
version: "1.31"
1023+
- default: true
1024+
lockToDefault: true
1025+
preRelease: GA
1026+
version: "1.33"
10231027
- name: RelaxedDNSSearchValidation
10241028
versionedSpecs:
10251029
- default: false

0 commit comments

Comments
 (0)