github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97045 from claudiubelu/tests-windows-containerd-enabled

Browse Source 
tests: Enable some [LinuxOnly] tests for Windows Containerd
This commit is contained in:
Kubernetes Prow Robot 2021-10-06 19:53:45 -07:00 committed by GitHub
commit c20ff9839e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
test/conformance/testdata/conformance.yaml vendored
View File

@ -1667,37 +1667,6 @@
server pod to validate that the pre-stop is executed. server pod to validate that the pre-stop is executed.
release: v1.9 release: v1.9
file: test/e2e/common/node/lifecycle_hook.go file: test/e2e/common/node/lifecycle_hook.go
- testname: Container Runtime, TerminationMessage, from log output of succeeding container
codename: '[sig-node] Container Runtime blackbox test on terminated container should
report termination message [LinuxOnly] as empty when pod succeeds and TerminationMessagePolicy
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
description: 'Create a pod with an container. Container''s output is recorded in
log and container exits successfully without an error. When container is terminated,
terminationMessage MUST have no content as container succeed. [LinuxOnly]: Cannot
mount files in Windows Containers.'
release: v1.15
file: test/e2e/common/node/runtime.go
- testname: Container Runtime, TerminationMessage, from file of succeeding container
codename: '[sig-node] Container Runtime blackbox test on terminated container should
report termination message [LinuxOnly] from file when pod succeeds and TerminationMessagePolicy
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
description: 'Create a pod with an container. Container''s output is recorded in
a file and the container exits successfully without an error. When container is
terminated, terminationMessage MUST match with the content from file. [LinuxOnly]:
Cannot mount files in Windows Containers.'
release: v1.15
file: test/e2e/common/node/runtime.go
- testname: Container Runtime, TerminationMessage, from container's log output of
failing container
codename: '[sig-node] Container Runtime blackbox test on terminated container should
report termination message [LinuxOnly] from log output if TerminationMessagePolicy
FallbackToLogsOnError is set [NodeConformance] [Conformance]'
description: 'Create a pod with an container. Container''s output is recorded in
log and container exits with an error. When container is terminated, termination
message MUST match the expected output recorded from container''s log. [LinuxOnly]:
Cannot mount files in Windows Containers.'
release: v1.15
file: test/e2e/common/node/runtime.go
- testname: Container Runtime, TerminationMessagePath, non-root user and non-default - testname: Container Runtime, TerminationMessagePath, non-root user and non-default
path path
codename: '[sig-node] Container Runtime blackbox test on terminated container should codename: '[sig-node] Container Runtime blackbox test on terminated container should
@ -1710,6 +1679,37 @@
due to use of ''uid'' and unable to mount files in Windows Containers.' due to use of ''uid'' and unable to mount files in Windows Containers.'
release: v1.15 release: v1.15
file: test/e2e/common/node/runtime.go file: test/e2e/common/node/runtime.go
- testname: Container Runtime, TerminationMessage, from log output of succeeding container
codename: '[sig-node] Container Runtime blackbox test on terminated container should
report termination message as empty when pod succeeds and TerminationMessagePolicy
FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]'
description: 'Create a pod with an container. Container''s output is recorded in
log and container exits successfully without an error. When container is terminated,
terminationMessage MUST have no content as container succeed. [Excluded:WindowsDocker]:
Cannot mount files in Windows Containers created by Docker.'
release: v1.15
file: test/e2e/common/node/runtime.go
- testname: Container Runtime, TerminationMessage, from file of succeeding container
codename: '[sig-node] Container Runtime blackbox test on terminated container should
report termination message from file when pod succeeds and TerminationMessagePolicy
FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]'
description: 'Create a pod with an container. Container''s output is recorded in
a file and the container exits successfully without an error. When container is
terminated, terminationMessage MUST match with the content from file. [Excluded:WindowsDocker]:
Cannot mount files in Windows Containers created by Docker.'
release: v1.15
file: test/e2e/common/node/runtime.go
- testname: Container Runtime, TerminationMessage, from container's log output of
failing container
codename: '[sig-node] Container Runtime blackbox test on terminated container should
report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError
is set [Excluded:WindowsDocker] [NodeConformance] [Conformance]'
description: 'Create a pod with an container. Container''s output is recorded in
log and container exits with an error. When container is terminated, termination
message MUST match the expected output recorded from container''s log. [Excluded:WindowsDocker]:
Cannot mount files in Windows Containers created by Docker.'
release: v1.15
file: test/e2e/common/node/runtime.go
- testname: Container Runtime, Restart Policy, Pod Phases - testname: Container Runtime, Restart Policy, Pod Phases
codename: '[sig-node] Container Runtime blackbox test when starting a container codename: '[sig-node] Container Runtime blackbox test when starting a container
that exits should run with the expected status [NodeConformance] [Conformance]' that exits should run with the expected status [NodeConformance] [Conformance]'
@ -3051,43 +3051,46 @@
file: test/e2e/common/storage/secrets_volume.go file: test/e2e/common/storage/secrets_volume.go
- testname: 'SubPath: Reading content from a configmap volume.' - testname: 'SubPath: Reading content from a configmap volume.'
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
configmap pod [LinuxOnly] [Conformance]' configmap pod [Excluded:WindowsDocker] [Conformance]'
description: Containers in a pod can read content from a configmap mounted volume description: Containers in a pod can read content from a configmap mounted volume
which was configured with a subpath. This test is marked LinuxOnly since Windows which was configured with a subpath. This test is marked [Excluded:WindowsDocker]
cannot mount individual files in Containers. since Docker does not support creating individual file mounts for containers on
Windows.
release: v1.12 release: v1.12
file: test/e2e/storage/subpath.go file: test/e2e/storage/subpath.go
- testname: 'SubPath: Reading content from a configmap volume.' - testname: 'SubPath: Reading content from a configmap volume.'
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
configmap pod with mountPath of existing file [LinuxOnly] [Conformance]' configmap pod with mountPath of existing file [Excluded:WindowsDocker] [Conformance]'
description: Containers in a pod can read content from a configmap mounted volume description: Containers in a pod can read content from a configmap mounted volume
which was configured with a subpath and also using a mountpath that is a specific which was configured with a subpath and also using a mountpath that is a specific
file. This test is marked LinuxOnly since Windows cannot mount individual files file. This test is marked [Excluded:WindowsDocker] since Docker does not support
in Containers. creating individual file mounts for containers on Windows.
release: v1.12 release: v1.12
file: test/e2e/storage/subpath.go file: test/e2e/storage/subpath.go
- testname: 'SubPath: Reading content from a downwardAPI volume.' - testname: 'SubPath: Reading content from a downwardAPI volume.'
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
downward pod [LinuxOnly] [Conformance]' downward pod [Excluded:WindowsDocker] [Conformance]'
description: Containers in a pod can read content from a downwardAPI mounted volume description: Containers in a pod can read content from a downwardAPI mounted volume
which was configured with a subpath. This test is marked LinuxOnly since Windows which was configured with a subpath. This test is marked [Excluded:WindowsDocker]
cannot mount individual files in Containers. since Docker does not support creating individual file mounts for containers on
Windows.
release: v1.12 release: v1.12
file: test/e2e/storage/subpath.go file: test/e2e/storage/subpath.go
- testname: 'SubPath: Reading content from a projected volume.' - testname: 'SubPath: Reading content from a projected volume.'
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
projected pod [LinuxOnly] [Conformance]' projected pod [Excluded:WindowsDocker] [Conformance]'
description: Containers in a pod can read content from a projected mounted volume description: Containers in a pod can read content from a projected mounted volume
which was configured with a subpath. This test is marked LinuxOnly since Windows which was configured with a subpath. This test is marked [Excluded:WindowsDocker]
cannot mount individual files in Containers. since Docker does not support creating individual file mounts for containers on
Windows.
release: v1.12 release: v1.12
file: test/e2e/storage/subpath.go file: test/e2e/storage/subpath.go
- testname: 'SubPath: Reading content from a secret volume.' - testname: 'SubPath: Reading content from a secret volume.'
codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with codename: '[sig-storage] Subpath Atomic writer volumes should support subpaths with
secret pod [LinuxOnly] [Conformance]' secret pod [Excluded:WindowsDocker] [Conformance]'
description: Containers in a pod can read content from a secret mounted volume which description: Containers in a pod can read content from a secret mounted volume which
was configured with a subpath. This test is marked LinuxOnly since Windows cannot was configured with a subpath. This test is marked [Excluded:WindowsDocker] since
mount individual files in Containers. Docker does not support creating individual file mounts for containers on Windows.
release: v1.12 release: v1.12
file: test/e2e/storage/subpath.go file: test/e2e/storage/subpath.go

18
test/e2e/common/node/runtime.go
View File

@ -168,9 +168,9 @@ while true; do sleep 1; done
gomega.Expect(c.Delete()).To(gomega.Succeed()) gomega.Expect(c.Delete()).To(gomega.Succeed())
} }
ginkgo.It("should report termination message [LinuxOnly] if TerminationMessagePath is set [NodeConformance]", func() { ginkgo.It("should report termination message if TerminationMessagePath is set [Excluded:WindowsDocker] [NodeConformance]", func() {
// Cannot mount files in Windows Containers. // Cannot mount files in Windows Containers created by Docker.
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the only
// container runtime on Windows. // container runtime on Windows.
container := v1.Container{ container := v1.Container{
Image: framework.BusyBoxImage, Image: framework.BusyBoxImage,
@ -215,9 +215,9 @@ while true; do sleep 1; done
Release: v1.15 Release: v1.15
Testname: Container Runtime, TerminationMessage, from container's log output of failing container Testname: Container Runtime, TerminationMessage, from container's log output of failing container
Description: Create a pod with an container. Container's output is recorded in log and container exits with an error. When container is terminated, termination message MUST match the expected output recorded from container's log. Description: Create a pod with an container. Container's output is recorded in log and container exits with an error. When container is terminated, termination message MUST match the expected output recorded from container's log.
[LinuxOnly]: Cannot mount files in Windows Containers. [Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker.
*/ */
framework.ConformanceIt("should report termination message [LinuxOnly] from log output if TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() { framework.ConformanceIt("should report termination message from log output if TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() {
container := v1.Container{ container := v1.Container{
Image: framework.BusyBoxImage, Image: framework.BusyBoxImage,
Command: []string{"/bin/sh", "-c"}, Command: []string{"/bin/sh", "-c"},
@ -232,9 +232,9 @@ while true; do sleep 1; done
Release: v1.15 Release: v1.15
Testname: Container Runtime, TerminationMessage, from log output of succeeding container Testname: Container Runtime, TerminationMessage, from log output of succeeding container
Description: Create a pod with an container. Container's output is recorded in log and container exits successfully without an error. When container is terminated, terminationMessage MUST have no content as container succeed. Description: Create a pod with an container. Container's output is recorded in log and container exits successfully without an error. When container is terminated, terminationMessage MUST have no content as container succeed.
[LinuxOnly]: Cannot mount files in Windows Containers. [Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker.
*/ */
framework.ConformanceIt("should report termination message [LinuxOnly] as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() { framework.ConformanceIt("should report termination message as empty when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() {
container := v1.Container{ container := v1.Container{
Image: framework.BusyBoxImage, Image: framework.BusyBoxImage,
Command: []string{"/bin/sh", "-c"}, Command: []string{"/bin/sh", "-c"},
@ -249,9 +249,9 @@ while true; do sleep 1; done
Release: v1.15 Release: v1.15
Testname: Container Runtime, TerminationMessage, from file of succeeding container Testname: Container Runtime, TerminationMessage, from file of succeeding container
Description: Create a pod with an container. Container's output is recorded in a file and the container exits successfully without an error. When container is terminated, terminationMessage MUST match with the content from file. Description: Create a pod with an container. Container's output is recorded in a file and the container exits successfully without an error. When container is terminated, terminationMessage MUST match with the content from file.
[LinuxOnly]: Cannot mount files in Windows Containers. [Excluded:WindowsDocker]: Cannot mount files in Windows Containers created by Docker.
*/ */
framework.ConformanceIt("should report termination message [LinuxOnly] from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [NodeConformance]", func() { framework.ConformanceIt("should report termination message from file when pod succeeds and TerminationMessagePolicy FallbackToLogsOnError is set [Excluded:WindowsDocker] [NodeConformance]", func() {
container := v1.Container{ container := v1.Container{
Image: framework.BusyBoxImage, Image: framework.BusyBoxImage,
Command: []string{"/bin/sh", "-c"}, Command: []string{"/bin/sh", "-c"},

30
test/e2e/storage/subpath.go
View File

@ -54,10 +54,10 @@ var _ = utils.SIGDescribe("Subpath", func() {
Release: v1.12 Release: v1.12
Testname: SubPath: Reading content from a secret volume. Testname: SubPath: Reading content from a secret volume.
Description: Containers in a pod can read content from a secret mounted volume which was configured with a subpath. Description: Containers in a pod can read content from a secret mounted volume which was configured with a subpath.
This test is marked LinuxOnly since Windows cannot mount individual files in Containers. This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows.
*/ */
framework.ConformanceIt("should support subpaths with secret pod [LinuxOnly]", func() { framework.ConformanceIt("should support subpaths with secret pod [Excluded:WindowsDocker]", func() {
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default container runtime on Windows. // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows.
pod := testsuites.SubpathTestPod(f, "secret-key", "secret", &v1.VolumeSource{Secret: &v1.SecretVolumeSource{SecretName: "my-secret"}}, privilegedSecurityContext) pod := testsuites.SubpathTestPod(f, "secret-key", "secret", &v1.VolumeSource{Secret: &v1.SecretVolumeSource{SecretName: "my-secret"}}, privilegedSecurityContext)
testsuites.TestBasicSubpath(f, "secret-value", pod) testsuites.TestBasicSubpath(f, "secret-value", pod)
}) })
@ -66,10 +66,10 @@ var _ = utils.SIGDescribe("Subpath", func() {
Release: v1.12 Release: v1.12
Testname: SubPath: Reading content from a configmap volume. Testname: SubPath: Reading content from a configmap volume.
Description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath. Description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath.
This test is marked LinuxOnly since Windows cannot mount individual files in Containers. This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows.
*/ */
framework.ConformanceIt("should support subpaths with configmap pod [LinuxOnly]", func() { framework.ConformanceIt("should support subpaths with configmap pod [Excluded:WindowsDocker]", func() {
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default container runtime on Windows. // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the only container runtime on Windows.
pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext) pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext)
testsuites.TestBasicSubpath(f, "configmap-value", pod) testsuites.TestBasicSubpath(f, "configmap-value", pod)
}) })
@ -78,10 +78,10 @@ var _ = utils.SIGDescribe("Subpath", func() {
Release: v1.12 Release: v1.12
Testname: SubPath: Reading content from a configmap volume. Testname: SubPath: Reading content from a configmap volume.
Description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath and also using a mountpath that is a specific file. Description: Containers in a pod can read content from a configmap mounted volume which was configured with a subpath and also using a mountpath that is a specific file.
This test is marked LinuxOnly since Windows cannot mount individual files in Containers. This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows.
*/ */
framework.ConformanceIt("should support subpaths with configmap pod with mountPath of existing file [LinuxOnly]", func() { framework.ConformanceIt("should support subpaths with configmap pod with mountPath of existing file [Excluded:WindowsDocker]", func() {
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default container runtime on Windows. // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows.
pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext) pod := testsuites.SubpathTestPod(f, "configmap-key", "configmap", &v1.VolumeSource{ConfigMap: &v1.ConfigMapVolumeSource{LocalObjectReference: v1.LocalObjectReference{Name: "my-configmap"}}}, privilegedSecurityContext)
file := "/etc/resolv.conf" file := "/etc/resolv.conf"
pod.Spec.Containers[0].VolumeMounts[0].MountPath = file pod.Spec.Containers[0].VolumeMounts[0].MountPath = file
@ -92,10 +92,10 @@ var _ = utils.SIGDescribe("Subpath", func() {
Release: v1.12 Release: v1.12
Testname: SubPath: Reading content from a downwardAPI volume. Testname: SubPath: Reading content from a downwardAPI volume.
Description: Containers in a pod can read content from a downwardAPI mounted volume which was configured with a subpath. Description: Containers in a pod can read content from a downwardAPI mounted volume which was configured with a subpath.
This test is marked LinuxOnly since Windows cannot mount individual files in Containers. This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows.
*/ */
framework.ConformanceIt("should support subpaths with downward pod [LinuxOnly]", func() { framework.ConformanceIt("should support subpaths with downward pod [Excluded:WindowsDocker]", func() {
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default container runtime on Windows. // TODO(claudiub): Remove [Excluded:WindowsDocker] tag if Containerd becomes the default container runtime on Windows.
pod := testsuites.SubpathTestPod(f, "downward/podname", "downwardAPI", &v1.VolumeSource{ pod := testsuites.SubpathTestPod(f, "downward/podname", "downwardAPI", &v1.VolumeSource{
DownwardAPI: &v1.DownwardAPIVolumeSource{ DownwardAPI: &v1.DownwardAPIVolumeSource{
Items: []v1.DownwardAPIVolumeFile{{Path: "downward/podname", FieldRef: &v1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.name"}}}, Items: []v1.DownwardAPIVolumeFile{{Path: "downward/podname", FieldRef: &v1.ObjectFieldSelector{APIVersion: "v1", FieldPath: "metadata.name"}}},
@ -108,10 +108,10 @@ var _ = utils.SIGDescribe("Subpath", func() {
Release: v1.12 Release: v1.12
Testname: SubPath: Reading content from a projected volume. Testname: SubPath: Reading content from a projected volume.
Description: Containers in a pod can read content from a projected mounted volume which was configured with a subpath. Description: Containers in a pod can read content from a projected mounted volume which was configured with a subpath.
This test is marked LinuxOnly since Windows cannot mount individual files in Containers. This test is marked [Excluded:WindowsDocker] since Docker does not support creating individual file mounts for containers on Windows.
*/ */
framework.ConformanceIt("should support subpaths with projected pod [LinuxOnly]", func() { framework.ConformanceIt("should support subpaths with projected pod [Excluded:WindowsDocker]", func() {
// TODO(claudiub): Remove [LinuxOnly] tag once Containerd becomes the default container runtime on Windows. // TODO(claudiub): Remove [Excluded:WindowsDocker] tag once Containerd becomes the default container runtime on Windows.
pod := testsuites.SubpathTestPod(f, "projected/configmap-key", "projected", &v1.VolumeSource{ pod := testsuites.SubpathTestPod(f, "projected/configmap-key", "projected", &v1.VolumeSource{
Projected: &v1.ProjectedVolumeSource{ Projected: &v1.ProjectedVolumeSource{
Sources: []v1.VolumeProjection{ Sources: []v1.VolumeProjection{