Merge pull request kubernetes#11312 from mm4tt/logexporter

Log stdout/stderr of gcloud auth command.
ks-ci-bot · Feb 19, 2019 · b2d27d0 · b2d27d0
2 parents 4d47e63 + f3561b4
commit b2d27d0
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/logexporter/Makefile b/logexporter/Makefile
@@ -14,7 +14,7 @@
 
 PROJECT = k8s-testimages
 IMG = gcr.io/$(PROJECT)/logexporter
-TAG = v0.1.5
+TAG = v0.1.6
 
 .PHONY: build push
 

diff --git a/logexporter/cluster/logexporter-daemonset.yaml b/logexporter/cluster/logexporter-daemonset.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: logexporter-test
-        image: gcr.io/k8s-testimages/logexporter:v0.1.5
+        image: gcr.io/k8s-testimages/logexporter:v0.1.6
         env:
         - name: NODE_NAME
           valueFrom:

diff --git a/logexporter/cluster/logexporter-pod.yaml b/logexporter/cluster/logexporter-pod.yaml
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
   - name: logexporter-test
-    image: gcr.io/k8s-testimages/logexporter:v0.1.5
+    image: gcr.io/k8s-testimages/logexporter:v0.1.6
     env:
     - name: NODE_NAME
       valueFrom:

diff --git a/logexporter/cmd/main.go b/logexporter/cmd/main.go
@@ -20,6 +20,7 @@ limitations under the License.
 package main
 
 import (
+	"bytes"
 	"flag"
 	"fmt"
 	"io"
@@ -77,8 +78,14 @@ func checkConfigValidity() error {
 	if _, err := os.Stat(*gcloudAuthFilePath); err != nil {
 		return fmt.Errorf("Could not find the gcloud service account file: %v", err)
 	} else {
+		glog.Infof("Running gcloud auth activate-service-account --key-file=%s\n", *gcloudAuthFilePath)
 		cmd := exec.Command("gcloud", "auth", "activate-service-account", "--key-file="+*gcloudAuthFilePath)
-		if err := cmd.Run(); err != nil {
+		var stderr, stdout bytes.Buffer
+		cmd.Stderr, cmd.Stdout = &stderr, &stdout
+		err = cmd.Run()
+		glog.Infof("Stdout:\n%s\n", stdout.String())
+		glog.Infof("Stderr:\n%s\n", stderr.String())
+		if err != nil {
 			return fmt.Errorf("Failed to activate gcloud service account: %v", err)
 		}
 	}