weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1861 from munnerz/e2e-logging

Browse Source 
Fix fetching logs in e2e test framework
This commit is contained in:
jetstack-bot 2019-07-08 14:11:46 +01:00 committed by GitHub
commit 458c7193d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/framework/addon/chart/addon.go
View File

@ -251,13 +251,20 @@ func (c *Chart) SupportsGlobal() bool {
func (c *Chart) Logs() (map[string]string, error) {
kc := c.Tiller.Base.Details().KubeClient
pods, err := kc.CoreV1().Pods(c.Namespace).List(metav1.ListOptions{LabelSelector: "release=" + c.ReleaseName})
oldLabelPods, err := kc.CoreV1().Pods(c.Namespace).List(metav1.ListOptions{LabelSelector: "release=" + c.ReleaseName})
if err != nil {
return nil, err
}
// also check pods with the new style labels used in the cert-manager chart
newLabelPods, err := kc.CoreV1().Pods(c.Namespace).List(metav1.ListOptions{LabelSelector: "app.kubernetes.io/instance=" + c.ReleaseName})
if err != nil {
return nil, err
}
podList := append(oldLabelPods.Items, newLabelPods.Items...)
out := make(map[string]string)
for _, pod := range pods.Items {
for _, pod := range podList {
// Only grab logs from the first container in the pod
// TODO: grab logs from all containers
containerName := pod.Spec.Containers[0].Name