Skip to content

Commit 3213069

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#129678 from carlory/fsgroup
remove feature label FSGroup
2 parents 4766d19 + e68cc0a commit 3213069

File tree

8 files changed

+12
-30
lines changed

8 files changed

+12
-30
lines changed

‎test/e2e/auth/service_accounts.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ import (
3838
watch "k8s.io/apimachinery/pkg/watch"
3939
"k8s.io/client-go/util/retry"
4040
"k8s.io/kubernetes/plugin/pkg/admission/serviceaccount"
41-
"k8s.io/kubernetes/test/e2e/feature"
4241
"k8s.io/kubernetes/test/e2e/framework"
4342
e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"
4443
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4544
e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
4645
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
47-
"k8s.io/kubernetes/test/e2e/nodefeature"
4846
imageutils "k8s.io/kubernetes/test/utils/image"
4947
admissionapi "k8s.io/pod-security-admission/api"
5048
utilptr "k8s.io/utils/pointer"
@@ -365,7 +363,7 @@ var _ = SIGDescribe("ServiceAccounts", func() {
365363
Containers MUST verify that the projected service account token can be
366364
read and has correct file mode set including ownership and permission.
367365
*/
368-
f.It("should set ownership and permission when RunAsUser or FsGroup is present [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
366+
f.It("should set ownership and permission when RunAsUser or FsGroup is present [LinuxOnly]", func(ctx context.Context) {
369367
e2eskipper.SkipIfNodeOSDistroIs("windows")
370368

371369
var (

‎test/e2e/common/storage/configmap_volume.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,10 @@ import (
2727
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/util/uuid"
30-
"k8s.io/kubernetes/test/e2e/feature"
3130
"k8s.io/kubernetes/test/e2e/framework"
3231
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3332
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
3433
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
35-
"k8s.io/kubernetes/test/e2e/nodefeature"
3634
imageutils "k8s.io/kubernetes/test/utils/image"
3735
admissionapi "k8s.io/pod-security-admission/api"
3836
)
@@ -61,7 +59,7 @@ var _ = SIGDescribe("ConfigMap", func() {
6159
doConfigMapE2EWithoutMappings(ctx, f, false, 0, &defaultMode)
6260
})
6361

64-
f.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
62+
f.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [LinuxOnly]", func(ctx context.Context) {
6563
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
6664
e2eskipper.SkipIfNodeOSDistroIs("windows")
6765
defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */
@@ -77,7 +75,7 @@ var _ = SIGDescribe("ConfigMap", func() {
7775
doConfigMapE2EWithoutMappings(ctx, f, true, 0, nil)
7876
})
7977

80-
f.It("should be consumable from pods in volume as non-root with FSGroup [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
78+
f.It("should be consumable from pods in volume as non-root with FSGroup [LinuxOnly]", func(ctx context.Context) {
8179
// Windows does not support RunAsUser / FSGroup SecurityContext options.
8280
e2eskipper.SkipIfNodeOSDistroIs("windows")
8381
doConfigMapE2EWithoutMappings(ctx, f, true, 1001, nil)
@@ -112,7 +110,7 @@ var _ = SIGDescribe("ConfigMap", func() {
112110
doConfigMapE2EWithMappings(ctx, f, true, 0, nil)
113111
})
114112

115-
f.It("should be consumable from pods in volume with mappings as non-root with FSGroup [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
113+
f.It("should be consumable from pods in volume with mappings as non-root with FSGroup [LinuxOnly]", func(ctx context.Context) {
116114
// Windows does not support RunAsUser / FSGroup SecurityContext options.
117115
e2eskipper.SkipIfNodeOSDistroIs("windows")
118116
doConfigMapE2EWithMappings(ctx, f, true, 1001, nil)

‎test/e2e/common/storage/downwardapi_volume.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ import (
2525
"k8s.io/apimachinery/pkg/api/resource"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/util/uuid"
28-
"k8s.io/kubernetes/test/e2e/feature"
2928
"k8s.io/kubernetes/test/e2e/framework"
3029
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3130
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
3231
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
33-
"k8s.io/kubernetes/test/e2e/nodefeature"
3432
imageutils "k8s.io/kubernetes/test/utils/image"
3533
admissionapi "k8s.io/pod-security-admission/api"
3634

@@ -94,7 +92,7 @@ var _ = SIGDescribe("Downward API volume", func() {
9492
})
9593
})
9694

97-
f.It("should provide podname as non-root with fsgroup [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
95+
f.It("should provide podname as non-root with fsgroup [LinuxOnly]", func(ctx context.Context) {
9896
// Windows does not support RunAsUser / FSGroup SecurityContext options.
9997
e2eskipper.SkipIfNodeOSDistroIs("windows")
10098
podName := "metadata-volume-" + string(uuid.NewUUID())
@@ -109,7 +107,7 @@ var _ = SIGDescribe("Downward API volume", func() {
109107
})
110108
})
111109

112-
f.It("should provide podname as non-root with fsgroup and defaultMode [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
110+
f.It("should provide podname as non-root with fsgroup and defaultMode [LinuxOnly]", func(ctx context.Context) {
113111
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
114112
e2eskipper.SkipIfNodeOSDistroIs("windows")
115113
podName := "metadata-volume-" + string(uuid.NewUUID())

‎test/e2e/common/storage/empty_dir.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,10 @@ import (
2828
"k8s.io/apimachinery/pkg/api/resource"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/util/uuid"
31-
"k8s.io/kubernetes/test/e2e/feature"
3231
"k8s.io/kubernetes/test/e2e/framework"
3332
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3433
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
3534
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
36-
"k8s.io/kubernetes/test/e2e/nodefeature"
3735
imageutils "k8s.io/kubernetes/test/utils/image"
3836
admissionapi "k8s.io/pod-security-admission/api"
3937
)
@@ -50,7 +48,7 @@ var _ = SIGDescribe("EmptyDir volumes", func() {
5048
f := framework.NewDefaultFramework("emptydir")
5149
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline
5250

53-
f.Context("when FSGroup is specified [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func() {
51+
f.Context("when FSGroup is specified [LinuxOnly]", func() {
5452

5553
ginkgo.BeforeEach(func() {
5654
// Windows does not support the FSGroup SecurityContext option.

‎test/e2e/common/storage/projected_configmap.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ import (
2424
v1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/uuid"
27-
"k8s.io/kubernetes/test/e2e/feature"
2827
"k8s.io/kubernetes/test/e2e/framework"
2928
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3029
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
3130
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
32-
"k8s.io/kubernetes/test/e2e/nodefeature"
3331
imageutils "k8s.io/kubernetes/test/utils/image"
3432
admissionapi "k8s.io/pod-security-admission/api"
3533

@@ -61,7 +59,7 @@ var _ = SIGDescribe("Projected configMap", func() {
6159
doProjectedConfigMapE2EWithoutMappings(ctx, f, false, 0, &defaultMode)
6260
})
6361

64-
f.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
62+
f.It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [LinuxOnly]", func(ctx context.Context) {
6563
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
6664
e2eskipper.SkipIfNodeOSDistroIs("windows")
6765
defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */
@@ -77,7 +75,7 @@ var _ = SIGDescribe("Projected configMap", func() {
7775
doProjectedConfigMapE2EWithoutMappings(ctx, f, true, 0, nil)
7876
})
7977

80-
f.It("should be consumable from pods in volume as non-root with FSGroup [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
78+
f.It("should be consumable from pods in volume as non-root with FSGroup [LinuxOnly]", func(ctx context.Context) {
8179
// Windows does not support RunAsUser / FSGroup SecurityContext options.
8280
e2eskipper.SkipIfNodeOSDistroIs("windows")
8381
doProjectedConfigMapE2EWithoutMappings(ctx, f, true, 1001, nil)
@@ -112,7 +110,7 @@ var _ = SIGDescribe("Projected configMap", func() {
112110
doProjectedConfigMapE2EWithMappings(ctx, f, true, 0, nil)
113111
})
114112

115-
f.It("should be consumable from pods in volume with mappings as non-root with FSGroup [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
113+
f.It("should be consumable from pods in volume with mappings as non-root with FSGroup [LinuxOnly]", func(ctx context.Context) {
116114
// Windows does not support RunAsUser / FSGroup SecurityContext options.
117115
e2eskipper.SkipIfNodeOSDistroIs("windows")
118116
doProjectedConfigMapE2EWithMappings(ctx, f, true, 1001, nil)

‎test/e2e/common/storage/projected_downwardapi.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@ import (
2424
v1 "k8s.io/api/core/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626
"k8s.io/apimachinery/pkg/util/uuid"
27-
"k8s.io/kubernetes/test/e2e/feature"
2827
"k8s.io/kubernetes/test/e2e/framework"
2928
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3029
e2epodoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
3130
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
32-
"k8s.io/kubernetes/test/e2e/nodefeature"
3331
imageutils "k8s.io/kubernetes/test/utils/image"
3432
admissionapi "k8s.io/pod-security-admission/api"
3533

@@ -94,7 +92,7 @@ var _ = SIGDescribe("Projected downwardAPI", func() {
9492
})
9593
})
9694

97-
f.It("should provide podname as non-root with fsgroup [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
95+
f.It("should provide podname as non-root with fsgroup [LinuxOnly]", func(ctx context.Context) {
9896
// Windows does not support RunAsUser / FSGroup SecurityContext options.
9997
e2eskipper.SkipIfNodeOSDistroIs("windows")
10098
podName := "metadata-volume-" + string(uuid.NewUUID())
@@ -109,7 +107,7 @@ var _ = SIGDescribe("Projected downwardAPI", func() {
109107
})
110108
})
111109

112-
f.It("should provide podname as non-root with fsgroup and defaultMode [LinuxOnly]", nodefeature.FSGroup, feature.FSGroup, func(ctx context.Context) {
110+
f.It("should provide podname as non-root with fsgroup and defaultMode [LinuxOnly]", func(ctx context.Context) {
113111
// Windows does not support RunAsUser / FSGroup SecurityContext options, and it does not support setting file permissions.
114112
e2eskipper.SkipIfNodeOSDistroIs("windows")
115113
podName := "metadata-volume-" + string(uuid.NewUUID())

‎test/e2e/feature/feature.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,6 @@ var (
156156
// See https://github.com/kubernetes/kubernetes/issues/78737 for more details.
157157
Flexvolumes = framework.WithFeature(framework.ValidFeatures.Add("Flexvolumes"))
158158

159-
// TODO: document the feature (owning SIG, when to use this feature for a test)
160-
FSGroup = framework.WithFeature(framework.ValidFeatures.Add("FSGroup"))
161-
162159
// OWNER: sig-node
163160
// Testing garbage collection of images/containers
164161
GarbageCollect = framework.WithFeature(framework.ValidFeatures.Add("GarbageCollect"))

‎test/e2e/nodefeature/nodefeature.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ var (
4949
// TODO: document the feature (owning SIG, when to use this feature for a test)
5050
Eviction = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("Eviction"))
5151

52-
// TODO: document the feature (owning SIG, when to use this feature for a test)
53-
FSGroup = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("FSGroup"))
54-
5552
// TODO: document the feature (owning SIG, when to use this feature for a test)
5653
GarbageCollect = framework.WithNodeFeature(framework.ValidNodeFeatures.Add("GarbageCollect"))
5754

0 commit comments

Comments
 (0)