Skip to content

K
k3s
Unverified Commit 13f846f7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #63588 from jsafrane/remove-fsgroup-feature-test

Automatic merge from submit-queue (batch tested with PRs 63588, 63806). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Run FSGroup tests by default. There is no special feature flag for FSGroup and the tests can run in all test suites. They're reasonably fast too. **Release note**: ```release-note NONE ``` cc: @jeffvance
parents f5a91f41 b1ae20fd
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
test/e2e/common/configmap_volume.go
View file @ 13f846f7
...@@ -51,7 +51,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { ...@@ -51,7 +51,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() {
doConfigMapE2EWithoutMappings(f, 0, 0, &defaultMode) doConfigMapE2EWithoutMappings(f, 0, 0, &defaultMode)
}) })
It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [Feature:FSGroup]", func() { It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set", func() {
defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */ defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */
doConfigMapE2EWithoutMappings(f, 1000, 1001, &defaultMode) doConfigMapE2EWithoutMappings(f, 1000, 1001, &defaultMode)
}) })
...@@ -65,7 +65,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { ...@@ -65,7 +65,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() {
doConfigMapE2EWithoutMappings(f, 1000, 0, nil) doConfigMapE2EWithoutMappings(f, 1000, 0, nil)
}) })
It("should be consumable from pods in volume as non-root with FSGroup [Feature:FSGroup]", func() { It("should be consumable from pods in volume as non-root with FSGroup", func() {
doConfigMapE2EWithoutMappings(f, 1000, 1001, nil) doConfigMapE2EWithoutMappings(f, 1000, 1001, nil)
}) })
...@@ -97,7 +97,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { ...@@ -97,7 +97,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() {
doConfigMapE2EWithMappings(f, 1000, 0, nil) doConfigMapE2EWithMappings(f, 1000, 0, nil)
}) })
It("should be consumable from pods in volume with mappings as non-root with FSGroup [Feature:FSGroup]", func() { It("should be consumable from pods in volume with mappings as non-root with FSGroup", func() {
doConfigMapE2EWithMappings(f, 1000, 1001, nil) doConfigMapE2EWithMappings(f, 1000, 1001, nil)
}) })
......
test/e2e/common/downwardapi_volume.go
View file @ 13f846f7
...@@ -83,7 +83,7 @@ var _ = Describe("[sig-storage] Downward API volume", func() { ...@@ -83,7 +83,7 @@ var _ = Describe("[sig-storage] Downward API volume", func() {
}) })
}) })
It("should provide podname as non-root with fsgroup [Feature:FSGroup]", func() { It("should provide podname as non-root with fsgroup", func() {
podName := "metadata-volume-" + string(uuid.NewUUID()) podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001) uid := int64(1001)
gid := int64(1234) gid := int64(1234)
...@@ -97,7 +97,7 @@ var _ = Describe("[sig-storage] Downward API volume", func() { ...@@ -97,7 +97,7 @@ var _ = Describe("[sig-storage] Downward API volume", func() {
}) })
}) })
It("should provide podname as non-root with fsgroup and defaultMode [Feature:FSGroup]", func() { It("should provide podname as non-root with fsgroup and defaultMode", func() {
podName := "metadata-volume-" + string(uuid.NewUUID()) podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001) uid := int64(1001)
gid := int64(1234) gid := int64(1234)
......
test/e2e/common/projected.go
View file @ 13f846f7
...@@ -419,7 +419,7 @@ var _ = Describe("[sig-storage] Projected", func() { ...@@ -419,7 +419,7 @@ var _ = Describe("[sig-storage] Projected", func() {
doProjectedConfigMapE2EWithoutMappings(f, 0, 0, &defaultMode) doProjectedConfigMapE2EWithoutMappings(f, 0, 0, &defaultMode)
}) })
It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set [Feature:FSGroup]", func() { It("should be consumable from pods in volume as non-root with defaultMode and fsGroup set", func() {
defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */ defaultMode := int32(0440) /* setting fsGroup sets mode to at least 440 */
doProjectedConfigMapE2EWithoutMappings(f, 1000, 1001, &defaultMode) doProjectedConfigMapE2EWithoutMappings(f, 1000, 1001, &defaultMode)
}) })
...@@ -433,7 +433,7 @@ var _ = Describe("[sig-storage] Projected", func() { ...@@ -433,7 +433,7 @@ var _ = Describe("[sig-storage] Projected", func() {
doProjectedConfigMapE2EWithoutMappings(f, 1000, 0, nil) doProjectedConfigMapE2EWithoutMappings(f, 1000, 0, nil)
}) })
It("should be consumable from pods in volume as non-root with FSGroup [Feature:FSGroup]", func() { It("should be consumable from pods in volume as non-root with FSGroup", func() {
doProjectedConfigMapE2EWithoutMappings(f, 1000, 1001, nil) doProjectedConfigMapE2EWithoutMappings(f, 1000, 1001, nil)
}) })
...@@ -466,7 +466,7 @@ var _ = Describe("[sig-storage] Projected", func() { ...@@ -466,7 +466,7 @@ var _ = Describe("[sig-storage] Projected", func() {
doProjectedConfigMapE2EWithMappings(f, 1000, 0, nil) doProjectedConfigMapE2EWithMappings(f, 1000, 0, nil)
}) })
It("should be consumable from pods in volume with mappings as non-root with FSGroup [Feature:FSGroup]", func() { It("should be consumable from pods in volume with mappings as non-root with FSGroup", func() {
doProjectedConfigMapE2EWithMappings(f, 1000, 1001, nil) doProjectedConfigMapE2EWithMappings(f, 1000, 1001, nil)
}) })
...@@ -904,7 +904,7 @@ var _ = Describe("[sig-storage] Projected", func() { ...@@ -904,7 +904,7 @@ var _ = Describe("[sig-storage] Projected", func() {
}) })
}) })
It("should provide podname as non-root with fsgroup [Feature:FSGroup]", func() { It("should provide podname as non-root with fsgroup", func() {
podName := "metadata-volume-" + string(uuid.NewUUID()) podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001) uid := int64(1001)
gid := int64(1234) gid := int64(1234)
...@@ -918,7 +918,7 @@ var _ = Describe("[sig-storage] Projected", func() { ...@@ -918,7 +918,7 @@ var _ = Describe("[sig-storage] Projected", func() {
}) })
}) })
It("should provide podname as non-root with fsgroup and defaultMode [Feature:FSGroup]", func() { It("should provide podname as non-root with fsgroup and defaultMode", func() {
podName := "metadata-volume-" + string(uuid.NewUUID()) podName := "metadata-volume-" + string(uuid.NewUUID())
uid := int64(1001) uid := int64(1001)
gid := int64(1234) gid := int64(1234)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment