github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #27019 from girishkalele/nethealth2saltbase

Browse Source 
Automatic merge from submit-queue

Add nethealth container to prepull manifest
This commit is contained in:
k8s-merge-robot
2016-06-17 02:15:59 -07:00
committed by GitHub
parent c3a3241002 ee7ca66dba
commit 6a18fbe6af
4 changed files with 45 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/framework.go
View File

@@ -276,7 +276,7 @@ func (f *Framework) AfterEach() {
if CurrentGinkgoTestDescription().Failed && TestContext.DumpLogsOnFailure {
DumpAllNamespaceInfo(f.Client, f.Namespace.Name)
By(fmt.Sprintf("Dumping a list of prepulled images on each node"))
LogPodsWithLabels(f.Client, api.NamespaceSystem, ImagePullerLabels)
LogContainersInPodsWithLabels(f.Client, api.NamespaceSystem, ImagePullerLabels, "image-puller")
if f.federated {
// Print logs of federation control plane pods (federation-apiserver and federation-controller-manager)
LogPodsWithLabels(f.Client, "federation", map[string]string{"app": "federated-cluster"})