github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95055 from vinaykul/e2e-tests

Browse Source 
Add LookForStringInPodExecToContainer(...) that takes container name as argument.
This commit is contained in:
Kubernetes Prow Robot 2020-09-29 12:05:25 -07:00 committed by GitHub
commit aaf9883747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e/framework/util.go
View File

@ -503,12 +503,21 @@ func RandomSuffix() string {
} }
// LookForStringInPodExec looks for the given string in the output of a command // LookForStringInPodExec looks for the given string in the output of a command
// executed in a specific pod container. // executed in the first container of specified pod.
// TODO(alejandrox1): move to pod/ subpkg once kubectl methods are refactored. // TODO(alejandrox1): move to pod/ subpkg once kubectl methods are refactored.
func LookForStringInPodExec(ns, podName string, command []string, expectedString string, timeout time.Duration) (result string, err error) { func LookForStringInPodExec(ns, podName string, command []string, expectedString string, timeout time.Duration) (result string, err error) {
return LookForStringInPodExecToContainer(ns, podName, "", command, expectedString, timeout)
}
// LookForStringInPodExecToContainer looks for the given string in the output of a
// command executed in specified pod container, or first container if not specified.
func LookForStringInPodExecToContainer(ns, podName, containerName string, command []string, expectedString string, timeout time.Duration) (result string, err error) {
return lookForString(expectedString, timeout, func() string { return lookForString(expectedString, timeout, func() string {
// use the first container args := []string{"exec", podName, fmt.Sprintf("--namespace=%v", ns)}
args := []string{"exec", podName, fmt.Sprintf("--namespace=%v", ns), "--"} if len(containerName) > 0 {
args = append(args, fmt.Sprintf("--container=%s", containerName))
}
args = append(args, "--")
args = append(args, command...) args = append(args, command...)
return RunKubectlOrDie(ns, args...) return RunKubectlOrDie(ns, args...)
}) })