mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-13 13:55:41 +00:00
Combine downward api e2e test cases.
This commit is contained in:
parent
2d64ce5e8e
commit
4ac61e1d12
@ -38,11 +38,11 @@ var _ = Describe("[sig-api-machinery] Downward API", func() {
|
|||||||
f := framework.NewDefaultFramework("downward-api")
|
f := framework.NewDefaultFramework("downward-api")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Testname: downwardapi-env-name-namespace
|
Testname: downwardapi-env-name-namespace-podip
|
||||||
Description: Ensure that downward API can provide pod's name and
|
Description: Ensure that downward API can provide pod's name, namespace
|
||||||
namespaces as environment variables.
|
and IP address as environment variables.
|
||||||
*/
|
*/
|
||||||
framework.ConformanceIt("should provide pod name and namespace as env vars ", func() {
|
framework.ConformanceIt("should provide pod name, namespace and IP address as env vars ", func() {
|
||||||
podName := "downward-api-" + string(uuid.NewUUID())
|
podName := "downward-api-" + string(uuid.NewUUID())
|
||||||
env := []v1.EnvVar{
|
env := []v1.EnvVar{
|
||||||
{
|
{
|
||||||
@ -63,24 +63,6 @@ var _ = Describe("[sig-api-machinery] Downward API", func() {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
|
||||||
|
|
||||||
expectations := []string{
|
|
||||||
fmt.Sprintf("POD_NAME=%v", podName),
|
|
||||||
fmt.Sprintf("POD_NAMESPACE=%v", f.Namespace.Name),
|
|
||||||
}
|
|
||||||
|
|
||||||
testDownwardAPI(f, podName, env, expectations)
|
|
||||||
})
|
|
||||||
|
|
||||||
/*
|
|
||||||
Testname: downwardapi-env-pod-ip
|
|
||||||
Description: Ensure that downward API can provide an IP address for
|
|
||||||
pod as an environment variable.
|
|
||||||
*/
|
|
||||||
framework.ConformanceIt("should provide pod IP as an env var ", func() {
|
|
||||||
podName := "downward-api-" + string(uuid.NewUUID())
|
|
||||||
env := []v1.EnvVar{
|
|
||||||
{
|
{
|
||||||
Name: "POD_IP",
|
Name: "POD_IP",
|
||||||
ValueFrom: &v1.EnvVarSource{
|
ValueFrom: &v1.EnvVarSource{
|
||||||
@ -93,6 +75,8 @@ var _ = Describe("[sig-api-machinery] Downward API", func() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
expectations := []string{
|
expectations := []string{
|
||||||
|
fmt.Sprintf("POD_NAME=%v", podName),
|
||||||
|
fmt.Sprintf("POD_NAMESPACE=%v", f.Namespace.Name),
|
||||||
"POD_IP=(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)",
|
"POD_IP=(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user