Merge pull request #43641 from krousey/upgrades

Automatic merge from submit-queue

Better logging for PVC flakes

Addresses some logging ambiguities in https://github.com/kubernetes/kubernetes/issues/43610, but does not fix it.
This commit is contained in:
Kubernetes Submit Queue 2017-03-27 10:43:42 -07:00 committed by GitHub
commit 5c2a8c252c
2 changed files with 2 additions and 2 deletions

View File

@ -536,7 +536,7 @@ func MakePod(ns string, pvcName string, isPrivileged bool, command string) *v1.P
APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(), APIVersion: api.Registry.GroupOrDie(v1.GroupName).GroupVersion.String(),
}, },
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
GenerateName: "client-", GenerateName: "pvc-tester-",
Namespace: ns, Namespace: ns,
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{

View File

@ -2236,7 +2236,7 @@ func (f *Framework) MatchContainerOutput(
} }
Logf("Output of node %q pod %q container %q: %s", podStatus.Spec.NodeName, podStatus.Name, container.Name, logs) Logf("Output of node %q pod %q container %q: %s", podStatus.Spec.NodeName, podStatus.Name, container.Name, logs)
} }
return fmt.Errorf("expected pod %q success: %v", pod.Name, err) return fmt.Errorf("expected pod %q success: %v", createdPod.Name, err)
} }
Logf("Trying to get logs from node %s pod %s container %s: %v", Logf("Trying to get logs from node %s pod %s container %s: %v",