Skip to content

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

Merge pull request #54042 from xiangpengzhao/sig-storage-prefix

Automatic merge from submit-queue. 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>. Add sig-storage prefix for common e2e tests **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # ref: #49161 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 4aaf39a5 36fb1175
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 71 deletions
test/conformance/testdata/conformance.txt
View file @ 3eebab1d
...@@ -43,24 +43,24 @@ test/e2e/common/downwardapi_volume.go: "should provide container's cpu request " ...@@ -43,24 +43,24 @@ test/e2e/common/downwardapi_volume.go: "should provide container's cpu request "
test/e2e/common/downwardapi_volume.go: "should provide container's memory request " test/e2e/common/downwardapi_volume.go: "should provide container's memory request "
test/e2e/common/downwardapi_volume.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set " test/e2e/common/downwardapi_volume.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set "
test/e2e/common/downwardapi_volume.go: "should provide node allocatable (memory) as default memory limit if the limit is not set " test/e2e/common/downwardapi_volume.go: "should provide node allocatable (memory) as default memory limit if the limit is not set "
test/e2e/common/empty_dir.go: "volume on tmpfs should have the correct mode [sig-storage]" test/e2e/common/empty_dir.go: "volume on tmpfs should have the correct mode"
test/e2e/common/empty_dir.go: "should support (root,0644,tmpfs) [sig-storage]" test/e2e/common/empty_dir.go: "should support (root,0644,tmpfs)"
test/e2e/common/empty_dir.go: "should support (root,0666,tmpfs) [sig-storage]" test/e2e/common/empty_dir.go: "should support (root,0666,tmpfs)"
test/e2e/common/empty_dir.go: "should support (root,0777,tmpfs) [sig-storage]" test/e2e/common/empty_dir.go: "should support (root,0777,tmpfs)"
test/e2e/common/empty_dir.go: "should support (non-root,0644,tmpfs) [sig-storage]" test/e2e/common/empty_dir.go: "should support (non-root,0644,tmpfs)"
test/e2e/common/empty_dir.go: "should support (non-root,0666,tmpfs) [sig-storage]" test/e2e/common/empty_dir.go: "should support (non-root,0666,tmpfs)"
test/e2e/common/empty_dir.go: "should support (non-root,0777,tmpfs) [sig-storage]" test/e2e/common/empty_dir.go: "should support (non-root,0777,tmpfs)"
test/e2e/common/empty_dir.go: "volume on default medium should have the correct mode [sig-storage]" test/e2e/common/empty_dir.go: "volume on default medium should have the correct mode"
test/e2e/common/empty_dir.go: "should support (root,0644,default) [sig-storage]" test/e2e/common/empty_dir.go: "should support (root,0644,default)"
test/e2e/common/empty_dir.go: "should support (root,0666,default) [sig-storage]" test/e2e/common/empty_dir.go: "should support (root,0666,default)"
test/e2e/common/empty_dir.go: "should support (root,0777,default) [sig-storage]" test/e2e/common/empty_dir.go: "should support (root,0777,default)"
test/e2e/common/empty_dir.go: "should support (non-root,0644,default) [sig-storage]" test/e2e/common/empty_dir.go: "should support (non-root,0644,default)"
test/e2e/common/empty_dir.go: "should support (non-root,0666,default) [sig-storage]" test/e2e/common/empty_dir.go: "should support (non-root,0666,default)"
test/e2e/common/empty_dir.go: "should support (non-root,0777,default) [sig-storage]" test/e2e/common/empty_dir.go: "should support (non-root,0777,default)"
test/e2e/common/expansion.go: "should allow composing env vars into new env vars " test/e2e/common/expansion.go: "should allow composing env vars into new env vars "
test/e2e/common/expansion.go: "should allow substituting values in a container's command " test/e2e/common/expansion.go: "should allow substituting values in a container's command "
test/e2e/common/expansion.go: "should allow substituting values in a container's args " test/e2e/common/expansion.go: "should allow substituting values in a container's args "
test/e2e/common/host_path.go: "should give a volume the correct mode [sig-storage]" test/e2e/common/host_path.go: "should give a volume the correct mode"
test/e2e/common/kubelet_etc_hosts.go: "should test kubelet managed /etc/hosts file " test/e2e/common/kubelet_etc_hosts.go: "should test kubelet managed /etc/hosts file "
test/e2e/common/networking.go: "should function for intra-pod communication: http " test/e2e/common/networking.go: "should function for intra-pod communication: http "
test/e2e/common/networking.go: "should function for intra-pod communication: udp " test/e2e/common/networking.go: "should function for intra-pod communication: udp "
...@@ -71,34 +71,34 @@ test/e2e/common/pods.go: "should be submitted and removed " ...@@ -71,34 +71,34 @@ test/e2e/common/pods.go: "should be submitted and removed "
test/e2e/common/pods.go: "should be updated " test/e2e/common/pods.go: "should be updated "
test/e2e/common/pods.go: "should allow activeDeadlineSeconds to be updated " test/e2e/common/pods.go: "should allow activeDeadlineSeconds to be updated "
test/e2e/common/pods.go: "should contain environment variables for services " test/e2e/common/pods.go: "should contain environment variables for services "
test/e2e/common/projected.go: "should be consumable from pods in volume [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume"
test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set"
test/e2e/common/projected.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set"
test/e2e/common/projected.go: "should be consumable from pods in volume with mappings [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with mappings"
test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item Mode set [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item Mode set"
test/e2e/common/projected.go: "should be consumable in multiple volumes in a pod [sig-storage]" test/e2e/common/projected.go: "should be consumable in multiple volumes in a pod"
test/e2e/common/projected.go: "optional updates should be reflected in volume [sig-storage]" test/e2e/common/projected.go: "optional updates should be reflected in volume"
test/e2e/common/projected.go: "should be consumable from pods in volume [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume"
test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set"
test/e2e/common/projected.go: "should be consumable from pods in volume as non-root [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume as non-root"
test/e2e/common/projected.go: "should be consumable from pods in volume with mappings [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with mappings"
test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item mode set [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with mappings and Item mode set"
test/e2e/common/projected.go: "should be consumable from pods in volume with mappings as non-root [sig-storage]" test/e2e/common/projected.go: "should be consumable from pods in volume with mappings as non-root"
test/e2e/common/projected.go: "updates should be reflected in volume [sig-storage]" test/e2e/common/projected.go: "updates should be reflected in volume"
test/e2e/common/projected.go: "optional updates should be reflected in volume [sig-storage]" test/e2e/common/projected.go: "optional updates should be reflected in volume"
test/e2e/common/projected.go: "should be consumable in multiple volumes in the same pod [sig-storage]" test/e2e/common/projected.go: "should be consumable in multiple volumes in the same pod"
test/e2e/common/projected.go: "should provide podname only [sig-storage]" test/e2e/common/projected.go: "should provide podname only"
test/e2e/common/projected.go: "should set DefaultMode on files [sig-storage]" test/e2e/common/projected.go: "should set DefaultMode on files"
test/e2e/common/projected.go: "should set mode on item file [sig-storage]" test/e2e/common/projected.go: "should set mode on item file"
test/e2e/common/projected.go: "should update labels on modification [sig-storage]" test/e2e/common/projected.go: "should update labels on modification"
test/e2e/common/projected.go: "should update annotations on modification [sig-storage]" test/e2e/common/projected.go: "should update annotations on modification"
test/e2e/common/projected.go: "should provide container's cpu limit [sig-storage]" test/e2e/common/projected.go: "should provide container's cpu limit"
test/e2e/common/projected.go: "should provide container's memory limit [sig-storage]" test/e2e/common/projected.go: "should provide container's memory limit"
test/e2e/common/projected.go: "should provide container's cpu request [sig-storage]" test/e2e/common/projected.go: "should provide container's cpu request"
test/e2e/common/projected.go: "should provide container's memory request [sig-storage]" test/e2e/common/projected.go: "should provide container's memory request"
test/e2e/common/projected.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set [sig-storage]" test/e2e/common/projected.go: "should provide node allocatable (cpu) as default cpu limit if the limit is not set"
test/e2e/common/projected.go: "should provide node allocatable (memory) as default memory limit if the limit is not set [sig-storage]" test/e2e/common/projected.go: "should provide node allocatable (memory) as default memory limit if the limit is not set"
test/e2e/common/projected.go: "should project all components that make up the projection API [sig-storage] [Projection]" test/e2e/common/projected.go: "should project all components that make up the projection API [Projection]"
test/e2e/common/secrets.go: "should be consumable from pods in env vars " test/e2e/common/secrets.go: "should be consumable from pods in env vars "
test/e2e/common/secrets.go: "should be consumable via the environment " test/e2e/common/secrets.go: "should be consumable via the environment "
test/e2e/common/secrets_volume.go: "should be consumable from pods in volume " test/e2e/common/secrets_volume.go: "should be consumable from pods in volume "
......
test/e2e/common/empty_dir.go
View file @ 3eebab1d
...@@ -38,89 +38,88 @@ var ( ...@@ -38,89 +38,88 @@ var (
testImageNonRootUid = imageutils.GetE2EImage(imageutils.MounttestUser) testImageNonRootUid = imageutils.GetE2EImage(imageutils.MounttestUser)
) )
var _ = framework.KubeDescribe("EmptyDir volumes", func() { var _ = Describe("[sig-storage] EmptyDir volumes", func() {
f := framework.NewDefaultFramework("emptydir") f := framework.NewDefaultFramework("emptydir")
Context("when FSGroup is specified [Feature:FSGroup]", func() { Context("when FSGroup is specified [Feature:FSGroup]", func() {
It("new files should be created with FSGroup ownership when container is root [sig-storage]", func() { It("new files should be created with FSGroup ownership when container is root", func() {
doTestSetgidFSGroup(f, testImageRootUid, v1.StorageMediumMemory) doTestSetgidFSGroup(f, testImageRootUid, v1.StorageMediumMemory)
}) })
It("new files should be created with FSGroup ownership when container is non-root [sig-storage]", func() { It("new files should be created with FSGroup ownership when container is non-root", func() {
doTestSetgidFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory) doTestSetgidFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
It("nonexistent volume subPath should have the correct mode and owner using FSGroup [sig-storage]", func() { It("nonexistent volume subPath should have the correct mode and owner using FSGroup", func() {
doTestSubPathFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory) doTestSubPathFSGroup(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
It("files with FSGroup ownership should support (root,0644,tmpfs) [sig-storage]", func() { It("files with FSGroup ownership should support (root,0644,tmpfs)", func() {
doTest0644FSGroup(f, testImageRootUid, v1.StorageMediumMemory) doTest0644FSGroup(f, testImageRootUid, v1.StorageMediumMemory)
}) })
It("volume on default medium should have the correct mode using FSGroup [sig-storage]", func() { It("volume on default medium should have the correct mode using FSGroup", func() {
doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumDefault) doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumDefault)
}) })
It("volume on tmpfs should have the correct mode using FSGroup [sig-storage]", func() { It("volume on tmpfs should have the correct mode using FSGroup", func() {
doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumMemory) doTestVolumeModeFSGroup(f, testImageRootUid, v1.StorageMediumMemory)
}) })
}) })
framework.ConformanceIt("volume on tmpfs should have the correct mode [sig-storage]", func() { framework.ConformanceIt("volume on tmpfs should have the correct mode", func() {
doTestVolumeMode(f, testImageRootUid, v1.StorageMediumMemory) doTestVolumeMode(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (root,0644,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (root,0644,tmpfs)", func() {
doTest0644(f, testImageRootUid, v1.StorageMediumMemory) doTest0644(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (root,0666,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (root,0666,tmpfs)", func() {
doTest0666(f, testImageRootUid, v1.StorageMediumMemory) doTest0666(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (root,0777,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (root,0777,tmpfs)", func() {
doTest0777(f, testImageRootUid, v1.StorageMediumMemory) doTest0777(f, testImageRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (non-root,0644,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0644,tmpfs)", func() {
doTest0644(f, testImageNonRootUid, v1.StorageMediumMemory) doTest0644(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (non-root,0666,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0666,tmpfs)", func() {
doTest0666(f, testImageNonRootUid, v1.StorageMediumMemory) doTest0666(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("should support (non-root,0777,tmpfs) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0777,tmpfs)", func() {
doTest0777(f, testImageNonRootUid, v1.StorageMediumMemory) doTest0777(f, testImageNonRootUid, v1.StorageMediumMemory)
}) })
framework.ConformanceIt("volume on default medium should have the correct mode [sig-storage]", func() { framework.ConformanceIt("volume on default medium should have the correct mode", func() {
doTestVolumeMode(f, testImageRootUid, v1.StorageMediumDefault) doTestVolumeMode(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (root,0644,default) [sig-storage]", func() { framework.ConformanceIt("should support (root,0644,default)", func() {
doTest0644(f, testImageRootUid, v1.StorageMediumDefault) doTest0644(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (root,0666,default) [sig-storage]", func() { framework.ConformanceIt("should support (root,0666,default)", func() {
doTest0666(f, testImageRootUid, v1.StorageMediumDefault) doTest0666(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (root,0777,default) [sig-storage]", func() { framework.ConformanceIt("should support (root,0777,default)", func() {
doTest0777(f, testImageRootUid, v1.StorageMediumDefault) doTest0777(f, testImageRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (non-root,0644,default) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0644,default)", func() {
doTest0644(f, testImageNonRootUid, v1.StorageMediumDefault) doTest0644(f, testImageNonRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (non-root,0666,default) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0666,default)", func() {
doTest0666(f, testImageNonRootUid, v1.StorageMediumDefault) doTest0666(f, testImageNonRootUid, v1.StorageMediumDefault)
}) })
framework.ConformanceIt("should support (non-root,0777,default) [sig-storage]", func() { framework.ConformanceIt("should support (non-root,0777,default)", func() {
doTest0777(f, testImageNonRootUid, v1.StorageMediumDefault) doTest0777(f, testImageNonRootUid, v1.StorageMediumDefault)
}) })
}) })
......
test/e2e/common/host_path.go
View file @ 3eebab1d
...@@ -31,7 +31,7 @@ import ( ...@@ -31,7 +31,7 @@ import (
//TODO : Consolidate this code with the code for emptyDir. //TODO : Consolidate this code with the code for emptyDir.
//This will require some smart. //This will require some smart.
var _ = framework.KubeDescribe("HostPath", func() { var _ = Describe("[sig-storage] HostPath", func() {
f := framework.NewDefaultFramework("hostpath") f := framework.NewDefaultFramework("hostpath")
BeforeEach(func() { BeforeEach(func() {
...@@ -40,7 +40,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -40,7 +40,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
_ = os.Remove("/tmp/test-file") _ = os.Remove("/tmp/test-file")
}) })
framework.ConformanceIt("should give a volume the correct mode [sig-storage]", func() { framework.ConformanceIt("should give a volume the correct mode", func() {
source := &v1.HostPathVolumeSource{ source := &v1.HostPathVolumeSource{
Path: "/tmp", Path: "/tmp",
} }
...@@ -56,7 +56,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -56,7 +56,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
// This test requires mounting a folder into a container with write privileges. // This test requires mounting a folder into a container with write privileges.
It("should support r/w [sig-storage]", func() { It("should support r/w", func() {
filePath := path.Join(volumePath, "test-file") filePath := path.Join(volumePath, "test-file")
retryDuration := 180 retryDuration := 180
source := &v1.HostPathVolumeSource{ source := &v1.HostPathVolumeSource{
...@@ -80,7 +80,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -80,7 +80,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
}) })
It("should support subPath [sig-storage]", func() { It("should support subPath", func() {
subPath := "sub-path" subPath := "sub-path"
fileName := "test-file" fileName := "test-file"
retryDuration := 180 retryDuration := 180
...@@ -112,7 +112,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -112,7 +112,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
}) })
It("should support existing directory subPath [sig-storage]", func() { It("should support existing directory subPath", func() {
framework.SkipUnlessSSHKeyPresent() framework.SkipUnlessSSHKeyPresent()
subPath := "sub-path" subPath := "sub-path"
...@@ -158,7 +158,7 @@ var _ = framework.KubeDescribe("HostPath", func() { ...@@ -158,7 +158,7 @@ var _ = framework.KubeDescribe("HostPath", func() {
}) })
// TODO consolidate common code of this test and above // TODO consolidate common code of this test and above
It("should support existing single file subPath [sig-storage]", func() { It("should support existing single file subPath", func() {
framework.SkipUnlessSSHKeyPresent() framework.SkipUnlessSSHKeyPresent()
subPath := "sub-path-test-file" subPath := "sub-path-test-file"
......
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